Merge pull request #24 from uw-it-aca/develop

Develop
uw-it-aca · Oct 30, 2019 · 26db9bb · 26db9bb
2 parents 5548f99 + ece6d8d
commit 26db9bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -49,6 +49,8 @@ RUN rm -rf /etc/apache2/sites-available/ && \
     mkdir /etc/apache2/sites-available/ && \
     rm -rf /etc/apache2/sites-enabled/ && \
     mkdir /etc/apache2/sites-enabled/ && \
+    rm -rf /etc/apache2/conf-enabled/ && \
+    mkdir /etc/apache2/conf-enabled/ && \
     rm /etc/apache2/apache2.conf && \
     cp /tmp/apache2.conf /etc/apache2/apache2.conf && \
     rm /etc/apache2/envvars &&\

diff --git a/conf/apache2.conf b/conf/apache2.conf
@@ -27,9 +27,11 @@ TypesConfig /etc/mime.types
   WSGIScriptAlias / /app/project/wsgi.py
 
   <Directory /app/project>
-  <Files wsgi.py>
-  Require all granted
-  </Files>
+    <Files wsgi.py>
+      Require all granted
+    </Files>
   </Directory>
 
+  IncludeOptional /etc/apache2/conf-enabled/*
+
 </VirtualHost>