[odrs-web] Now that conf.d has the perms we need for run-httpd, move the vhost back there (debugging related as

[Andrea Veri <averi src gnome org>]

commit 55d5a2f9a134b52f2d662dede66fa0a7666b388f
Author: Andrea Veri <averi redhat com>
Date:   Mon Dec 17 13:28:08 2018 +0100

    Now that conf.d has the perms we need for run-httpd, move the vhost back there (debugging related as the 
vhost shows up on httpd -D DUMP_VHOSTS but passes no traffic

 Dockerfile    | 8 ++------
 entrypoint.sh | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index c64de02..9162c3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,17 +12,13 @@ WORKDIR ${ODRS_HOME}
 
 COPY app_data ${ODRS_HOME}
 
-RUN mkdir /etc/httpd/sites.d && \
-    echo 'IncludeOptional sites.d/*.conf' >> /etc/httpd/conf/httpd.conf && \
-    rm /etc/httpd/conf.d/welcome.conf
-
-COPY odrs.gnome.org.conf /etc/httpd/sites.d/odrs.gnome.org.conf
+RUN rm /etc/httpd/conf.d/welcome.conf
+COPY odrs.gnome.org.conf /etc/httpd/conf.d/odrs.gnome.org.conf
 
 RUN python /opt/app-root/src/cron.py ratings /opt/app-root/src/app/static/ratings.json 
 
 RUN chown -R 1000310000:0 ${ODRS_HOME} && \
     chmod -R 664 ${ODRS_HOME} && \
-    chown -R 1000310000:0 /etc/httpd/sites.d && \
     chown 1000310000:0 /etc/httpd/conf && \
     chown 1000310000:0 /etc/httpd/conf.d && \
     find ${ODRS_HOME} -type d -exec chmod 775 {} +
diff --git a/entrypoint.sh b/entrypoint.sh
index 65835d8..9f3b21d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-sed -i "s/replace_odrs_secret/${ODRS_REVIEWS_SECRET}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-sed -i "s/replace_odrs_username/${MYSQL_DB_USERNAME}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-sed -i "s/replace_odrs_password/${MYSQL_DB_PASSWORD}/" /etc/httpd/sites.d/odrs.gnome.org.conf
-sed -i "s/replace_odrs_host/${MYSQL_DB_HOST}/" /etc/httpd/sites.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_secret/${ODRS_REVIEWS_SECRET}/" /etc/httpd/conf.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_username/${MYSQL_DB_USERNAME}/" /etc/httpd/conf.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_password/${MYSQL_DB_PASSWORD}/" /etc/httpd/conf.d/odrs.gnome.org.conf
+sed -i "s/replace_odrs_host/${MYSQL_DB_HOST}/" /etc/httpd/conf.d/odrs.gnome.org.conf
 
 while true; do python /opt/app-root/src/cron.py ratings /opt/app-root/src/app/static/ratings.json ; sleep 
43200 ; done &