Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests should work from now on 

Merge branch 'user-patches.sh'

# Conflicts:
#	config/user-patches.sh
#	target/start-mailserver.sh
This commit is contained in:
Daniel Dobko 2019-10-08 21:55:46 +02:00
parent 0975b71d72 275a83667a
commit e441f1318a
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/user-patches.sh
View File

@ -1,6 +1,2 @@
#!/bin/bash #!/bin/bash
echo "Default user-patches.sh successfully executed!"
##
# This user script will be executed between configuration and starting daemons
##

5
target/start-mailserver.sh
View File

@ -1601,11 +1601,10 @@ function _misc_user_patches() {
if [ -f /tmp/docker-mailserver/user-patches.sh ]; then if [ -f /tmp/docker-mailserver/user-patches.sh ]; then
chmod +x /tmp/docker-mailserver/user-patches.sh chmod +x /tmp/docker-mailserver/user-patches.sh
chown -R docker:docker /tmp/docker-mailserver/user-patches.sh
/tmp/docker-mailserver/user-patches.sh /tmp/docker-mailserver/user-patches.sh
notify 'inf' "user-patches.sh executed" notify 'inf' "Executed 'config/user-patches.sh'"
else else
notify 'inf' "user-patches.sh not executed because optional '/tmp/docker-mailserver/user-patches.sh' is not provided." notify 'inf' "No user patches executed because optional '/tmp/docker-mailserver/user-patches.sh' is not provided."
fi fi
} }