From 3951d9deb1304bf944ca03b47766bc314551ffdc Mon Sep 17 00:00:00 2001
From: a-sansara <dev@pluie.org>
Date: Wed, 15 Mar 2017 04:35:10 +0100
Subject: [PATCH] fix apache $WWW-DIR creation

---
 pluie/alpine-apache-fpm/files.tar             | Bin 10240 -> 10240 bytes
 .../install.d/50-fix-apache.sh                |   7 -------
 .../alpine-apache-fpm/pre-init.d/10-apache.sh |  11 +++++++++++
 .../alpine-apache-fpm/pre-init.d/10-vhost.sh  |   2 +-
 pluie/alpine-apache-php7/files.tar            | Bin 10240 -> 10240 bytes
 .../install.d/50-fix-apache.sh                |   9 +--------
 .../pre-init.d/10-apache.sh                   |  11 +++++++++++
 .../alpine-apache-php7/pre-init.d/10-vhost.sh |   2 +-
 pluie/alpine-apache/files.tar                 | Bin 10240 -> 10240 bytes
 .../alpine-apache/install.d/50-fix-apache.sh  |   9 +--------
 pluie/alpine-apache/pre-init.d/10-apache.sh   |  11 +++++++++++
 pluie/alpine-apache/pre-init.d/10-vhost.sh    |   2 +-
 pluie/alpine-symfony-php7/files.tar           | Bin 10240 -> 10240 bytes
 .../pre-init.d/10-symfony.sh                  |   2 +-
 pluie/alpine-symfony/files.tar                | Bin 10240 -> 10240 bytes
 pluie/alpine-symfony/pre-init.d/10-symfony.sh |   2 +-
 16 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar
index c5eb4bc240cea1e0fbe9848e4bf0c0bcc2719d08..a484cb48865274f805fa3678e2815842cb3a564e 100644
GIT binary patch
delta 388
zcmZn&Xb70lEo5e7Xk>0|X24)zXk=z$#Gqg>*^x12Gb3XcGf2+Z$k@OHC}(VJWXPak
z3Xx-NVw5s8G&g53G&Vp|V`^+<3fIqG!8o~8Oh&*t$kj2#H9kB%Jl@4K$kuRjkC=LF
znu2~}L4m#sR20JS^mB2IP>8iwD9K38<5B>E)Z~nO1tlB%f{X$MAkNH7%h%AfR#LE2
zz^R`rEpu|5_{Plz91|EP2QW^X#MLHl26v~C5y&s5MkWY%a?3I?#%z}3eaJLP02~^|
zhNcE)ARil<7{h%m*vu$t2n-0QhoMT$42;a-9u_WVp1e)WU^1t8*k*o-kIb7l$O|$~
Ol0gY!6q{xLa{vHb<6!~-

delta 275
zcmZn&Xb70lEo5kHU}|b=V8mcxXk=z=!k}O<*^x12Gb3XcGqRkqv5_Hzf+<9fwTV&6
zz{JRu0jL>Czp1g20bD<CHRI-IoGpx#c-q7<6dIWrBNWOqZI<VM$Ta!CU=NCoMkYYh
zpf(COGfJ9bSZHQoj4(&EoOyB$hvei{97>Z*C5$IqaVbt-CJ`}Ni*v)~e-a;=C&{6B
T*3`(@9PS4B{~U`qC^7*6>F`2t

diff --git a/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh b/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh
index 3c7b970..3aec4c2 100755
--- a/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh
+++ b/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh
@@ -20,19 +20,12 @@ function a2setModule(){
 if [ ! -f /usr/lib/libxml2.so ]; then
     ln -s /usr/lib/libxml2.so.2 /usr/lib/libxml2.so
 fi
-if [ ! -d /app/$WWW_DIR ]; then
-    mkdir -p /app/$WWW_DIR
-fi
 if [ ! -d /run/apache2 ]; then
     mkdir /run/apache2
 fi
-chown -R 1000:apache /app/$WWW_DIR
 chmod -R 755 /scripts/pre-init.d
 mkdir -p /run/apache2
 chown apache:apache /run/apache2
-tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g'
-sed -i "$tmpsed" /etc/apache2/httpd.conf
-sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
 initTitle "Apache" "Loading Modules"
 a2setModule 1 "rewrite"
 a2setModule 1 "mpm_event"
diff --git a/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh b/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh
index 1a3b8c2..82f59f7 100755
--- a/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh
+++ b/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh
@@ -2,6 +2,17 @@
 # @app      pluie/alpine-apache
 # @author   a-Sansara https://git.pluie.org/pluie/docker-images
 
+if [ ! -d /app/$WWW_DIR ]; then
+    CREATE_WWW_DIR=1
+    mkdir -p /app/$WWW_DIR
+fi
+if [ ! -f /app/$WWW_DIR/$WWW_INDEX ]; then
+    echo "<?php phpinfo();" >  /app/$WWW_DIR/$WWW_INDEX
+fi
+tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g'
+sed -i "$tmpsed" /etc/apache2/httpd.conf
+sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
+
 if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then
     chown -R 1000:apache /app/$WWW_DIR
 fi
diff --git a/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh b/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh
index b7184f9..4d74bf1 100755
--- a/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh
+++ b/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh
@@ -6,7 +6,7 @@ if [ ! -z "/app/vhost" ]; then
     cat <<EOF > "/app/vhost"
 <VirtualHost *:80>
     ServerName $HTTP_SERVER_NAME
-    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=\$1
     <FilesMatch \.php$>
         SetHandler proxy:fcgi://127.0.0.1:9000
     </FilesMatch>
diff --git a/pluie/alpine-apache-php7/files.tar b/pluie/alpine-apache-php7/files.tar
index 559c3d7cae46037dc686f4a31840174f29c4ef04..fa6f04f9954fc957b083dda63d143fe5b9922faa 100644
GIT binary patch
delta 418
zcmZn&Xb70lEo5e7Xk>0|X24)zXk=z$!k}O<*^x12Gb3XcGf2+Z$iUDHC}(VJWXPak
z3Xx-NVw5s8GBIN?G&Vp|V`^+<1lP}A!8mynhm3%8kgH>eYkYWkc)W{ekgeh5OJeG=
zX$ty@1qJ#lP*DiO)6c~<LLt^#p(G<Uk4pgvQj;_C6_jl33o;56fH*TREnh>^T1ml9
z0jGYhw9Ls%#W!y*;^<?X9Kbkj5?7nJDa@UQCSbpq8kqw90`(`iEE8kQW;x!6Op^q_
zp#k)gIVd!YjX<FR^|2t($3R_%Fq5Ea%nXbXCJAq1p8P?~X0pF{_~vklT}+c?G8xS#
dXUQlchp~ydIYNglB#dF<Z)#+MkW>861_0zQXhi@3

delta 310
zcmZn&Xb70lEo5kHU}|b=V8mcxXk=z=#-Ly@*^x12Gb3Xcvyh3giLsHnp#f0N*x1N~
zLBSLv$J)dwWnf}%!T{8aq~8>*2CAR8nsM_p&KAZ=JZ<6_3XM!m;TG}AGHsUUf5<fX
zzhDp0MpHu*0|PUVjYcL$a2thzHW~wkKsF+&F*7hShZ`iiiFtA%hsxwt97>b-NElDH
z;!>RaRw8n;7U!nT?vgv1CSPEBKS?H&(PVO#j3UTyW+ui4=0KZF%*~DArpQA4ZE9d_
RZU~e!H8L@T%PIb60|3RPN{avh

diff --git a/pluie/alpine-apache-php7/install.d/50-fix-apache.sh b/pluie/alpine-apache-php7/install.d/50-fix-apache.sh
index b85c386..60f09ab 100755
--- a/pluie/alpine-apache-php7/install.d/50-fix-apache.sh
+++ b/pluie/alpine-apache-php7/install.d/50-fix-apache.sh
@@ -22,21 +22,14 @@ fi
 if [ ! -f /usr/lib/libxml2.so ]; then
     ln -s /usr/lib/libxml2.so.2 /usr/lib/libxml2.so
 fi
-if [ ! -d /app/$WWW_DIR ]; then
-    mkdir -p /app/$WWW_DIR
-fi
+
 if [ ! -d /run/apache2 ]; then
     mkdir /run/apache2
 fi
-chown -R 1000:apache /app/$WWW_DIR
 chmod -R 755 /scripts/pre-init.d
 mkdir -p /run/apache2
 chown apache:apache /run/apache2
 
-tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g'
-sed -i "$tmpsed" /etc/apache2/httpd.conf
-sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
-
 initTitle "Apache" "Loading Modules"
 a2setModule 1 "rewrite"
 a2setModule 1 "mpm_prefork"
diff --git a/pluie/alpine-apache-php7/pre-init.d/10-apache.sh b/pluie/alpine-apache-php7/pre-init.d/10-apache.sh
index aa532e8..ed914f4 100755
--- a/pluie/alpine-apache-php7/pre-init.d/10-apache.sh
+++ b/pluie/alpine-apache-php7/pre-init.d/10-apache.sh
@@ -2,6 +2,17 @@
 # @app      pluie/alpine-apache
 # @author   a-Sansara https://git.pluie.org/pluie/docker-images
 
+if [ ! -d /app/$WWW_DIR ]; then
+    CREATE_WWW_DIR=1
+    mkdir -p /app/$WWW_DIR
+fi
+if [ ! -f /app/$WWW_DIR/$WWW_INDEX ]; then
+    echo "<?php phpinfo();" >  /app/$WWW_DIR/$WWW_INDEX
+fi
+tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g'
+sed -i "$tmpsed" /etc/apache2/httpd.conf
+sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
+
 if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then
     chown -R 1000:apache /app/$WWW_DIR
 fi
diff --git a/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh b/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh
index 4c2481b..df8ed92 100755
--- a/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh
+++ b/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh
@@ -6,7 +6,7 @@ if [ ! -z "/app/vhost" ]; then
     cat <<EOF > "/app/vhost"
 <VirtualHost *:80>
     ServerName $HTTP_SERVER_NAME
-    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=\$1
     <Directory /app/$WWW_DIR>
         AllowOverride None
         Require all granted
diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar
index 1dc4c75b1dbc3bfce8b70fb9b67a1df1e884fddc..d2b54fd91724c9b74acad43e8242c0f7b664a346 100644
GIT binary patch
delta 384
zcmZn&Xb70lEo5e7Xk>0|X24)zXk=z$!k}O<*^x12Gb3XcGf2+Z$k@;vC}(VJWXhmm
z3Xx-NVw5s8GBIN?G&Vp|V`^+<2G`GC!8o}@Oh&*t$kj2#H9kB%Jl@4K$kuRjx0rft
znu2~}L4m#sR20JS^mB2IP>8iwD9K38<5B>E)Z~nO1tlB%f{X$MAkNH7%h%AfR#LE2
zz^R`rEpu|5_~y+;9DR(F0~n`G;%XB&g}Kwvz}yJv7gHk>bGSRXWtkXbHp}roWSS%Z
z4h>@ib2DR*kHM;-J{AP}*vQ!29A*+!jhO*35MUuDT*f?ktC-$oR`ICK0uqeOlVngr
O*VM?=5Uy7CKNkSO3SQCx

delta 274
zcmZn&Xb70lEo5kHU}|b=V8mcxXk=z=#-Ly@*^x12Gb3XcGqRkqv5_Hzf+<9fwTV&6
zz{K2y0jL>Czp1g230yyKHRI-IoGpx#c-q7<6dIYBA{5FpZI<VM$Ta!CU=NCoMkWSu
z8-;;38XFiHpxJ0<0CE-7#iC`*lWRC6C$HjAnp`4bIN5?rdGa!e$jMrqn-)njPrktP
Tev%A|e@%@{jN!Uv|8oHVn8rbQ

diff --git a/pluie/alpine-apache/install.d/50-fix-apache.sh b/pluie/alpine-apache/install.d/50-fix-apache.sh
index 71b35f6..5f7f3ba 100755
--- a/pluie/alpine-apache/install.d/50-fix-apache.sh
+++ b/pluie/alpine-apache/install.d/50-fix-apache.sh
@@ -19,21 +19,14 @@ function a2setModule(){
 if [ ! -f /usr/lib/libxml2.so ]; then
     ln -s /usr/lib/libxml2.so.2 /usr/lib/libxml2.so
 fi
-if [ ! -d /app/$WWW_DIR ]; then
-    mkdir -p /app/$WWW_DIR
-fi
 if [ ! -d /run/apache2 ]; then
     mkdir /run/apache2
 fi
-chown -R 1000:apache /app/$WWW_DIR
+
 chmod -R 755 /scripts/pre-init.d
 mkdir -p /run/apache2
 chown apache:apache /run/apache2
 
-tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g'
-sed -i "$tmpsed" /etc/apache2/httpd.conf
-sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
-
 initTitle "Apache" "Loading Modules"
 a2setModule 1 "rewrite"
 a2setModule 1 "mpm_prefork"
diff --git a/pluie/alpine-apache/pre-init.d/10-apache.sh b/pluie/alpine-apache/pre-init.d/10-apache.sh
index aa532e8..ed914f4 100755
--- a/pluie/alpine-apache/pre-init.d/10-apache.sh
+++ b/pluie/alpine-apache/pre-init.d/10-apache.sh
@@ -2,6 +2,17 @@
 # @app      pluie/alpine-apache
 # @author   a-Sansara https://git.pluie.org/pluie/docker-images
 
+if [ ! -d /app/$WWW_DIR ]; then
+    CREATE_WWW_DIR=1
+    mkdir -p /app/$WWW_DIR
+fi
+if [ ! -f /app/$WWW_DIR/$WWW_INDEX ]; then
+    echo "<?php phpinfo();" >  /app/$WWW_DIR/$WWW_INDEX
+fi
+tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g'
+sed -i "$tmpsed" /etc/apache2/httpd.conf
+sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
+
 if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then
     chown -R 1000:apache /app/$WWW_DIR
 fi
diff --git a/pluie/alpine-apache/pre-init.d/10-vhost.sh b/pluie/alpine-apache/pre-init.d/10-vhost.sh
index 4c2481b..df8ed92 100755
--- a/pluie/alpine-apache/pre-init.d/10-vhost.sh
+++ b/pluie/alpine-apache/pre-init.d/10-vhost.sh
@@ -6,7 +6,7 @@ if [ ! -z "/app/vhost" ]; then
     cat <<EOF > "/app/vhost"
 <VirtualHost *:80>
     ServerName $HTTP_SERVER_NAME
-    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=\$1
     <Directory /app/$WWW_DIR>
         AllowOverride None
         Require all granted
diff --git a/pluie/alpine-symfony-php7/files.tar b/pluie/alpine-symfony-php7/files.tar
index ff9e89c39e7035c39121cb2392192acbc46ce5d8..7687ea4dbb075b895fa8cb0db24a337dc464a563 100644
GIT binary patch
delta 182
zcmZn&Xb70lEo5e7Xk>0|X24)zXk=z$!k}O<*^x12Gb3XcGf2)Dh|Ga<#>Pgb3<{<Y
zIo4)INmBzu218>5BqgS121ao0>_v<sx>X8FD$YT!jv=n`;o;%&E}lV3n_D?587Fa}
a*lTQLVg@&xyNeOoO{S*C2siQmmjVEyt0_AG

delta 181
zcmZn&Xb70lEo5kHU}|b=V8mcxXk=z=#-Ly@*^x12Gb3Xcvyh3gsiCQn5lGJ1*vN!I
z!4x9L+RP|vVs6d=)QhCV)XdNnuARMzQAkliH$_1|v7kU-B|JPl-o-O$b2~>R<K%yw
my&$6vj0_CSK}H*y7{HC@?qUSX8JdCROihiA;b!vwmjVEv@hPYP

diff --git a/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh b/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh
index c9db74b..8f609ef 100755
--- a/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh
+++ b/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh
@@ -2,7 +2,7 @@
 # @app      pluie/alpine-symfony
 # @author   a-Sansara https://git.pluie.org/pluie/docker-images
 
-if [ ! -d /app/$WWW_DIR ]; then
+if [ -z "$CREATE_WWW_DIR" ]; then
     cd /tmp
     mkdir $WWW_DIR
     symfony new app $SYMFONY_VERSION
diff --git a/pluie/alpine-symfony/files.tar b/pluie/alpine-symfony/files.tar
index 0858a05c4f5d6aa10f8c055f23d1201dcf3a16fa..c4301dec8df86578887807c1ed2c5847795315d0 100644
GIT binary patch
delta 229
zcmZn&Xb70lEo5e7Xl!I?X3k(>Xl!h3z@T6{*^x12Gb3XQqlBp`gQ2kjk_uBZLt_R7
z1BeRdTt<t`G=*pd-6{no73UyV#}L=}@bK_>7tbIig;;Bal8n?mE(IV+PEpV=$t?i0
zbBYyoa}p<SWhoKM%}&WIQqV0>&`&HV&@W3Y($C3HFP_ZGDnHqURgzVoD=m`?Xw~FN
lY+z>^nH!rKfShS$Vg`36dlw_f3otoTQ)3gj13CZ80RU<xIO+fZ

delta 228
zcmZn&Xb70lEo5SBVq$1uWWZoxXl!g~#-Lz2*^x12Gb3XQqlAeegQ2kjk_uB(a}x#y
z1BeRdTt@etJO$li1^v?EBK@SyJpF=<0&^4|S7w?*w1T37Zi<3_VnKnvN_cp9yo+a$
zLaenyNk(cOmjVzZr%YbPQZo5B3m<!4etJ=UX~ASqR(Te#v`j9bP4g$QbqfKVVQOk>
dU<7idk%<A^mF!)N$a1EpMnE4x-N*S~4ggpfI|~2+

diff --git a/pluie/alpine-symfony/pre-init.d/10-symfony.sh b/pluie/alpine-symfony/pre-init.d/10-symfony.sh
index a5e2a4c..ca542ff 100644
--- a/pluie/alpine-symfony/pre-init.d/10-symfony.sh
+++ b/pluie/alpine-symfony/pre-init.d/10-symfony.sh
@@ -2,7 +2,7 @@
 # @app      pluie/alpine-symfony
 # @author   a-Sansara https://git.pluie.org/pluie/docker-images
 
-if [ ! -d /app/$WWW_DIR ]; then
+if [ -z "$CREATE_WWW_DIR" ]; then
     cd /tmp
     ls -la /tmp
     mkdir $WWW_DIR