VitexSoftware's 2026 update - get code, inspiration or nothing :)=~ - #961
VitexSoftware's 2026 update - get code, inspiration or nothing :)=~#961Vitexus wants to merge 23 commits into
Conversation
…cal login test scripts, and update Debian package metadata.
…_c` cleanup to `debian/rules`, and include `mysqld` kill in `Jenkinsfile` package installation.
Prevents a potential TypeError in language selection by ensuring the language array is valid before use. Improves robustness when configuration is missing or improperly loaded.
Removes untranslated DKIM string markers in multiple language files to ensure English fallback, improving user experience for untranslated content. Adds debconf-driven domain configuration templates and automates domain setup during package installation for easier deployment and customization of the package.
Improves Debian package configuration by automating admin email and setup password prompts, handling purges and reinstalls securely, and ensuring config files and permissions are managed robustly. Updates support for otphp v11, adjusts source format, and fixes multiple language and config function references for greater reliability and consistency.
Introduces debconf options for enabling DKIM integration and allowing all administrators to manage DKIM entries. Automates DKIM-related settings in generated configuration, improving setup flexibility for OpenDKIM users.
|
I'm not sure why you removed the XXX markers in the language file(s) - I thought they were intentional and to make it obvious to someone that the strings needed translating? |
Sorry, something went wrong.
| */ | ||
|
|
||
| // Debian: This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php | ||
| $db_config = dirname(__FILE__) . '/dbconfig.inc.php'; |
There was a problem hiding this comment.
I thought this was added into the .deb packaged source code through a debian/patch thing; if this gets merged as is, everyone would have to have a dbconfig.inc.php file (which would be a new requirement).
Sorry, something went wrong.
| * i.e. configuring database etc; specifying setup.php password etc. | ||
| */ | ||
| $CONF['configured'] = false; | ||
| $CONF['configured'] = true; |
There was a problem hiding this comment.
this looks like a debian/ specific thing which should be handled through a debian patch?
Sorry, something went wrong.
| @@ -0,0 +1,7 @@ | |||
| include.path=${php.global.include.path} | |||
| php.version=PHP_84 | |||
There was a problem hiding this comment.
I don't think we need nbproject/ to be added to git?
Sorry, something went wrong.
|
|
||
| postfixadmin (4.0.5) UNRELEASED; urgency=medium | ||
|
|
||
| * Fixed PHP deprecation warnings from thecodingmachine/safe library |
There was a problem hiding this comment.
i can't see any reference to thecodingmachine/safe in this PR (aside from in this changelog)
Sorry, something went wrong.
DavidGoodwin
left a comment
There was a problem hiding this comment.
see comments
Sorry, something went wrong.
They are. This change should be reverted. |
Sorry, something went wrong.
|
The debain-specific stuff should probably split into its own pull req for the sake of making this easier to QA |
Sorry, something went wrong.
There was a problem hiding this comment.
Why are string defaults being hard-coded here instead of handled through the language support files?
Sorry, something went wrong.
OK. I'll do it. |
Sorry, something went wrong.
|
@DavidGoodwin - Since you took the time to comment on my work, I'd be happy to incorporate your comments to ensure project satisfaction. |
Sorry, something went wrong.
Hey @Vitexus - the first version of your comment didn't come across as (I think) you intended (as I see you've subsequently edited it) :-) I might not have properly said it before, but thank you for taking the time to do the PR. For what it's worth, I was initially put off a little by the excessive use of emoji in the PR description, which made me think it'd been all generated by AI. I tried to refrain from grumbling (too much) and then realised a robot generated PR is probably quite useful for those who are not fluent in English! |
Sorry, something went wrong.
Very good thinking, and rather rare among maintainers unfortunately 👍 :) |
Sorry, something went wrong.
|
Still in progress on my side. |
Sorry, something went wrong.
@knofte My comment was actually aimed at the PR description/wording - not the code change itself. I'm not sure where I stand on AI/LLM based contributions; We've been using them quite a bit in my day job recently, and I can see they are useful - and while they can do boring tasks really easily (e.g. moving from bootstrap 3 to 4 or whatever I had @copilot do for postfixadmin a few weeks ago), I'm not sure they're a silver bullet. While they can generate loads of code, review of that code and deciding whether the changes fit in, and are something that's wanted becomes a bottleneck. So with your other PR for the auto-update - I'm not 100% sold on the idea of having it - the idea feels nice, but I don't think postfixadmin needs it; I suppose I should leave a comment on that PR instead ;) |
Sorry, something went wrong.
|
I was also meaning regarding the language. The tarball would be easiest way to make in-web upgrades and I built it because it annoys me so much it doesn't exist. I don't want to ssh in, and get outdated packages from apt. And doing git pull for master is also.. well less great. But I can also just keep an updated fork and auto-upgrade my own system from there with a customloaded upgrade URL..but I would imagine others would want such a function :) Happy to discuss further on irc. :) |
Sorry, something went wrong.
Prevents test installation failures caused by apt-get hitting the repository while it is being rebuilt by the Ansible republish job. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Polls the Jenkins job color before entering the Test stage so apt-get does not hit the repository while it is being rebuilt by the Ansible republish job. Uses waitUntil instead of buildBlocker (plugin absent). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Prevents test installation failures caused by apt-get hitting the repository while it is being rebuilt by the Ansible republish job. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Forky is still unstable/research-only. The full Debian package ecosystem is not yet available for Forky, causing cascading unmet dependency failures. Re-enable once the full stack builds cleanly for Forky. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Syncs 139 upstream commits (PostfixAdmin 4.0.0 -> 4.0.5+): PHP 8.2+ requirement, CSRF token rework, Bootstrap 5 UI, new Languages class replacing the old check_language()/$supported_languages global, database integrity checker, alias/alias_domain description field, bulk-delete forwards, viewlog pager improvements, unified forwarding editor, and continuous translation-key updates. Conflict resolution notes: - composer.json, functions.inc.php, model/Login.php, model/TotpPf.php, public/editactive.php, public/list-virtual.php, languages/*.lang: took upstream wholesale (fork's changes there were superseded or purely cosmetic) - debian/postfixadmin.install, debian/rules: kept the fork's existing composer.json-path-rewrite packaging mechanism; deliberately did not adopt upstream's new vendor/-shipping approach in this commit (left as a follow-up so a packaging regression and an app regression are never entangled together) - config.inc.php: auto-merged cleanly, verified $CONF['configured'] and the Debian dbconfig.inc.php loading blocks survived intact - debian/changelog: manually reconciled the fork's stacked UNRELEASED entries against upstream's own 4.0.1-1 entry, re-sequenced so versions are monotonically ordered per dpkg --compare-versions
The upstream sync in the previous commit brought in composer.json's "php": ">=8.2" requirement. The vitexsoftware/ubuntu:jammy build image only installs apt's default PHP (8.1, no PPA), so it can no longer satisfy composer install/build. Disable it the same way debian:forky is disabled, until the image gains a PHP >=8.2 source.
config.inc.php loaded /etc/postfixadmin/dbconfig.inc.php (the dbconfig-common-generated file) a second time *after* config.local.php, unconditionally re-applying its database_type/host/user/password/name onto $CONF. On hosts where dbconfig-common's leftover dbconfig.inc.php points at a different (often unused) database than the one actually configured in config.local.php, this silently redirected the app to the wrong database on every request. config.local.php is documented as the final admin override; dbconfig.inc.php should only supply defaults before it, matching Debian's own upstream config.inc.php ordering. Also guard the first (top-of-file) dbconfig.inc.php load with file_exists() instead of requiring it unconditionally - it was fatally erroring on any checkout without that file present (e.g. before dbconfig-common has run, or in local dev/test environments).
🚀 What is new here
Major Differences Summary
🏗️ Debian Packaging Integration
Your repository includes extensive Debian packaging support that doesn't exist upstream:
New Debian Files:
🔐 DKIM Integration
Significant DKIM (OpenDKIM) support additions:
🔧 Configuration Enhancements
🌐 Language & Localization Improvements
🐛 Bug Fixes & Stability