From 43ca75bef61c5e8f2f6d29425f604b017c1f56b5 Mon Sep 17 00:00:00 2001
From: a-sansara <dev@pluie.org>
Date: Wed, 5 Jul 2017 21:20:53 +0200
Subject: [PATCH] fix TZ inheritance on install & init process

---
 pluie/alpine-apache-fpm/files.tar             | Bin 10240 -> 20480 bytes
 .../install.d/50-fix-apache.sh                |   1 +
 .../alpine-apache-fpm/pre-init.d/10-apache.sh |   6 +++---
 pluie/alpine-apache-fpm/pre-init.d/30-tz.sh   |   4 ++++
 pluie/alpine-apache-php7/files.tar            | Bin 20480 -> 20480 bytes
 pluie/alpine-apache-php7/pre-init.d/30-tz.sh  |   4 ++++
 pluie/alpine-apache/files.tar                 | Bin 10240 -> 10240 bytes
 pluie/alpine-apache/pre-init.d/10-apache.sh   |   6 +++---
 pluie/alpine-apache/pre-init.d/30-tz.sh       |   4 ++++
 pluie/alpine-fpm-php7/files.tar               | Bin 10240 -> 20480 bytes
 pluie/alpine-fpm-php7/pre-init.d/30-tz.sh     |   4 ++++
 pluie/alpine/files.tar                        | Bin 20480 -> 20480 bytes
 pluie/alpine/install.d/30-tz.sh               |   2 +-
 pluie/alpine/pre-init.d/30-tz.sh              |   7 +++++++
 14 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 pluie/alpine-apache-fpm/pre-init.d/30-tz.sh
 create mode 100644 pluie/alpine-apache-php7/pre-init.d/30-tz.sh
 create mode 100644 pluie/alpine-apache/pre-init.d/30-tz.sh
 create mode 100644 pluie/alpine-fpm-php7/pre-init.d/30-tz.sh
 create mode 100644 pluie/alpine/pre-init.d/30-tz.sh

diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar
index 515a7cd5539673cae7b9b014c902b6d21f4f6078..52a47b3869f892f418aa0f6716d39efb2d6bcf41 100644
GIT binary patch
delta 359
zcmZn&Xjs6wp^HV>(8$cx#MIQ(kio#v*x1;NLBVvgBV)>DMpiCH4r2q|k}AF8jERDQ
z>;^z!W@0iiTT;@<(2&8<7+I%@sj)eOf&oM)BRAt@Eh)vxjZ&7%$%!QjDkZrE#i=O@
zH45oPsRas3DTyVidL@~;sa5%TsY+a%8@b9EC$Y6kn3}>(H8C>>y2sSm!~||Cy8+YW
zN=~K8CY;6`Fe4{V;51@~8o&7_r#jO_1))tmU2G6v8JU_JfP7_SY7F<4a5JN%p)uSd
ms1h>+6QB~P^F?>EDiL<}=ABY1%!}l>HZM?2V8cNuumAw!o?uM?

delta 194
zcmZozz}OJ5p^HV>z|6?d*vQzxgu%ej*x1OBLBVvgBV)>DMpiDy$=qC366WR%hQ`RM
zOpT39859g4s<;i9CI|4E32_ytrYPuUDk!Ox<Q4$gN(z$=d6g#5<W&dK5}Qx(sxfU6
z=wbs}XKY|@W@Kg#vd+lN0B)UlGoz$|xe?4RV{=m@pb|3!6QB~PU6MOlH{X?0W}c{^
Iyhw=)01W^wF8}}l

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 5586042..e12f872 100755
--- a/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh
+++ b/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh
@@ -39,6 +39,7 @@ echo
 tmpsed="/etc/php5/php.ini"
 sed -ir 's/expose_php = On/expose_php = Off/' $tmpsed
 sed -i "s|;*date.timezone =.*|date.timezone = ${TZ}|i" $tmpsed
+cat $tmpsed | grep "date.timezone"
 sed -i "s|;*cgi.fix_pathinfo=.*|cgi.fix_pathinfo= 0|i" $tmpsed
 tmpsed="/etc/php5/php-fpm.conf"
 sed -i "s|;*daemonize\s*=\s*yes|daemonize = no|g" $tmpsed
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 82f59f7..e5c2b1f 100755
--- a/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh
+++ b/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh
@@ -9,9 +9,9 @@ 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
+tmpsed=/etc/apache2/httpd.conf
+sed -i 's#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' $tmpsed
+sed -i 's#AllowOverride none#AllowOverride All#' $tmpsed
 
 if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then
     chown -R 1000:apache /app/$WWW_DIR
diff --git a/pluie/alpine-apache-fpm/pre-init.d/30-tz.sh b/pluie/alpine-apache-fpm/pre-init.d/30-tz.sh
new file mode 100644
index 0000000..afe2a8b
--- /dev/null
+++ b/pluie/alpine-apache-fpm/pre-init.d/30-tz.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+tmpsed="/etc/php5/php.ini"
+sed -i "s|;*date.timezone =.*|date.timezone = ${TZ}|i" $tmpsed
+cat $tmpsed | grep "date.timezone"
diff --git a/pluie/alpine-apache-php7/files.tar b/pluie/alpine-apache-php7/files.tar
index d92b67a4a00257f0dc46343c524aa129770859d3..8395225594f978a589fd03d323ce6863f579e545 100644
GIT binary patch
delta 177
zcmZozz}T>WaYGl2u%VHesfn41kr{)5p|P=v0fU0+WJku7&5W#EjI726x+PVU1!aOc
z7z}{G%*143wv>dSA%meYvOW`26GH|C1BgCGZbqq++=AlN6k8?z)RJWVf{X%l5TTcu
zm#H+lK*~Z}1tQOtoLHg&Wh>Muq!*<YC@7^QmZa*HWag$;<>#d;acyo?EoWTB<^}*V
Cn=o1c

delta 47
zcmZozz}T>WaYGl2uz{JefvK^Hxgmprp|P>CA%lYHWJku7&5W#EjGMW+zPc`+pveLN
DD*FsT

diff --git a/pluie/alpine-apache-php7/pre-init.d/30-tz.sh b/pluie/alpine-apache-php7/pre-init.d/30-tz.sh
new file mode 100644
index 0000000..4661437
--- /dev/null
+++ b/pluie/alpine-apache-php7/pre-init.d/30-tz.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+tmpsed="/etc/php7/php.ini"
+sed -i "s|;*date.timezone =.*|date.timezone = ${TZ}|i" $tmpsed
+cat $tmpsed | grep "date.timezone"
diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar
index 04ddd83f8bdfb9b32a71f301bd798d47c38be8f8..9247d18d20daef0d06882a46518b7c62bffa4e59 100644
GIT binary patch
delta 254
zcmZn&Xb9NQ#UgBIWM*n&W^8D}U|?u$Y;3}yU^>~6F=aC&D;Fb&v4L($m0oeiM8QCI
z10XOnF`1YxC1GgDU}y}{XlMY^Xkuz?#GqgR(a6ZnC{>bMP@I}#tE8V=lB{2lQD6!p
z^fL1@l_sl6S!k<3<hha)OBA4Ng&KwQqSOKfrIf^yRK1eS+|;W4yi_Hw&4u#ijFZ?}
zC5#Q=mO@+$w9^c3DZ2sF<VsGZ$tIk}Tnb81GnFP!;56cd^ETh)RA-u~z_*A;0sxb2
BL$&|_

delta 121
zcmZn&Xb9NQ#UgBAW@Kn=WNc{8U|?u$Y-GxyU^>~6F=aC&D;MKrZmuc`6Eg-wV`NpP
z#ztlg3I-5W+y+dO19;7ZxQbI#6m&BclvGM`3xI4Tg~^7zN|R^vssm|>&1ZPkm=+00
JEN)O{0RWz)9VP$(

diff --git a/pluie/alpine-apache/pre-init.d/10-apache.sh b/pluie/alpine-apache/pre-init.d/10-apache.sh
index ed914f4..3ae508a 100755
--- a/pluie/alpine-apache/pre-init.d/10-apache.sh
+++ b/pluie/alpine-apache/pre-init.d/10-apache.sh
@@ -9,9 +9,9 @@ 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
+tmpsed=/etc/apache2/httpd.conf
+sed -i 's#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' "$tmpsed"
+sed -i 's#AllowOverride none#AllowOverride All#' "$tmpsed"
 
 if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then
     chown -R 1000:apache /app/$WWW_DIR
diff --git a/pluie/alpine-apache/pre-init.d/30-tz.sh b/pluie/alpine-apache/pre-init.d/30-tz.sh
new file mode 100644
index 0000000..afe2a8b
--- /dev/null
+++ b/pluie/alpine-apache/pre-init.d/30-tz.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+tmpsed="/etc/php5/php.ini"
+sed -i "s|;*date.timezone =.*|date.timezone = ${TZ}|i" $tmpsed
+cat $tmpsed | grep "date.timezone"
diff --git a/pluie/alpine-fpm-php7/files.tar b/pluie/alpine-fpm-php7/files.tar
index 507614bea3dce4437c09e50de60d06772a158b61..f41c72b625a1c16abfa68ff9bab5ae372c119fe4 100644
GIT binary patch
delta 193
zcmZn&Xjs6wp^HV>(8$cx#LU##l)=Ez*x1C7LBVvgBV)>DMpiCHR$~L*lB&sqGQk`S
z20&nDVlpvXO2W{P!O$34pNXl75rcvOL?0tJ<K!SI(aAF;c_!bIv{X(`EKyJ?$t@^O
yO;M;(NH0n)P*6%qEJ@WX$;?fy%Fjzx;@Z4Xxtwtko6_b3$_^|<5Q`5eGXVgZ=r>dV

delta 42
wcmZozz}OJ5p^HV>z|6?d*x20Eh`|6z8yhkxm`-+NOxeuH%Eh>uo9nA00PJZBYXATM

diff --git a/pluie/alpine-fpm-php7/pre-init.d/30-tz.sh b/pluie/alpine-fpm-php7/pre-init.d/30-tz.sh
new file mode 100644
index 0000000..4661437
--- /dev/null
+++ b/pluie/alpine-fpm-php7/pre-init.d/30-tz.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+tmpsed="/etc/php7/php.ini"
+sed -i "s|;*date.timezone =.*|date.timezone = ${TZ}|i" $tmpsed
+cat $tmpsed | grep "date.timezone"
diff --git a/pluie/alpine/files.tar b/pluie/alpine/files.tar
index e7a86efa1bd6a844a3a6ae5d99438d6b70c40d8f..deb9e24a6bc8be0f5adfbf01d38147c520ed6317 100644
GIT binary patch
delta 315
zcmZozz}T>WaYL7gu%VHesfnqPkvW5bp|P>C8H0l9WJku7&5WX4jI726x+PVU1=WHl
zCM!xB85uAb8Y8PWF*Pw{P%wa~XXIwA=gLe|h*nTi35iltP_$K0axE>&FG$r7NG!@M
zR#J$yRw&6x&Erx4g2aMs1>I1E#FP|;lB$%%l0>kmo`QaHa#3bMNwI!rUU5lcPL5uR
zKG+d@#TmF&m>B4$Wmf1Fvu1FmWpZt9<SJm?B-X_O@tcX6ff>keMy954ze#tpqDY#U
fm;pTw^@!pJ#>p(oH-%u%Oi9gwx^eRzWfcto$d*%x

delta 129
zcmZozz}T>WaYL7guz{J8p^>?<nE``=p|P=%IfH`fWJku7&5WX4jGMWo>REs)j1A09
zO-xKcDvV4`;40)hSy8l`n3w{!8$h(HeqiKFEXY<!NzG9xsY*#KNu2yf?cV0Q>dG36
H1I$<e!Z0Dd

diff --git a/pluie/alpine/install.d/30-tz.sh b/pluie/alpine/install.d/30-tz.sh
index b4da719..cd2c405 100644
--- a/pluie/alpine/install.d/30-tz.sh
+++ b/pluie/alpine/install.d/30-tz.sh
@@ -5,7 +5,6 @@
 if [ ! -z "$TZ" ] && [ -f "/usr/share/zoneinfo/$TZ" ]; then
     echo "$TZ" > /etc/TZ
     cp "/usr/share/zoneinfo/$TZ" "/etc/localtime"
-    apk del tzdata
     if [ ! "${TZ///*/}" = "$TZ" ]; then
         mkdir -p "/usr/share/zoneinfo/${TZ///*/}"
     fi
@@ -13,6 +12,7 @@ if [ ! -z "$TZ" ] && [ -f "/usr/share/zoneinfo/$TZ" ]; then
     echo -e "\033[1;38;5;203mTIMEZONE : $TZ"
     date
     echo -en "\033[m"
+    apk del tzdata
 else
     echo -e "\033[1;38;5;203mNO DEFINED TIMEZONE"
 fi
diff --git a/pluie/alpine/pre-init.d/30-tz.sh b/pluie/alpine/pre-init.d/30-tz.sh
new file mode 100644
index 0000000..5fc0777
--- /dev/null
+++ b/pluie/alpine/pre-init.d/30-tz.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$TZ" != "Europe/Paris" ]; then
+    apk -U add tzdata
+    . /scripts/install.d/30-tz.sh
+    . /scripts/install.d/40-fix.sh
+fi