[connfa-web] Make sure httpd is installed, fixes to sed path

[Andrea Veri <averi src gnome org>]

commit 3c8486a33f10055878a50371debaf8e7fedb49aa
Author: Andrea Veri <averi redhat com>
Date:   Tue Jun 18 18:52:42 2019 +0200

    Make sure httpd is installed, fixes to sed path

 Dockerfile    |  3 ++-
 entrypoint.sh | 12 ++++++------
 httpd.conf    |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index c9dabb3..cf40c51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM centos/php-71-centos7
 
 USER root
-RUN yum -y install git && \
+RUN yum -y install git httpd && \
     rm -rf /var/cache/yum/* && yum clean all
 RUN wget 
https://raw.githubusercontent.com/composer/getcomposer.org/3c21a2c1affd88dd3fec6251e91a53e440bc2198/web/installer
 -O - -q | php -- --quiet --install-dir=/usr/bin/ --filename=composer
 RUN install -dm750 -o default -g root /app
@@ -15,5 +15,6 @@ COPY env /app/connfa/.env
 RUN rm /etc/httpd/conf.d/welcome.conf
 COPY httpd.conf /etc/httpd/conf.d/connfa.conf
 
+WORKDIR /app/connfa
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index fd6b05a..0efab6b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-sed -i "s/CONNFA_APP_KEY/$CONNFA_APP_KEY/g" /app/connfa-integration-server/.env
-sed -i "s/CONNFA_APP_URL/$CONNFA_APP_URL/g" /app/connfa-integration-server/.env
-sed -i "s/CONNFA_MYSQL_HOST/$CONNFA_MYSQL_HOST/g" /app/connfa-integration-server/.env
-sed -i "s/CONNFA_MYSQL_DB/$CONNFA_MYSQL_DB/g" /app/connfa-integration-server/.env
-sed -i "s/CONNFA_MYSQL_USER/$CONNFA_MYSQL_USER/g" /app/connfa-integration-server/.env
-sed -i "s/CONNFA_MYSQL_PASS/$CONNFA_MYSQL_PASS/g" /app/connfa-integration-server/.env
+sed -i "s/CONNFA_APP_KEY/$CONNFA_APP_KEY/g" /app/connfa/.env
+sed -i "s/CONNFA_APP_URL/$CONNFA_APP_URL/g" /app/connfa/.env
+sed -i "s/CONNFA_MYSQL_HOST/$CONNFA_MYSQL_HOST/g" /app/connfa/.env
+sed -i "s/CONNFA_MYSQL_DB/$CONNFA_MYSQL_DB/g" /app/connfa/.env
+sed -i "s/CONNFA_MYSQL_USER/$CONNFA_MYSQL_USER/g" /app/connfa/.env
+sed -i "s/CONNFA_MYSQL_PASS/$CONNFA_MYSQL_PASS/g" /app/connfa/.env
 
 php artisan migrate
 php artisan password:change --name=admin --password="$CONNFA_ADMIN_PASS"
diff --git a/httpd.conf b/httpd.conf
index d9322dc..9fa9120 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -22,7 +22,7 @@ Listen 0.0.0.0:8843 https
 </VirtualHost>
 
 <VirtualHost *:8843>
-        ServerName connfa.gnome.org
+        ServerName connfa.guadec.org
 
         SSLEngine on
         SSLCompression Off