mirror of
https://github.com/bokysan/docker-postfix.git
synced 2025-09-22 14:24:30 +08:00
9b1902c047
Summary ^^^^^^^ This commit refactors the code base to be more manageble and prepares the groundwork for tests. Refactoring ^^^^^^^^^^^ Files are now moved to subdirectories, all for the sole purpose of easier management. Tests live in their own folders, as well as configs and other files. Test framework ^^^^^^^^^^^^^^ Two new important scripts/directories are available: - `unit-tests.sh` / `/unit-test` which executes unit tests across shell scripts, and - `integration-test.sh` / `integration-tests`, which spins up the container and tries to send the email. Both tests use the [BATS](https://github.com/sstephenson/bats) framework for testing. To create a new test, simply drop a `.bats` file into a corresponding directory. Functions have been extracted into `common-run.sh`, to be able to test them independently. DKIM_SELECTOR ^^^^^^^^^^^^^ It is now possible to specify a DKIM selector to use (instead of the default "mail"). See `README.md` for more details. JSON logging ^^^^^^^^^^^^ WIP: rsyslog will now output JSON logs. This is especially important if you plan on deploying the image into Kubernetes, as [Prometheus](https://prometheus.io/) can handle logs in JSON much easier. TODO: Make this an optional feature, to not confuse existing users.
36 lines
839 B
Text
36 lines
839 B
Text
[supervisord]
|
|
user = root
|
|
nodaemon = true
|
|
logfile = /dev/null
|
|
logfile_maxbytes= 0
|
|
|
|
[program:rsyslog]
|
|
command = rsyslogd -n
|
|
autostart = true
|
|
autorestart = true
|
|
startsecs = 2
|
|
stopwaitsecs = 2
|
|
stdout_logfile = /dev/stdout
|
|
stderr_logfile = /dev/stderr
|
|
stdout_logfile_maxbytes = 0
|
|
stderr_logfile_maxbytes = 0
|
|
|
|
[program:postfix]
|
|
process_name = master
|
|
autostart = true
|
|
autorestart = false
|
|
directory = /etc/postfix
|
|
command = /usr/sbin/postfix -c /etc/postfix start
|
|
startsecs = 0
|
|
|
|
[program:opendkim]
|
|
command = /opendkim.sh
|
|
user = opendkim
|
|
autostart = true
|
|
autorestart = true
|
|
startsecs = 5
|
|
stopwaitsecs = 5
|
|
stdout_logfile = /dev/stdout
|
|
stderr_logfile = /dev/stderr
|
|
stdout_logfile_maxbytes = 0
|
|
stderr_logfile_maxbytes = 0
|