allow specifying multiple hostnames

Closes #2

carillon

@@ -223,9 +223,8 @@ def caddy_generate():
                 continue
 
             line = line.replace('%BIND%', config['http']['bind'])
-            line = line.replace('%OPTIONAL_HTTP_PORT%', ':' + config['http']['http_port'] if config['http']['http_port'] != '80' else '')
-            line = line.replace('%OPTIONAL_HTTPS_PORT%', ':' + config['http']['https_port'] if config['http']['https_port'] != '443' else '')
-            line = line.replace('%HOST%', config['http']['host'])
+            line = line.replace('%HTTP_ADDRESS%', ', '.join('http://' + host + ':' + (config['http']['http_port'] if config['http']['http_port'] != '80' else '') for host in config['http']['host'].split(' ')))
+            line = line.replace('%HTTPS_ADDRESS%', ', '.join('https://' + host + ':' + (config['http']['https_port'] if config['http']['https_port'] != '443' else '') for host in config['http']['host'].split(' ')))
             line = line.replace('%TLS%', config['http']['tls'])
 
             line = line.replace('%ALLOW_UPDATE%', config['http']['allow_update'])

conf/Caddyfile.in

@@ -27,7 +27,7 @@
 		protocol http
 	}
 
-	redir @http https://%HOST%:8443{uri} permanent
+	redir @http https://{hostport}{uri} permanent
 %%TLS_END%%
 %%UPDATE_BEGIN%%
 
@@ -44,14 +44,14 @@
 %%UPDATE_END%%
 }
 
-http://%HOST%%OPTIONAL_HTTP_PORT% {
+%HTTP_ADDRESS% {
 	bind %BIND%
 
 	import radio
 }
 %%TLS_BEGIN%%
 
-https://%HOST%%OPTIONAL_HTTPS_PORT% {
+%HTTPS_ADDRESS% {
 	bind %BIND%
 
 	tls %TLS%