caddy-frontend: Start using caddy

software/caddy-frontend/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 90457632b443fe1581debf47e73d43dd
+md5sum = bb2fb3861aca01eb70b79c4cbe5ff032
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -27,7 +27,7 @@ md5sum = 9e76028df7e93d3e32982884d5dc0913
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = c276848556725c88fa66e298915775b7
+md5sum = 84a54cfbf42f5fdcf341eea0f5b12a8a
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -43,7 +43,7 @@ md5sum = 75ba24f0447240db20250a88a1ebc524
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = c276848556725c88fa66e298915775b7
+md5sum = 84a54cfbf42f5fdcf341eea0f5b12a8a
 
 [template-not-found-html]
 filename = templates/notfound.html

software/caddy-frontend/instance-apache-frontend.cfg

@@ -111,9 +111,9 @@ configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
 [frontend-configuration]
 template-log-access = ${template-log-access:target}
 log-access-configuration = $${directory:etc}/apache-log-access.conf
-apache-directory = ${apache:location}
-apache-ipv6 = $${instance-parameter:ipv6-random}
-apache-https-port = $${instance-parameter:configuration.port}
+caddy-directory = ${caddy:location}
+caddy-ipv6 = $${instance-parameter:ipv6-random}
+caddy-https-port = $${instance-parameter:configuration.port}
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -131,7 +131,7 @@ context =
 [dynamic-template-default-vh]
 < = jinja2-template-base
 template = ${template-default-virtualhost:target}
-rendered = $${apache-directory:slave-configuration}/000.conf
+rendered = $${caddy-directory:slave-configuration}/000.conf
 extensions = jinja2.ext.do
 extra-context =
     key http_port instance-parameter:configuration.plain_http_port
@@ -142,7 +142,7 @@ template-empty = ${template-empty:target}
 template-slave-configuration = ${template-slave-configuration:target}
 template-default-slave-virtualhost = ${template-default-slave-virtualhost:target}
 template-cached-slave-virtualhost = ${template-cached-slave-virtualhost:target}
-apache-location = ${apache:location}
+caddy-location = ${caddy:location}
 
 [dynamic-custom-personal-template-slave-list]
 < = jinja2-template-base
@@ -150,16 +150,16 @@ template = ${template-slave-list:target}
 filename = custom-personal-instance-slave-list.cfg
 extensions = jinja2.ext.do
 extra-context =
-    key apache_configuration_directory apache-directory:slave-configuration
-    key apache_cached_configuration_directory apache-directory:slave-with-cache-configuration
-    key slave_with_cache_configuration_directory apache-directory:slave-with-cache-configuration
+    key apache_configuration_directory caddy-directory:slave-configuration
+    key apache_cached_configuration_directory caddy-directory:slave-with-cache-configuration
+    key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration
     key http_port instance-parameter:configuration.plain_http_port
     key https_port instance-parameter:configuration.port
     key public_ipv4 instance-parameter:configuration.public-ipv4
     key slave_instance_list instance-parameter:slave-instance-list
     key extra_slave_instance_list instance-parameter:configuration.extra_slave_instance_list
-    key custom_ssl_directory apache-directory:vh-ssl
-    key apache_log_directory apache-directory:slave-log
+    key custom_ssl_directory caddy-directory:vh-ssl
+    key apache_log_directory caddy-directory:slave-log
     key local_ipv4 instance-parameter:ipv4-random
     key global_ipv6 slap-network-information:global-ipv6
     key empty_template software-release-path:template-empty
@@ -193,10 +193,10 @@ extra-context =
 template = ${template-apache-frontend-configuration:target}
 rendered = $${apache-configuration:frontend-configuration}
 extra-context =
-    key httpd_home software-release-path:apache-location
-    key httpd_mod_ssl_cache_directory apache-directory:mod-ssl
+    key httpd_home software-release-path:caddy-location
+    key httpd_mod_ssl_cache_directory caddy-directory:mod-ssl
     key domain instance-parameter:configuration.domain
-    key document_root apache-directory:document-root
+    key document_root caddy-directory:document-root
     key instance_home buildout:directory
     key ipv4_addr instance-parameter:ipv4-random
     key ipv6_addr instance-parameter:ipv6-random
@@ -213,15 +213,15 @@ extra-context =
     key access_log apache-configuration:access-log
     key error_log apache-configuration:error-log
     key pid_file apache-configuration:pid-file
-    key slave_configuration_directory apache-directory:slave-configuration
+    key slave_configuration_directory caddy-directory:slave-configuration
     key cached_port apache-configuration:cache-through-port
     key ssl_cached_port apache-configuration:ssl-cache-through-port
-    key slave_with_cache_configuration_directory apache-directory:slave-with-cache-configuration
+    key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration
     section frontend_configuration frontend-configuration
 
 [apache-frontend]
 recipe = slapos.cookbook:wrapper
-command-line = ${apache:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
+command-line = ${caddy:location}/bin/Caddy -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
 wrapper-path = $${directory:service}/frontend_apache
 wait-for-files =
 	       $${ca-frontend:cert-file}
@@ -229,15 +229,15 @@ wait-for-files =
 
 [not-found-html]
 recipe = slapos.cookbook:symbolic.link
-target-directory = $${apache-directory:document-root}
+target-directory = $${caddy-directory:document-root}
 link-binary =
 	    ${template-not-found-html:target}
 
-[apache-directory]
+[caddy-directory]
 recipe = slapos.cookbook:mkdirectory
 document-root = $${directory:srv}/htdocs
-slave-configuration = $${directory:etc}/apache-slave-conf.d/
-slave-with-cache-configuration = $${directory:etc}/apache-slave-with-cache-conf.d/
+slave-configuration = $${directory:etc}/caddy-slave-conf.d/
+slave-with-cache-configuration = $${directory:etc}/caddy-slave-with-cache-conf.d/
 cache = $${directory:var}/cache
 mod-ssl = $${:cache}/httpd_mod_ssl
 vh-ssl = $${:slave-configuration}/ssl
@@ -250,7 +250,7 @@ error-log = $${directory:log}/frontend-apache-error.log
 pid-file = $${directory:run}/httpd.pid
 protected-path = /
 access-control-string = none
-frontend-configuration-verification = ${apache:location}/bin/httpd -Sf $${:frontend-configuration} > /dev/null
+frontend-configuration-verification = ${caddy:location}/bin/Caddy -Sf $${:frontend-configuration} > /dev/null
 frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
 
 # Comunication with ats
@@ -261,7 +261,7 @@ ssl-cache-through-port = 26012
 # Create wrapper for "apachectl conftest" in bin
 [configtest]
 recipe = slapos.cookbook:wrapper
-command-line = ${apache:location}/bin/httpd -f $${directory:etc}/apache_frontend.conf -t
+command-line = ${caddy:location}/bin/Caddy -f $${directory:etc}/apache_frontend.conf -t
 wrapper-path = $${directory:bin}/apache-configtest
 
 [certificate-authority]

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -74,7 +74,7 @@ crl = {{ custom_ssl_directory }}/crl/
 {#   Add slave log directory to the slave log access dict #}
 {%   do slave_log_dict.__setitem__(slave_reference, slave_log_folder) %}
 
-{%   set slave_log_access_url = 'https://' + slave_reference + ':${'+ slave_password_section +':passwd}@[' + frontend_configuration.get('apache-ipv6') + ']:' + frontend_configuration.get('apache-https-port') + '/' + slave_reference.lower() + '/' %}
+{%   set slave_log_access_url = 'https://' + slave_reference + ':${'+ slave_password_section +':passwd}@[' + frontend_configuration.get('caddy-ipv6') + ']:' + frontend_configuration.get('caddy-https-port') + '/' + slave_reference.lower() + '/' %}
 {%   do slave_publish_dict.__setitem__('log-access', slave_log_access_url) %}
 {%   do slave_publish_dict.__setitem__('slave-reference', slave_reference) %}
 {%   do slave_publish_dict.__setitem__('public-ipv4', public_ipv4) %}
@@ -132,7 +132,7 @@ bytes = 8
 recipe = plone.recipe.command
 stop-on-error = true
 htaccess-path = {{apache_configuration_directory}}/.{{slave_reference}}.htaccess
-command = {{frontend_configuration.get('apache-directory')}}/bin/htpasswd -cb ${:htaccess-path} {{ slave_reference }} {{ '${' + slave_password_section + ':passwd}' }}
+command = {{frontend_configuration.get('caddy-directory')}}/bin/htpasswd -cb ${:htaccess-path} {{ slave_reference }} {{ '${' + slave_password_section + ':passwd}' }}
 
 {# ################################################## #}
 {# Set Slave Certificates if needed                   #}