wip #6269 @0.25

diff --git a/config/apache2.conf b/config/apache2.conf
new file mode 100644 (file)
index 0000000..d7093a3
--- /dev/null
+++ b/config/apache2.conf
@@ -0,0 +1,28 @@
+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 /srv/www/>
+       Options Indexes FollowSymLinks
+       AllowOverride None
+       Require all granted
+</Directory>
+
+<VirtualHost *:80>
+       DocumentRoot /srv/www
+</VirtualHost>

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a15024713f7f6649f212ba50bdc0b1c631abc42..e2a72cdaf3ab16b21af13bef63dd0e8c22537c23 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       - './ssh/id_rsa.pub:/home/user/.ssh/id_rsa.pub:ro'
       - './ssh/id_rsa:/root/.ssh/id_rsa:ro'
       - './ssh/id_rsa.pub:/root/.ssh/id_rsa.pub:ro'
+      - './www/:/var/www/html/'
+      - './config/apache2.conf:/etc/apache2/apache2.conf'
     restart: unless-stopped
     build: .
     env_file: env
@@ -15,6 +17,8 @@ services:
       - TZ=Europe/Paris
     networks:
       - fluidbook-hosting-loadbalancer
+    ports:
+      - "9471:80"
 
 networks:
   nginxproxy: