fixed minor issues

haproxy.conf

@@ -23,11 +23,11 @@ defaults
 
 frontend http
         bind *:80
-        reqadd X-Forwarded-Proto:\ http
 
         # add X-Forwarded-For Header to request
         http-request add-header X-Forwarded-For %[src]
         
+        reqadd X-Forwarded-Proto:\ http
         acl letsencrypt-acl path_beg /.well-known/acme-challenge/
         use_backend letsencrypt-backend if letsencrypt-acl
         default_backend www-backend

haproxy_ssl.conf

@@ -23,11 +23,12 @@ defaults
 
 frontend http
         bind *:80
-        reqadd X-Forwarded-Proto:\ http
-        
+
         # add X-Forwarded-For Header to request
         http-request add-header X-Forwarded-For %[src]
-        
+
+        reqadd X-Forwarded-Proto:\ http
+
         redirect scheme https code 301 if !{ ssl_fc }
 
         acl letsencrypt-acl path_beg /.well-known/acme-challenge/
@@ -37,11 +38,12 @@ frontend http
 
 frontend https
         bind *:443 ssl crt /data/haproxy/cert.pem
-        reqadd X-Forwarded-Proto:\ https
 
         # add X-Forwarded-For Header to request
         http-request add-header X-Forwarded-For %[src]
-        
+
+        reqadd X-Forwarded-Proto:\ https
+
         acl letsencrypt-acl path_beg /.well-known/acme-challenge/
         use_backend letsencrypt-backend if letsencrypt-acl
 

start.py

@@ -122,12 +122,20 @@ def create_haproxy_cert():
     logging.info('using %s as base dir', youngest_directory)
 
     # read fullchain.pem and privkey.pem
+    if not os.path.exists(youngest_directory + '/fullchain.pem') or not os.path.exists(youngest_directory + '/privkey.pem'):
+        logging.info('either fullchain.pem or privkey.pem is missing.')
+        return
+
     fullchain = read_file(youngest_directory + '/fullchain.pem')
     privkey = read_file(youngest_directory + '/privkey.pem')
     write_file(cert_file, fullchain + privkey)
     logging.info('file written')
 
 def create_cert_data_standalone(domains):
+    if len(domains) == 0:
+        logging.info('no domains for SSL found.')
+        return
+
     domains = " -d ".join(domains)
 
     # we should use tls-sni-01 if ssl is already running!