[survey-web/oscp] Replace 8080 with 8843 to not have the default ssl.conf overlap (we also want to keep the dockerfile

[Andrea Veri <averi src gnome org>]

commit 6a5b700c54a9d3cacb9c8a30e3c11ef78e4bb336
Author: Andrea Veri <averi redhat com>
Date:   Fri May 3 20:36:39 2019 +0200

    Replace 8080 with 8843 to not have the default ssl.conf overlap (we also want to keep the dockerfile as 
simple as possible without having to mess up with additional httpd conf files

 docker/00_surveys.gnome.org.conf | 25 ++++++++++++++++++++++++-
 docker/Dockerfile                |  2 +-
 openshift/survey-web.yaml        | 16 ++++++++--------
 3 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/docker/00_surveys.gnome.org.conf b/docker/00_surveys.gnome.org.conf
index 7a68cae..4fda5c3 100644
--- a/docker/00_surveys.gnome.org.conf
+++ b/docker/00_surveys.gnome.org.conf
@@ -1,4 +1,27 @@
-<VirtualHost *:8443>
+Listen 0.0.0.0:8843 https
+
+<VirtualHost _default_:8843>
+        SSLEngine on
+        SSLCompression Off
+        SSLCertificateFile /var/serving-cert/tls.crt
+        SSLCertificateKeyFile /var/serving-cert/tls.key
+
+        DocumentRoot /app/limesurvey
+        <Directory />
+                Options Indexes FollowSymLinks MultiViews
+                # To make wordpress .htaccess work
+                AllowOverride All
+                Require all granted 
+        </Directory>
+
+        # Possible values include: debug, info, notice, warn, error, crit,
+        # alert, emerg.
+        LogLevel warn
+        ErrorLog /dev/stderr
+        TransferLog /dev/stdout
+</VirtualHost>
+
+<VirtualHost *:8843>
         ServerName surveys.gnome.org
 
         SSLEngine on
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5387ebb..8c1a1d5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,5 +25,5 @@ RUN chmod -R a+rwx /app/limesurvey/application/config
 USER 1001
 
 COPY run.sh /tmp/entrypoint.sh
-EXPOSE 8080
+EXPOSE 8843
 ENTRYPOINT ["/tmp/entrypoint.sh"]
diff --git a/openshift/survey-web.yaml b/openshift/survey-web.yaml
index 6471535..b9a04a1 100644
--- a/openshift/survey-web.yaml
+++ b/openshift/survey-web.yaml
@@ -125,7 +125,7 @@ objects:
         - name: limesurvey-app
           image: 
docker-registry.default.svc:5000/b7cg3n-tools/limesurvey-app@sha256:b20a6cbcb680782a21d89665ad3f59084af8869db60d75df3088d92987b6e28c
           ports:
-          - containerPort: 8080
+          - containerPort: 8843
             protocol: TCP
           env:
           - name: MYSQL_USER
@@ -162,8 +162,8 @@ objects:
           livenessProbe:
             httpGet:
               path: "/"
-              port: 8080
-              scheme: HTTP
+              port: 8843
+              scheme: HTTPS
             initialDelaySeconds: 60
             timeoutSeconds: 5
             periodSeconds: 10
@@ -172,7 +172,7 @@ objects:
           readinessProbe:
             httpGet:
               path: "/"
-              port: 8080
+              port: 8843
               scheme: HTTP
             initialDelaySeconds: 10
             timeoutSeconds: 2
@@ -199,8 +199,8 @@ objects:
     ports:
     - name: web
       protocol: TCP
-      port: 8080
-      targetPort: 8080
+      port: 8843
+      targetPort: 8843
     selector:
       app: "${SURVEY_NAME}"
       deploymentconfig: "${SURVEY_NAME}-app"
@@ -212,7 +212,7 @@ objects:
   apiVersion: v1
   metadata:
     name: "${SURVEY_NAME}"
-    creationTimestamp: 
+    creationTimestamp:
     labels:
       app: "${SURVEY_NAME}"
   spec:
@@ -224,7 +224,7 @@ objects:
     port:
       targetPort: web
     tls:
-      termination: edge
+      termination: reencrypt
       insecureEdgeTerminationPolicy: "Redirect"
     wildcardPolicy: None
 - kind: Secret