From b6cc7af2fcc73514d444802bf7786b27875c7574 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 10 Dec 2016 23:46:06 +0000 Subject: [PATCH 1/5] Update 40-config --- root/etc/cont-init.d/40-config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index a7bc142..d37283e 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -9,7 +9,10 @@ mkdir -p \ ln -s /usr/share/webapps/cops /var/www/localhost/cops # clear previous config -rm /var/www/localhost/cops/config_local.*.php +if [-e /var/www/localhost/cops/config_local.*.php] +then + rm /var/www/localhost/cops/config_local.*.php +fi # copy config [[ ! -e /config/config_local.php ]] && \ From b9d6eae0197bc5836d34375936bae91370a2d0a7 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 10 Dec 2016 23:49:11 +0000 Subject: [PATCH 2/5] Update 40-config --- root/etc/cont-init.d/40-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index d37283e..9e07435 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -9,7 +9,7 @@ mkdir -p \ ln -s /usr/share/webapps/cops /var/www/localhost/cops # clear previous config -if [-e /var/www/localhost/cops/config_local.*.php] +if [ -e /var/www/localhost/cops/config_local.*.php ] then rm /var/www/localhost/cops/config_local.*.php fi From b26daff2b7159982a1b0a70d5f1336653688f734 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 10 Dec 2016 23:51:54 +0000 Subject: [PATCH 3/5] Update 40-config --- root/etc/cont-init.d/40-config | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index 9e07435..e458426 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -9,15 +9,16 @@ mkdir -p \ ln -s /usr/share/webapps/cops /var/www/localhost/cops # clear previous config -if [ -e /var/www/localhost/cops/config_local.*.php ] -then - rm /var/www/localhost/cops/config_local.*.php -fi +[[ -e /var/www/localhost/cops/config_local.*.php ]] && + rm /var/www/localhost/cops/config_local.*.php # copy config [[ ! -e /config/config_local.php ]] && \ cp /defaults/config_local.php /config/config_local.php -cp /config/config_local*.php /var/www/localhost/cops/ + +# copy extra user-profiles +[[ -e /config/config_local*.php ]] && \ + cp /config/config_local*.php /var/www/localhost/cops/ # permissions chown -R abc:abc \ From b5278e14244b0fb0c131957103cde4570bc71aca Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 11 Dec 2016 00:08:49 +0000 Subject: [PATCH 4/5] Update 40-config --- root/etc/cont-init.d/40-config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index e458426..a02da45 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -9,8 +9,11 @@ mkdir -p \ ln -s /usr/share/webapps/cops /var/www/localhost/cops # clear previous config -[[ -e /var/www/localhost/cops/config_local.*.php ]] && - rm /var/www/localhost/cops/config_local.*.php +for f in /var/www/localhost/cops/config_local.*.php +do + # if file, delete it + [ -f "$f" ] && rm "$f" +done # copy config [[ ! -e /config/config_local.php ]] && \ From 5e5a3c4ddf6ce33aa52545d547c51190c8565911 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 11 Dec 2016 00:26:26 +0000 Subject: [PATCH 5/5] Update 40-config --- root/etc/cont-init.d/40-config | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index a02da45..37302a1 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -10,9 +10,8 @@ mkdir -p \ # clear previous config for f in /var/www/localhost/cops/config_local.*.php -do - # if file, delete it - [ -f "$f" ] && rm "$f" +do +[ -f "$f" ] && rm "$f" done # copy config @@ -20,8 +19,10 @@ done cp /defaults/config_local.php /config/config_local.php # copy extra user-profiles -[[ -e /config/config_local*.php ]] && \ - cp /config/config_local*.php /var/www/localhost/cops/ +for f in /config/config_local*.php +do +cp "$f" /var/www/localhost/cops/ +done # permissions chown -R abc:abc \