From 8efe12893d84b7e3a0819f98243a86da9bef673b Mon Sep 17 00:00:00 2001
From: a-sansara <dev@pluie.org>
Date: Fri, 29 Jul 2016 17:09:39 +0200
Subject: [PATCH] apache : fix break install 3:2 > 3.4

---
 pluie/alpine-apache/README.md                 |   6 +++---
 pluie/alpine-apache/files.tar                 | Bin 10240 -> 10240 bytes
 pluie/alpine-apache/install.d/10-apache.sh    |   4 ++--
 .../alpine-apache/install.d/50-fix-apache.sh  |   3 +++
 pluie/alpine-apache/pre-init.d/10-vhost.sh    |   2 +-
 pluie/alpine/files.tar                        | Bin 20480 -> 20480 bytes
 pluie/alpine/install.d/20-inputrc.sh          |   1 -
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pluie/alpine-apache/README.md b/pluie/alpine-apache/README.md
index 0377048..36d481b 100644
--- a/pluie/alpine-apache/README.md
+++ b/pluie/alpine-apache/README.md
@@ -10,7 +10,7 @@ Extend pluie/alpine with __apache 2.4.23__ and __php 5.6.24__
 
 ## Image Size
 
-- image ~ 37 MB
+- image ~ 50 MB
 
 
 ## Image Volumes
@@ -37,11 +37,11 @@ by default it use the apache rewrite module to redirect all uri to the unique en
 
 chdir to your project directory
 ```
-$ docker run --name apache -it --link=db1:mysql -v $(pwd):/app pluie/apache
+$ docker run --name apache -it --link=mysql:db1 -v $(pwd):/app pluie/alpine-apache
 ```
 or
 ```
-$ docker run --name srv -it --link=db1:mysql -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/apache
+$ docker run --name apache -it --link=mysql:db1 -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache
 ```
 
 
diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar
index 2b29c9b485888255959019619f02566e4b9f184a..2f78f6203533e135ffe156610a104da397efc718 100644
GIT binary patch
delta 414
zcmZn&Xb9NQ%OYTAZeVI?%3xq<WNvK6pkO-LkTGR5BWo+8xETXb%)|_?z{JcHsK5ZC
zfc-C{a8PPtX=YKXLSjyiLV8hRUP)@oW**M>Oq+Q6SoqBij13Gx#+sR!!i^PdVw5s8
zGBJdk3{hihVr&RES$IC9S#EYpW|4w!fr5TfX`X&!L1J=7su5RmMt*so0)%G;p->b|
zo-Z;#Q$f90IY!whKQYBOKczG$RiP-gyeP9IH9i-@g;2%%Ksp{OrB|F!x(4;h3q>U-
zzZYSfY$tkX^9CkI#z|r=lBNc*P%|?Ju?-A?0cZsGoA`D{;fmZGg@TL%Q{94;{P^6;
Y;=&w-$)_azIKW~l`MH}VB=7S803x`4(EtDd

delta 233
zcmZn&Xb9NQ%OYTGY-Vh3%wS+>WNvKEpkO-LkTGR5BWo+8xFG{j%)|_?z{Jedh(W;s
zqJaG`BcEeVPJX#UT2X$kLSjzNW<k#POcNDYH}Ukb@S6b50~=~)VhT4@u!&L1z}&<L
zVy+oTjS<jdQxjvL8mPI#^BE^!7nwKtujrvk5-pM@=B9Af24-eJ)j(GOoe5Pfxt&p{
lASFLOx3ah}N1-62z*M&)H)rx`DZkB%()W2bCrEQL0RTr;Jm&xa

diff --git a/pluie/alpine-apache/install.d/10-apache.sh b/pluie/alpine-apache/install.d/10-apache.sh
index 68a0f70..4c9b181 100755
--- a/pluie/alpine-apache/install.d/10-apache.sh
+++ b/pluie/alpine-apache/install.d/10-apache.sh
@@ -2,6 +2,6 @@
 # pluie/docker-images - a-Sansara (https://github.com/a-sansara)
 
 apk --update add apache2 \
-php5-apache2 php5-cli php5-phar php5-zlib php5-zip php5-ctype php5-mysqli php5-pdo_mysql php5-xml \
-php5-opcache php5-pdo php5-json php5-curl php5-gd php5-mcrypt php5-openssl  \
+php5-apache2 php5-cli php5-phar php5-zlib php5-zip php5-ctype php5-mysqli php5-xml php5-pdo_mysql  \
+php5-opcache php5-pdo php5-json php5-curl php5-gd php5-mcrypt php5-openssl php5-dom \
 # php-pdo_odbc php-soap php-pgsql
diff --git a/pluie/alpine-apache/install.d/50-fix-apache.sh b/pluie/alpine-apache/install.d/50-fix-apache.sh
index eea85b2..9dc690b 100755
--- a/pluie/alpine-apache/install.d/50-fix-apache.sh
+++ b/pluie/alpine-apache/install.d/50-fix-apache.sh
@@ -4,8 +4,11 @@
 mkdir -p /app/www 
 chown -R 1000:apache /app/www
 chmod -R 755 /scripts/pre-init.d
+mkdir -p /run/apache2
+chown apache:apache /run/apache2
 sed -i 's#^DocumentRoot ".*#DocumentRoot "/app/www"#g' /etc/apache2/httpd.conf
 sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf
+sed -i 's#\#LoadModule rewrite_module modules/mod_rewrite.so#LoadModule rewrite_module modules/mod_rewrite.so#' /etc/apache2/httpd.conf
 sed -ir 's/expose_php = On/expose_php = Off/' /etc/php5/php.ini
 echo -e "\nIncludeOptional /app/vhost" >> /etc/apache2/httpd.conf
 rm -f /scripts/pre-init.d/50-example.sh
diff --git a/pluie/alpine-apache/pre-init.d/10-vhost.sh b/pluie/alpine-apache/pre-init.d/10-vhost.sh
index e338c80..161df18 100755
--- a/pluie/alpine-apache/pre-init.d/10-vhost.sh
+++ b/pluie/alpine-apache/pre-init.d/10-vhost.sh
@@ -7,7 +7,7 @@ if [ ! -z "/app/vhost" ]; then
     ServerName $HTTP_SERVER_NAME
     <Directory /app/www>
         AllowOverride None
-        Allow from all
+        Require all granted
         DirectoryIndex index.php
         <IfModule mod_rewrite.c>
             Options -MultiViews +FollowSymlinks
diff --git a/pluie/alpine/files.tar b/pluie/alpine/files.tar
index eabbecd182e26111fb13df4cc3c57f976e7df7ee..3f3b400a9e8f9da780f793ddc326ed60ae89420a 100644
GIT binary patch
delta 73
zcmZozz}T>WaYMfZpSiiY5rcuDk(rq}gM#T~L&lWNjFK&!5{4!WhDPQlW@e^P6{bKn
T3<?Gi70RcXCJLG?Qquwel^qde

delta 95
zcmZozz}T>WaYMfZpNWB)5rcuDk(sFpgM#T~L&lWNjFK&!5+;TWhDPQlW<YU>3R6Qv
qV+I8ShzjM?OrlAdc_|9IX$tzOCCU1kc?G2<Maf(f1?3m1X#oIUe;8i?

diff --git a/pluie/alpine/install.d/20-inputrc.sh b/pluie/alpine/install.d/20-inputrc.sh
index 5eb4b97..a56364d 100644
--- a/pluie/alpine/install.d/20-inputrc.sh
+++ b/pluie/alpine/install.d/20-inputrc.sh
@@ -10,4 +10,3 @@ cat <<EOF > /etc/inputrc
 "\e[5~": history-search-backward    # page-up
 "\e[6~": history-search-forward     # page-down
 EOF
-bind -f /etc/inputrc