From c6f4229fdb5ae2d75f155352bd23f8575fbb54cc Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Fri, 22 Jun 2018 22:50:21 +0200
Subject: [PATCH] chore(httpd): updated templates

---
 httpd/v1.0.0/questions.yml             | 18 ++++++++++++------
 httpd/v1.0.0/templates/deployment.yaml |  5 +++++
 httpd/v1.0.0/values.yaml               |  6 +++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/httpd/v1.0.0/questions.yml b/httpd/v1.0.0/questions.yml
index 73ba9dd..d1e9f5e 100644
--- a/httpd/v1.0.0/questions.yml
+++ b/httpd/v1.0.0/questions.yml
@@ -26,14 +26,14 @@ questions:
   subquestions:
   - variable: persistence.size
     default: "10Gi"
-    description: "MOLGENIS Persistent Volume Size"
+    description: "Persistent Volume Size"
     type: string
-    label: Webhosting Volume Size
+    label: MOLGENIS Volume Size
   - variable: persistence.storageClass
     default: ""
     description: "If undefined or null, uses the default StorageClass. Default to null"
     type: storageclass
-    label: Default StorageClass for Webhosting
+    label: Default StorageClass for MOLGENIS
 - variable: ingress.enabled
   default: "true"
   description: "Expose app using Layer 7 Load Balancer - ingress"
@@ -42,9 +42,15 @@ questions:
   show_subquestion_if: true
   group: "Services and Load Balancing"
   subquestions:
-  - variable: ingress.hosts[0].name
+  - variable: httpd.hostname
     default: ""
-    description: "Hostname to your MOLGENIS installation"
+    description: "Hostname to your stack (comma separated)"
     type: hostname
     required: true
-    label: Hostname
\ No newline at end of file
+    label: Hostname
+  - variable: httpd.proxy
+    default: "[service]:[port]:[path]"
+    description: "Proxy to services (comma separated)"
+    type: string
+    required: true
+    label: Proxy
\ No newline at end of file
diff --git a/httpd/v1.0.0/templates/deployment.yaml b/httpd/v1.0.0/templates/deployment.yaml
index 50ab32b..e7d9b85 100644
--- a/httpd/v1.0.0/templates/deployment.yaml
+++ b/httpd/v1.0.0/templates/deployment.yaml
@@ -27,6 +27,11 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
+          env:
+            - name: SERVER_NAME
+              value: {{ .Values.ingress.hosts[0].name | quote }}
+            - name: PROXY_SERVICE
+              values: {{ .Values.httpd.proxy | quote }}
           livenessProbe:
             httpGet:
               path: /
diff --git a/httpd/v1.0.0/values.yaml b/httpd/v1.0.0/values.yaml
index 2428542..b287580 100644
--- a/httpd/v1.0.0/values.yaml
+++ b/httpd/v1.0.0/values.yaml
@@ -16,6 +16,10 @@ service:
   type: ClusterIP
   port: 80
 
+httpd:
+  proxy: service:port:path
+  hostname: test.molgenis.org
+
 ingress:
   enabled: false
   annotations: {}
@@ -23,7 +27,7 @@ ingress:
     # kubernetes.io/tls-acme: "true"
   path: /
   hosts:
-    - molgenis.local
+    - { httpd.hostname }
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: