apache-frontend: Set consistent username on log access

Do not upper filenames nor users, use them as is.

/reviewed-on nexedi/slapos!339

software/apache-frontend/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = 9e76028df7e93d3e32982884d5dc0913
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = aca854dad0354516e42739aeafe3cd26
+md5sum = 97cfcd64357162271d641e1dece98443
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -43,7 +43,7 @@ md5sum = a56045e7b53ff00ab34d2a8f911fc1a1
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = aca854dad0354516e42739aeafe3cd26
+md5sum = 97cfcd64357162271d641e1dece98443
 
 [template-not-found-html]
 filename = templates/notfound.html
@@ -63,7 +63,7 @@ md5sum = 1a1a53d9ac4a1591c017d86850a94796
 
 [template-log-access]
 filename = templates/template-log-access.conf.in
-md5sum = f85005b430978f3bd24ee7ce11b0e304
+md5sum = a20683faba37b5b9c035783e811dd88d
 
 [template-empty]
 filename = templates/empty.in

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

@@ -47,7 +47,6 @@ crl = {{ custom_ssl_directory }}/crl/
 
 {# Loop throught slave list to set up slaves #}
 {% for slave_instance in slave_instance_list -%}
-{#   # Do all set and do upper, so it makes easy to read the file later #} 
 {%   set slave_reference = slave_instance.get('slave_reference') -%}
 {%   set slave_type = slave_instance.get('type', '') -%}
 {%   set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference -%}

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

@@ -9,8 +9,8 @@ Alias /{{slave}}/ {{directory}}/
   </Files>
   AuthType Basic
   AuthName "Log Access {{slave}}"
-  AuthUserFile "{{ apache_configuration_directory + '/.' + slave.upper() + '.htaccess'}}"
-  Require user {{slave.upper()}}
+  AuthUserFile "{{ apache_configuration_directory + '/.' + slave + '.htaccess'}}"
+  Require user {{slave}}
   Options Indexes FollowSymLinks
   Satisfy all
 </Directory>