diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar index 515a7cd..52a47b3 100644 Binary files a/pluie/alpine-apache-fpm/files.tar and b/pluie/alpine-apache-fpm/files.tar differ 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 " /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 d92b67a..8395225 100644 Binary files a/pluie/alpine-apache-php7/files.tar and b/pluie/alpine-apache-php7/files.tar differ 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 04ddd83..9247d18 100644 Binary files a/pluie/alpine-apache/files.tar and b/pluie/alpine-apache/files.tar differ 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 " /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 507614b..f41c72b 100644 Binary files a/pluie/alpine-fpm-php7/files.tar and b/pluie/alpine-fpm-php7/files.tar differ 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 e7a86ef..deb9e24 100644 Binary files a/pluie/alpine/files.tar and b/pluie/alpine/files.tar differ 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