caddy-frontend: Drop some TODO-Caddy

Things are implemented elsewhere and tested, also some not-applicable.

software/caddy-frontend/buildout.hash.cfg

@@ -39,7 +39,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
 
 [template-caddy-frontend-configuration]
 filename = templates/Caddyfile.in
-md5sum = 829d8fc33d3e12ebe6ed79fd77faf0e9
+md5sum = a5367cf68ccfb34b1171086882548cec
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
@@ -51,7 +51,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = 631f9e08088e12b69ba8628469cc749a
+md5sum = a0fcdbe974d92e220319534aad934183
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
@@ -83,7 +83,7 @@ md5sum = 117238225b3fc3c5b5be381815f44c67
 
 [template-nginx-configuration]
 filename = templates/nginx.cfg.in
-md5sum = b627db17b337947294e587a1e3bc3597
+md5sum = eae367cbf665816fbfe274026c848075
 
 [template-nginx-eventsource-slave-virtualhost]
 filename = templates/nginx-eventsource-slave.conf.in

software/caddy-frontend/templates/Caddyfile.in

 # Automatically generated
 
 # Basic server configuration
-# XXX: Does Caddy need ServerRoot equivalence?
-#ServerRoot {{ instance_home }}
-
-
-# TODO-Caddy {{ "Listen %s:%s" % (local_ipv4, cached_port)  }}
-# TODO-Caddy {{ "Listen %s:%s" % (local_ipv4, ssl_cached_port)  }}
-# TODO-Caddy per site bind {{ local_ipv4 }}
-
-# TODO-Caddy ServerAdmin {{ server_admin }}
 # TODO-Caddy TypesConfig {{ httpd_home }}/conf/mime.types
 # TODO-Caddy AddType application/x-compress .Z
 # TODO-Caddy AddType application/x-gzip .gz .tgz
@@ -17,57 +8,11 @@
 # As backend is trusting REMOTE_USER header unset it always
 # TODO-Caddy RequestHeader unset REMOTE_USER
 
-# TODO-Caddy ServerTokens Prod
-
-# Disable TRACE Method
-# TODO-Caddy TraceEnable off
-
 # TODO-Caddy <Directory {{ protected_path }}>
 # TODO-Caddy   Order Deny,Allow
 # TODO-Caddy   Allow from {{ access_control_string }}
 # TODO-Caddy </Directory>
 
-# TODO-Caddy <Directory {{ document_root }}>
-# TODO-Caddy   Require all granted
-# TODO-Caddy   Options -Indexes
-# TODO-Caddy   ErrorDocument 404 /notfound.html
-# TODO-Caddy   RewriteEngine on
-# TODO-Caddy   RewriteRule ^/?$ notfound.html [R=404,L]
-# TODO-Caddy </Directory>
-
-# List of modules
-# TODO-Caddy LoadModule unixd_module        {{ httpd_home }}/modules/mod_unixd.so
-# TODO-Caddy LoadModule access_compat_module {{ httpd_home }}/modules/mod_access_compat.so
-# TODO-Caddy LoadModule authz_core_module  {{ httpd_home }}/modules/mod_authz_core.so
-# TODO-Caddy LoadModule authz_host_module  {{ httpd_home }}/modules/mod_authz_host.so
-# TODO-Caddy LoadModule authn_core_module  {{ httpd_home }}/modules/mod_authn_core.so
-# TODO-Caddy LoadModule log_config_module  {{ httpd_home }}/modules/mod_log_config.so
-# TODO-Caddy LoadModule deflate_module     {{ httpd_home }}/modules/mod_deflate.so
-# TODO-Caddy LoadModule setenvif_module    {{ httpd_home }}/modules/mod_setenvif.so
-# TODO-Caddy LoadModule version_module     {{ httpd_home }}/modules/mod_version.so
-# TODO-Caddy LoadModule proxy_module       {{ httpd_home }}/modules/mod_proxy.so
-# TODO-Caddy LoadModule proxy_http_module  {{ httpd_home }}/modules/mod_proxy_http.so
-# TODO-Caddy LoadModule ssl_module         {{ httpd_home }}/modules/mod_ssl.so
-# TODO-Caddy LoadModule mime_module        {{ httpd_home }}/modules/mod_mime.so
-# TODO-Caddy LoadModule dav_module         {{ httpd_home }}/modules/mod_dav.so
-# TODO-Caddy LoadModule dav_fs_module      {{ httpd_home }}/modules/mod_dav_fs.so
-# TODO-Caddy LoadModule negotiation_module {{ httpd_home }}/modules/mod_negotiation.so
-# TODO-Caddy LoadModule rewrite_module     {{ httpd_home }}/modules/mod_rewrite.so
-# TODO-Caddy LoadModule headers_module     {{ httpd_home }}/modules/mod_headers.so
-# TODO-Caddy LoadModule cache_module       {{ httpd_home }}/modules/mod_cache.so
-# TODO-Caddy LoadModule cache_socache_module   {{ httpd_home }}/modules/mod_cache_socache.so
-# TODO-Caddy LoadModule socache_shmcb_module   {{ httpd_home }}/modules/mod_socache_shmcb.so
-# TODO-Caddy LoadModule alias_module       {{ httpd_home }}/modules/mod_alias.so
-# TODO-Caddy LoadModule autoindex_module   {{ httpd_home }}/modules/mod_autoindex.so
-# TODO-Caddy LoadModule auth_basic_module  {{ httpd_home }}/modules/mod_auth_basic.so
-# TODO-Caddy LoadModule authz_user_module  {{ httpd_home }}/modules/mod_authz_user.so
-# TODO-Caddy LoadModule authn_file_module  {{ httpd_home }}/modules/mod_authn_file.so
-# TODO-Caddy LoadModule filter_module       {{ httpd_home }}/modules/mod_filter.so
-# TODO-Caddy LoadModule http2_module       {{ httpd_home }}/modules/mod_http2.so
-# TODO-Caddy LoadModule info_module        {{ httpd_home }}/modules/mod_info.so
-# TODO-Caddy LoadModule status_module      {{ httpd_home }}/modules/mod_status.so
-# TODO-Caddy LoadModule reqtimeout_module  {{ httpd_home }}/modules/mod_reqtimeout.so
-
 # The following directives modify normal HTTP response behavior to
 # handle known problems with browser implementations.
 # TODO-Caddy BrowserMatch "Mozilla/2" nokeepalive

software/caddy-frontend/templates/default-virtualhost.conf.in

@@ -116,17 +116,9 @@
   log / {{ slave_parameter.get('access_log') }} "{remote} {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}"
   errors {{ slave_parameter.get('error_log') }}
 
-{% if disable_via_header %}
-# TODO-Caddy   Header unset Via
-{% endif -%}
 # TODO-Caddy   # Remove "Secure" from cookies, as backend may be https
 # TODO-Caddy   Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
 
-{% if disable_no_cache_header %}
-# TODO-Caddy   RequestHeader unset Cache-Control
-# TODO-Caddy   RequestHeader unset Pragma
-{% endif -%}
-
 {%- for disabled_cookie in disabled_cookie_list %}
 # TODO-Caddy {{'  RequestHeader edit Cookie "(^%(disabled_cookie)s=[^;]*; |; %(disabled_cookie)s=[^;]*|^%(disabled_cookie)s=[^;]*$)" ""' % dict(disabled_cookie=disabled_cookie)  }}
 {% endfor -%}

software/caddy-frontend/templates/nginx.cfg.in

@@ -13,8 +13,6 @@ http://www.example.org:$${nginx-configuration:plain_port} {
 status 204 /favicon.ico
 status 404 /
 }
-# TODO-Caddy daemon off; # run in the foreground so supervisord can look after it
-
 # TODO-Caddy worker_processes $${nginx-configuration:worker_processes};
 
 # TODO-Caddy events {