diff options
author | Suren A. Chilingaryan <csa@suren.me> | 2018-02-21 18:44:26 +0100 |
---|---|---|
committer | Suren A. Chilingaryan <csa@suren.me> | 2018-02-21 18:44:26 +0100 |
commit | 350abf69de17b079c7589022bb0b2df01a51f84e (patch) | |
tree | 66bba94094c096b21c181d1a77c6a4ca4078482d /adei/scripts | |
parent | 3d19ce5671e45b8e06a91cb09065d81e22f9d6fd (diff) | |
download | adei-350abf69de17b079c7589022bb0b2df01a51f84e.tar.gz adei-350abf69de17b079c7589022bb0b2df01a51f84e.tar.bz2 adei-350abf69de17b079c7589022bb0b2df01a51f84e.tar.xz adei-350abf69de17b079c7589022bb0b2df01a51f84e.zip |
Use volume for apache configuration in order to run in read-only containers
Diffstat (limited to 'adei/scripts')
-rwxr-xr-x | adei/scripts/run-apache.sh | 17 | ||||
-rwxr-xr-x | adei/scripts/run-cron.sh | 10 |
2 files changed, 23 insertions, 4 deletions
diff --git a/adei/scripts/run-apache.sh b/adei/scripts/run-apache.sh index 3ad9d5f..90438a7 100755 --- a/adei/scripts/run-apache.sh +++ b/adei/scripts/run-apache.sh @@ -1,8 +1,19 @@ #! /bin/bash -if [ ! -f /adei/cfg/apache.conf ]; then - cp -a /opt/configs/apache* /adei/cfg -fi +LOCK_FILE=.lock +( + flock -x 10 + if [ ! -d /adei/ovr/apache2 ]; then + cp -ar /opt/apache2 /adei/ovr/ + fi +) 10> /adei/ovr/$LOCK_FILE + +( + flock -x 10 + if [ ! -f /adei/cfg/apache.conf ]; then + cp -a /opt/configs/apache* /adei/cfg + fi +) 10> /adei/cfg/$LOCK_FILE sed -i'' -re '/Listen/ { /(80|443)/!d }' /etc/apache2/listen.conf if [ -n "$ADEI_PORTS" ]; then diff --git a/adei/scripts/run-cron.sh b/adei/scripts/run-cron.sh index 5f4b9e2..f0539f6 100755 --- a/adei/scripts/run-cron.sh +++ b/adei/scripts/run-cron.sh @@ -2,6 +2,14 @@ printenv | grep -v affinity:container | sed -r 's/^(.*)=("?)(.*)\2$/export \1="\3"/g' > /adei/env -/opt/scripts/adei-branch.sh +LOCK_FILE=.lock +( + flock -x 10 + flock -x 11 + + /opt/scripts/adei-branch.sh + +) 10> /adei/cfg/$LOCK_FILE 11> /adei/src/$LOCK_FILE + cron -n -m '/usr/bin/procmail -d root' |