18 Commits

Author	SHA1	Message	Date
Casper	c2d0b748b2	Change 'while' style (#3365)	2023-05-26 01:39:39 +02:00
Casper	37ca0f9ba9	Change 'function' style (#3364)	2023-05-26 01:01:41 +02:00
Casper	cf74127f78	change if style (#3361)	2023-05-24 09:06:59 +02:00
Georg Lauterbach	bba72daedf	scripts: add DKIM helper script for Rspamd (#3286) ... Co-authored-by: Casper <casperklein@users.noreply.github.com>	2023-05-03 08:30:49 +02:00
Casper	897d84f0f9	scripts: Improve error handling, when parameters are missing (#2854)	2022-10-29 11:04:35 +02:00
Casper	a930aeb18a	Remove unusual space from shebang line (#2834)	2022-10-17 10:40:09 +02:00
Casper	c92a67f91e	Fix typo (#2830)	2022-10-15 11:32:25 +13:00
Brennan Kinney	e3cc627e18	refactor: Share a common helper (vhost builder) for sourcing domains (#2620) ... * chore: Split vhost helper method and use filepath vars - Helpers `accounts.sh` and `aliases.sh` can move their vhost code into this helper. - They share duplicate code with `bin/open-dkim` which will also leverage this vhost helper going forward. * chore: Sync vhost generation logic into helper - Chunky commit, but mostly copy/paste of logic into a common method. - `bin/open-dkim` additionally wrapped relevant logic in a function call and revised inline docs. * chore: Include LDAP vhost support - Revises notes for LDAP vhost support. - This now ensures LDAP users get vhost rebuilt to match the startup script for when change detection support is enabled. - `bin/open-dkim` will additionally be able to support the default `DOMAINNAME` var (set via `helpers/dns.sh`) for LDAP users instead of requiring them to provide one explicitly. * chore(`bin/open-dkim`): Ensure `DOMAINNAME` is properly set - This will ensure LDAP users insert the same `DOMAINNAME` value as used during container startup. - The container itself should panic at startup (during `helpers/dns.sh`) if this isn't configured correctly already, thus it should not introduce any breaking change to users of this utility? * chore: Set the 2nd value as blank `_` Line is split by a delimiter such as white-space (or via IFS: `|`), the blank `_` var is to indicate we're not interested in that value, but still leverage how `read -r` works, instead of splitting the var ourselves first thing. * chore: Remove shellcheck disable lines No longer applicable with the switch to `_`	2022-06-10 10:57:10 +12:00
Brennan Kinney	54904aa02c	chore(housekeeping): Normalize how config files filter out unwanted lines (#2619) ... * chore(`aliases.sh`): Filepath to local var `DATABASE_VIRTUAL` * chore(`accounts.sh`): Filepath to local var `DATABASE_ACCOUNTS` * chore(`accounts.sh`): Filepath to local var `DATABASE_VIRTUAL` * chore(`accounts.sh`): Filepath to local var `DATABASE_DOVECOT_MASTERS` * chore(`bin/open-dkim`): Filepaths to local vars (accounts,virtual,vhost) * chore(`relay.sh`): Filepath to local var `DATABASE_SASL_PASSWD` * chore: Rename method Prior PR feedback suggested a better helper method name. * chore: Normalize filtering config lines as input for iterating * chore: Remove `_is_comment` helper method No longer serving a purpose with more appropriate filter method for pre-processing the entire config file.	2022-06-07 01:07:30 +12:00
Casper	372e3fe35e	Use color variables instead of escape codes (#2565)	2022-05-10 17:50:33 +02:00
Georg Lauterbach	b9dbec3276	scripts: refactored scripts located under `target/bin/` (#2500) ... * refactored scripts located under `target/bin/` The scripts under `target/bin/` now use the new log and I replaced some `""` with `''` on the way. The functionality stays the same, this mostly style and log. * corrected fail2ban (script and tests) * corrected OpenDKIM log output in tests * reverted (some) changes to `sedfile` Moreover, a few messages for BATS were streamlined and a regression in the linting script reverted. * apple PR feedback * improve log output from `fail2ban` script The new output has a single, clear message with the '[ ERROR ] ' prefix, and then output that explains the error afterwards. This is coherent with the logging style which should be used while providing more information than just a single line about IPTables not functioning. * simplified `setquota` script * consistently named the `__usage` function Before, scripts located under `target/bin/` were using `usage` or `__usage`. Now, they're using `__usage` as they should. * improved `sedfile` With `sedfile`, we cannot use the helper functions in a nice way because it is used early in the Dockerfile at a stage where the helper scripts are not yet copied. The script has been adjusted to be canonical with all the other scripts under `target/bin/`. * fixed tests * removed `__usage` from places where it does not belong `__usage` is to be used on wrong user input, not on other failures as well. This was fixed in `delquota` and `setquota`. * apply PR review feedback	2022-03-26 09:30:09 +01:00
Brennan Kinney	d9e8accf5f	chore: Housekeeping on the 'open-dkim' script (#2267)	2021-10-30 10:10:32 +00:00
Georg Lauterbach	4ba2315058	corrected dkim keysize argument in help pages, closing #1845	2021-03-10 11:21:24 +01:00
Georg Lauterbach	c881facbd2	start-mailserver.sh split (#1820) ... * splitting start-mailserver.sh * refactoring part 2 * refactored setup-stack.sh * stzarted adjusting target/bin/*.sh to use new usage format * corrected lowercase-uppercase test error * better handling of .bashrc variable export * linting tests and fix for default assignements * last stylistic changes and rebase	2021-02-23 20:03:01 +01:00
Astro	a7ecb0ea8b	feat/enable custom dkim selector (#1811) ... * let dkim generator accept selector as parameter * test dkim-generator with selector parameter * fix: correct name of domain argument in usage * fix: adapt command to new syntax * tests: use different quotes * tests: use different quotes * tests: remove domains that were never added * style: change test name * refactor: dkim setup * style: remove trailing whitespace * tests: remove test of removed dummy file Co-authored-by: Frederic Werner <20406381+wernerfred@users.noreply.github.com>	2021-02-21 22:05:35 +01:00
Frederic Werner	6e6b5be1ee	chore: change argument name and parameter shift	2021-02-18 19:20:48 +01:00
Georg Lauterbach	f3f38db0f9	adjust test to use new script output from openDKIM	2021-02-18 13:11:45 +01:00
Georg Lauterbach	1005bb3b09	Provide complete refactoring of openDKIM script (#1812) ... * provide complete refactoring of openDKIM usage and tests * fix leftover linting errors * correct defualt key size and README usage * provide independent order for arguments * added `config` and adjusted usage information * fixing shift in setup.sh * adjust usage information to use new style and rename script * use updated argument keysize instead of size	2021-02-18 10:29:34 +01:00