wip #7741

diff --git a/config/httpd/apache2.conf b/config/httpd/apache2.conf
index 77912b87542f5a527bdf9f8e5cf3c730cb54efc6..eefb78f22a4eec8afa451197ef6bc2d9cd6fbb76 100644 (file)
--- a/config/httpd/apache2.conf
+++ b/config/httpd/apache2.conf
@@ -19,6 +19,7 @@ LoadModule headers_module modules/mod_headers.so
        Header set Access-Control-Allow-Origin "*"
 </Directory>
 
+<VirtualHost *:80>
        DocumentRoot /usr/local/apache2/htdocs
        Header set Access-Control-Allow-Origin "*"
 </VirtualHost>

diff --git a/docker-compose.yml b/docker-compose.yml
index e58ea84cdb7ec5d4bba3d1aa49723e906b47aaf0..e77306b55f0073c1b7d4e3ea1535a57a59a24a3a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - './ssh/id_rsa.pub:/root/.ssh/id_rsa.pub:ro'
       - './ssh/known_hosts:/root/.ssh/known_hosts'
       - '${WWW}:/usr/local/apache2/htdocs/'
-      - './config/httpd/apache2.conf:/usr/local/apache2/conf/apache2.conf'
+      - './config/httpd/apache2.conf:/usr/local/apache2/conf/httpd.conf'
       - './bin/startup:/usr/local/bin/startup'
       - './bin/sync:/usr/local/bin/sync'
       - './config/crontab:/etc/crontab'