github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

scripts: follow up of #3115 (feedback) (#3124)

Browse source
This commit is contained in:
Georg Lauterbach 2023-02-27 23:37:35 +01:00 committed by GitHub
parent 4b04c3e31c
commit 9ead9a54ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
target/scripts/helpers/dhparams.sh
View file

@ -1,20 +0,0 @@
#!/bin/bash
function _setup_dhparam
{
local DH_SERVICE=$1
local DH_DEST=$2
local DH_CUSTOM='/tmp/docker-mailserver/dhparams.pem'
_log 'debug' "Setting up ${DH_SERVICE} dhparam"
if [[ -f ${DH_CUSTOM} ]]
then # use custom supplied dh params (assumes they're probably insecure)
_log 'trace' "${DH_SERVICE} will use custom provided DH paramters"
_log 'warn' "Using self-generated dhparams is considered insecure - unless you know what you are doing, please remove '${DH_CUSTOM}'"
cp -f "${DH_CUSTOM}" "${DH_DEST}"
else # use official standardized dh params (provided via Dockerfile)
_log 'trace' "${DH_SERVICE} will use official standardized DH parameters (ffdhe4096)."
fi
}

1
target/scripts/helpers/index.sh
View file

@ -10,7 +10,6 @@ function _import_scripts
source "${PATH_TO_SCRIPTS}/accounts.sh"
source "${PATH_TO_SCRIPTS}/aliases.sh"
source "${PATH_TO_SCRIPTS}/change-detection.sh"
source "${PATH_TO_SCRIPTS}/dhparams.sh"
source "${PATH_TO_SCRIPTS}/dns.sh"
source "${PATH_TO_SCRIPTS}/error.sh"
source "${PATH_TO_SCRIPTS}/lock.sh"

19
target/scripts/helpers/ssl.sh
View file

@ -1,5 +1,24 @@
#!/bin/bash
function _setup_dhparam
{
local DH_SERVICE=$1
local DH_DEST=$2
local DH_CUSTOM='/tmp/docker-mailserver/dhparams.pem'
_log 'debug' "Setting up ${DH_SERVICE} dhparam"
if [[ -f ${DH_CUSTOM} ]]
then # use custom supplied dh params (assumes they're probably insecure)
_log 'trace' "${DH_SERVICE} will use custom provided DH paramters"
_log 'warn' "Using self-generated dhparams is considered insecure - unless you know what you are doing, please remove '${DH_CUSTOM}'"
cp -f "${DH_CUSTOM}" "${DH_DEST}"
else # use official standardized dh params (provided via Dockerfile)
_log 'trace' "${DH_SERVICE} will use official standardized DH parameters (ffdhe4096)."
fi
}
function _setup_ssl
{
_log 'debug' 'Setting up SSL'

2
target/scripts/start-mailserver.sh
View file

@ -1,5 +1,7 @@
#!/bin/bash
shopt -s globstar
# ------------------------------------------------------------
# ? >> Sourcing helpers & stacks
# ------------------------------------------------------------

6
target/scripts/startup/setup-stack.sh
View file

@ -10,11 +10,13 @@ function _register_setup_function
function _setup
{
while read -r FILE
# requires `shopt -s globstar` because of `**` which in
# turn is required as we're decending through directories
for FILE in /usr/local/bin/setup.d/**/*.sh
do
# shellcheck source=/dev/null
source "${FILE}"
done < <(find /usr/local/bin/setup.d/ -type f)
done
_log 'info' 'Configuring mail server'
for FUNC in "${FUNCS_SETUP[@]}"