From ca6be9b0727d26a5d52891602297416b88215d97 Mon Sep 17 00:00:00 2001
From: Andrei Condurachi <andrei@condurachi.ro>
Date: Fri, 20 Nov 2020 16:10:28 +0200
Subject: [PATCH] Cleanup

---
 Dockerfile | 5 +----
 run.sh     | 9 +--------
 vhost.conf | 6 +++---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 12ddc65..e9c481a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,13 +22,10 @@ RUN sed -i 's/LoadModule mpm_prefork_module/#LoadModule mpm_prefork_module/g' /e
     sed -i 's/^Group apache/Group www-data/g' /etc/apache2/httpd.conf && \
     # Prepare env and create user
     mkdir -p /var/log/apache2 && \
-    groupdel www-data && \
-    groupmod -g 101 -n www-data apache && \
-    usermod  -g 101 -u 100 -l www-data -d /var/www apache && \
     chown www-data:www-data /var/log/apache2 /var/www && \
     # Clean base directory and create required ones
     rm -rf /var/www/* && \
-    mkdir -p /run/apache2 /usr/local/apache && \
+    mkdir -p /usr/local/apache && \
     ln -s /usr/lib/apache2 /usr/local/apache/modules && \
     ln -s /var/log/apache2 /usr/local/apache/logs
 
diff --git a/run.sh b/run.sh
index d5d477e..484ed6b 100644
--- a/run.sh
+++ b/run.sh
@@ -1,10 +1,3 @@
 #!/bin/sh
-CURRENT_APACHE_ID=$(id -u www-data)
-if [ "$CURRENT_APACHE_ID" != "$APACHE_UID" ]; then
-    echo "Fixing permissions for www-data"
-    usermod -u $APACHE_UID www-data
-    groupmod -g $APACHE_GID www-data
-    chown -R www-data:www-data /run/apache2 /var/www
-fi
 
-exec /usr/sbin/httpd -DFOREGROUND;
+exec /usr/sbin/httpd -DFOREGROUND;
\ No newline at end of file
diff --git a/vhost.conf b/vhost.conf
index 0078233..26434bc 100644
--- a/vhost.conf
+++ b/vhost.conf
@@ -4,13 +4,13 @@ ServerName localhost
     ServerName localhost
 
     ## Vhost docroot
-    DocumentRoot /var/www
+    DocumentRoot /var/www/html
 
     ## Take .htaccess.local in priority
     AccessFileName .htaccess.local .htaccess
 
     ## PHP-FPM connection
-    ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php:9000/var/www/$1
+    ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php:9000/var/www/html/$1
     DirectoryIndex index.php
 
     ## Directories,
@@ -26,7 +26,7 @@ ServerName localhost
         Require all denied
     </DirectoryMatch>
 
-    <Directory "/var/www">
+    <Directory "/var/www/html">
         Options -Indexes +FollowSymLinks +IncludesNOEXEC -MultiViews
         AllowOverride All
         Require all granted