From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 14 Sep 2023 17:49:24 +0000 (+0200)
Subject: wip #6269
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1b67069403962c455af15fd5ef5ee9068c87b5b0;p=fluidbook-hosting-loadbalancer.git

wip #6269
---

diff --git a/config/apache2.conf b/config/apache2.conf
deleted file mode 100644
index 0e18e7d..0000000
--- a/config/apache2.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-HostnameLookups Off
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-<Directory />
-	Options FollowSymLinks
-	AllowOverride None
-	Require all denied
-</Directory>
-
-<Directory /var/www/html>
-	Options Indexes FollowSymLinks
-	AllowOverride None
-	Require all granted
-</Directory>
-
-<VirtualHost *:80>
-	DocumentRoot /var/www/html
-	Header set Access-Control-Allow-Origin "*"
-</VirtualHost>
diff --git a/config/httpd/apache2.conf b/config/httpd/apache2.conf
new file mode 100644
index 0000000..0e18e7d
--- /dev/null
+++ b/config/httpd/apache2.conf
@@ -0,0 +1,29 @@
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+HostnameLookups Off
+
+# Include module configuration:
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# Include list of ports to listen on
+Include ports.conf
+
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /var/www/html>
+	Options Indexes FollowSymLinks
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<VirtualHost *:80>
+	DocumentRoot /var/www/html
+	Header set Access-Control-Allow-Origin "*"
+</VirtualHost>
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c35fdb..8be8841 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,8 @@ services:
       - './ssh/id_rsa.pub:/root/.ssh/id_rsa.pub:ro'
       - './ssh/known_hosts:/root/.ssh/known_hosts'
       - './www/:/var/www/html/'
-      - './config/apache2.conf:/etc/apache2/apache2.conf'
+      - './config/httpd/apache2.conf:/etc/apache2/apache2.conf'
+      - './config/httpd/mods-enabled/:/etc/apache2/mods-enabled/'
       - './bin/sync:/usr/local/bin/sync'
     restart: unless-stopped
     build: .