From beedd6dab7d5340ba62f4bd36b64414d9441c7e2 Mon Sep 17 00:00:00 2001
From: lipido <dgpena@uvigo.es>
Date: Thu, 3 Nov 2022 10:21:15 +0100
Subject: [PATCH] Fixes allowing .htaccess in htdocs

Since last commit (image update), the .htaccess
inside user app directories didn't work anymore.
This commit fixes this.
---
 000-default.conf | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile       |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 000-default.conf

diff --git a/000-default.conf b/000-default.conf
new file mode 100644
index 0000000..c44fda8
--- /dev/null
+++ b/000-default.conf
@@ -0,0 +1,51 @@
+<VirtualHost *:80>
+        ServerAdmin webmaster@localhost
+
+        DocumentRoot /var/www/html
+        <Directory />
+                Options Indexes FollowSymLinks MultiViews
+                # To make wordpress .htaccess work
+                AllowOverride All
+                Order allow,deny
+                allow from all
+        </Directory>
+
+	# lipido patch: allow .htaccess to work in any place
+	<Directory /var/www>
+                Options Indexes FollowSymLinks MultiViews
+                # To make wordpress .htaccess work
+                AllowOverride All
+                Order allow,deny
+                allow from all
+        </Directory>
+        Alias /phpmyadmin /var/www/phpmyadmin
+        <Directory /phpmyadmin>
+                Options Indexes FollowSymLinks MultiViews
+                # To make wordpress .htaccess work
+                AllowOverride All
+                Order allow,deny
+                allow from all
+        </Directory>
+
+        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+        <Directory "/usr/lib/cgi-bin">
+                AllowOverride None
+                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+        ErrorLog ${APACHE_LOG_DIR}/error.log
+
+        # Possible values include: debug, info, notice, warn, error, crit,
+        # alert, emerg.
+        LogLevel warn
+
+        CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	#
+	# Set HTTPS environment variable if we came in over secure
+	#  channel.
+	SetEnvIf x-forwarded-proto https HTTPS=on
+
+</VirtualHost>
diff --git a/Dockerfile b/Dockerfile
index 289c700..dda2731 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM mattrayner/lamp:0.8.0-2004-php8
 
 ENV PHP_DISPLAY_ERRORS Off
+ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
 ADD run.sh /run.sh
-- 
2.18.1