caddy-frontend: Remove obsolete Caddy log-access entries

Despite the introspection has replaced old style Caddy-based log-access, some
bits were not removed, so remove then now.

fixes 0c830c4c

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = a1dc7a130241a04389791c1fc3db788f
+md5sum = a03bb86d7e49960815a000adf7c19f77
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -30,7 +30,7 @@ md5sum = c713aa837c5d0af8b59ed65e17c36c3a
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 8116bbf7d5909b3dc6919ec39d471cc9
+md5sum = 2cbcdff6fe75ec469ab7d6accd72f83c
 
 [profile-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -38,7 +38,7 @@ md5sum = df304a8aee87b6f2425241016a48f7a5
 
 [profile-caddy-frontend-configuration]
 _update_hash_filename_ = templates/Caddyfile.in
-md5sum = 2503056e35463e045db3329bb8b6fae8
+md5sum = 8cdc462956b6b492c14a53f987c0df5c
 
 [template-not-found-html]
 _update_hash_filename_ = templates/notfound.html
@@ -52,10 +52,6 @@ md5sum = 266f175dbdfc588af7a86b0b1884fe73
 _update_hash_filename_ = templates/backend-haproxy.cfg.in
 md5sum = 7c171979aa1d5c88faafe4993f087edd
 
-[template-log-access]
-_update_hash_filename_ = templates/template-log-access.conf.in
-md5sum = f8068179333ce19e95df561c70073857
-
 [template-empty]
 _update_hash_filename_ = templates/empty.in
 md5sum = 7155b18edfe128825b8d1f48071454a6

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

@@ -102,7 +102,6 @@ single-default = ${dynamic-custom-personal-profile-slave-list:rendered}
 single-custom-personal = ${dynamic-custom-personal-profile-slave-list:rendered}
 
 [frontend-configuration]
-log-access-configuration = ${directory:etc}/log-access.conf
 ip-access-certificate = ${self-signed-ip-access:certificate}
 caddy-ipv6 = {{ instance_parameter_dict['ipv6-random'] }}
 caddy-https-port = ${configuration:port}
@@ -583,7 +582,7 @@ template = {{ software_parameter_dict['template_configuration_state_script'] }}
 rendered = ${directory:bin}/${:_buildout_section_name_}
 mode = 0700
 
-path_list = ${caddy-configuration:frontend-configuration} ${frontend-configuration:log-access-configuration} ${caddy-directory:slave-configuration}/*.conf ${caddy-directory:master-autocert-dir}/*.key ${caddy-directory:master-autocert-dir}/*.crt ${caddy-directory:master-autocert-dir}/*.pem ${caddy-directory:autocert}/*.pem ${caddy-directory:custom-ssl-directory}/*.proxy_ca_crt ${directory:bbb-ssl-dir}/*.crt
+path_list = ${caddy-configuration:frontend-configuration} ${caddy-directory:slave-configuration}/*.conf ${caddy-directory:master-autocert-dir}/*.key ${caddy-directory:master-autocert-dir}/*.crt ${caddy-directory:master-autocert-dir}/*.pem ${caddy-directory:autocert}/*.pem ${caddy-directory:custom-ssl-directory}/*.proxy_ca_crt ${directory:bbb-ssl-dir}/*.crt
 sha256sum = {{ software_parameter_dict['sha256sum'] }}
 
 extra-context =

software/caddy-frontend/software.cfg

@@ -107,7 +107,6 @@ template_configuration_state_script = ${template-configuration-state-script:targ
 template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
 template_empty = ${template-empty:target}
 template_graceful_script = ${template-graceful-script:target}
-template_log_access = ${template-log-access:target}
 template_not_found_html = ${template-not-found-html:target}
 template_rotate_script = ${template-rotate-script:target}
 template_slave_introspection_httpd_nginx = ${template-slave-introspection-httpd-nginx:target}
@@ -187,9 +186,6 @@ mode = 640
 [template-backend-haproxy-configuration]
 <=download-template
 
-[template-log-access]
-<=download-template
-
 [template-empty]
 <=download-template
 

software/caddy-frontend/templates/Caddyfile.in

 # Main caddy configuration file
 
-import {{frontend_configuration.get('log-access-configuration')}}
 import {{ slave_configuration_directory }}/*.conf
 
 :{{ https_port }} {

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

@@ -334,7 +334,6 @@ recipe = slapos.cookbook:publish
 {%-  endif %}
 {%- endfor %} {# Slave iteration ends for slave_instance in slave_instance_list #}
 
-{%- do part_list.append('caddy-log-access') %}
 {%- do part_list.append('slave-introspection') %}
 {#- ############################################## #}
 {#- ## Prepare virtualhost for slaves using cache  #}
@@ -357,29 +356,6 @@ ipv6-port = {{ configuration['plain_http_port'] }}
 ipv4-port = {{ configuration['port'] }}
 ipv6-port = {{ configuration['port'] }}
 
-{#- Define log access #}
-
-[caddy-log-access-parameters]
-caddy_log_directory = {{ dumps(caddy_log_directory) }}
-caddy_configuration_directory = {{ dumps(caddy_configuration_directory) }}
-local_ipv4 = {{ dumps(instance_parameter_dict['ipv4-random']) }}
-global_ipv6 = {{ dumps(global_ipv6) }}
-https_port = {{ dumps(configuration['port']) }}
-http_port = {{ dumps(configuration['plain_http_port']) }}
-ip_access_certificate = {{ frontend_configuration.get('ip-access-certificate') }}
-access_log = {{ dumps(caddy_configuration['access-log']) }}
-error_log = {{ dumps(caddy_configuration['error-log']) }}
-not_found_file = {{ dumps(caddy_configuration['not-found-file']) }}
-
-[caddy-log-access]
-< = jinja2-template-base
-template = {{ software_parameter_dict['template_log_access'] }}
-rendered = {{frontend_configuration.get('log-access-configuration')}}
-extra-context =
-    section slave_log_directory slave-log-directory-dict
-    section slave_password slave-password
-    section parameter_dict caddy-log-access-parameters
-
 [slave-introspection-parameters]
 local-ipv4 = {{ dumps(instance_parameter_dict['ipv4-random']) }}
 global-ipv6 = {{ dumps(global_ipv6) }}
@@ -461,13 +437,6 @@ template = inline:
 
 rendered = ${:file}
 
-[caddy-log-access-empty]
-# Caddy refuse to start if an `import`ed file is empty, so we prepend a header
-# so that the file is never empty.
-< = jinja2-template-base
-template = inline: # This file contain directives to serve directories with log files for shared instances, but no shared instances are defined yet.
-rendered = {{frontend_configuration.get('log-access-configuration')}}
-
 ##<Backend haproxy>
 [backend-haproxy-configuration]
 < = jinja2-template-base
@@ -521,9 +490,6 @@ parts +=
 {%- for part in part_list %}
 {{ '    %s' % part }}
 {%- endfor %}
-{%- if 'caddy-log-access' not in part_list %}
-    caddy-log-access-empty
-{%- endif %}
     publish-caddy-information
     tunnel-6to4-base-http_port
     tunnel-6to4-base-https_port

software/caddy-frontend/templates/template-log-access.conf.in

-# Access log configuration
-{% for slave, directory in slave_log_directory.iteritems() %}
-https://[{{ parameter_dict['global_ipv6'] }}]:{{ parameter_dict['https_port'] }}/{{ slave }}, https://{{ parameter_dict['local_ipv4'] }}:{{ parameter_dict['https_port'] }}/{{ slave }} {
-  bind {{ parameter_dict['local_ipv4'] }}
-  root {{ directory }}/
-  browse
-  tls {{ parameter_dict['ip_access_certificate'] }} {{ parameter_dict['ip_access_certificate'] }}
-  basicauth "{{ slave }}" {{ slave_password[slave] | trim }} {
-    "Log Access {{ slave }}"
-    /
-  }
-  log / {{ parameter_dict['access_log'] }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
-  }
-  errors {{ parameter_dict['error_log'] }} {
-    rotate_size 0
-    * {{ parameter_dict['not_found_file'] }}
-  }
-}
-{% endfor %}