set hostname from environment during setup

scripts/approve-user.sh

@@ -27,5 +27,5 @@ sed s/%HOSTNAME%/$1/g /data/infrastructure/templates/haproxy-frontend.part >> /d
 
 sed s/%HOSTNAME%/$1/g /data/infrastructure/templates/haproxy-backend.part | sed s/%IP%/$IP/g >> /data/server-wide/haproxy/backends.part
 
-cat /data/server-wide/haproxy/haproxy-1.part /data/server-wide/haproxy/certs.part /data/server-wide/haproxy/haproxy-2.part /data/server-wide/haproxy/frontends.part /data/server-wide/haproxy/backends.part > /data/server-wide/haproxy/haproxy.cfg
+cat /data/server-wide/haproxy/haproxy-1.part /data/server-wide/haproxy/hostname.part /data/server-wide/haproxy/haproxy-2.part /data/server-wide/haproxy/certs.part /data/server-wide/haproxy/haproxy-3.part /data/server-wide/haproxy/frontends.part /data/server-wide/haproxy/backends.part > /data/server-wide/haproxy/haproxy.cfg
 systemctl reload haproxy.service

scripts/setup.sh

@@ -19,6 +19,7 @@ rm /data/server-wide/haproxy/*.part
 touch /data/server-wide/haproxy/certs.part
 touch /data/server-wide/haproxy/frontends.part
 touch /data/server-wide/haproxy/backends.part
+hostname > /data/server-wide/haproxy/hostname.part
 cp /data/infrastructure/templates/haproxy-*.part /data/server-wide/haproxy/
 systemctl enable haproxy.service
 systemctl start  haproxy.service

templates/haproxy-1.part

@@ -17,7 +17,4 @@ defaults
 
 frontend https-in
 mode http
- bind *:443 ssl crt-list /haproxy-override/certs/list.txt crt /haproxy-override/approved-certs/coreos.dev/combined.pem
- reqadd X-Forwarded-Proto:\ https
-
-
+ bind *:443 ssl crt-list /haproxy-override/certs/list.txt crt /haproxy-override/approved-certs/

templates/haproxy-2.part

+/combined.pem
+ reqadd X-Forwarded-Proto:\ https
 
 
-default_backend coreos.dev
-    
-frontend http-in
-    bind *:80

templates/haproxy-3.part

+
+
+default_backend coreos.dev
+    
+frontend http-in
+    bind *:80