[gimp-web/oscp] Move source files within html

[Andrea Veri <averi src gnome org>]

commit 0dc71e35fa330bd4acb8d176c593e2d4cf4b2821
Author: Andrea Veri <averi redhat com>
Date:   Fri Mar 13 17:29:05 2020 +0100

    Move source files within html

 Dockerfile                           | 4 ++--
 app_data/httpd-cfg/www.gimp.org.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index f246157d..5117b974 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ COPY app_data /opt/app-root/src
 RUN yum install -y python2-pip git
 RUN git clone https://gitlab.gnome.org/Infrastructure/gimp-web.git /tmp/gimp-web && \
     cd /tmp/gimp-web && pip install -r py2-requirements.txt && \
-    pelican content -o /opt/app-root/src -s pelicanconf.py && \
-    chown -R 1000580000:1000580000 /opt/app-root/src
+    pelican content -o /opt/app-root/src/html -s pelicanconf.py && \
+    chown -R 1000580000:1000580000 /opt/app-root/src/html
 
 EXPOSE 8080
 
diff --git a/app_data/httpd-cfg/www.gimp.org.conf b/app_data/httpd-cfg/www.gimp.org.conf
index 5aa9eb23..432333ad 100644
--- a/app_data/httpd-cfg/www.gimp.org.conf
+++ b/app_data/httpd-cfg/www.gimp.org.conf
@@ -3,7 +3,7 @@
     ServerAlias www.gimp.org
 
     ServerAdmin webmaster gimp org
-    DocumentRoot /opt/app-root/src 
+    DocumentRoot /opt/app-root/src/html
 
     # Disable unsafe inline/eval, only load resources from same origin
     # except also allow OpenHub. Also disables the execution of plugins.
@@ -30,7 +30,7 @@
     ErrorDocument 404 /404.html
 </VirtualHost>
 
-<Directory "/opt/app-root/src">
+<Directory "/opt/app-root/src/html">
   Require all granted
 </Directory>