caddy-frontend: Provide direct access to htpasswd

software/caddy-frontend/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 597dd12fd1449c62df84677d9734e624
+md5sum = 4dd6b303ef4d48d02e50baae2a3b0868
 
 [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 = a18268224f0a9fac251041fb5883417c
+md5sum = b016f416ce5390213afef56c4a41aaa1
 
 [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 = a18268224f0a9fac251041fb5883417c
+md5sum = b016f416ce5390213afef56c4a41aaa1
 
 [template-not-found-html]
 filename = templates/notfound.html

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

@@ -130,6 +130,9 @@ log-access-configuration = $${directory:etc}/apache-log-access.conf
 caddy-directory = ${caddy:location}
 caddy-ipv6 = $${instance-parameter:ipv6-random}
 caddy-https-port = $${instance-parameter:configuration.port}
+# XXX: Maybe it is not the best way to redirect -- anyway instantiation
+#      will fail ASA Apache will be removed
+htpasswd = ${buildout:bin-directory}/htpasswd
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2

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

@@ -136,7 +136,7 @@ bytes = 8
 recipe = plone.recipe.command
 stop-on-error = true
 htaccess-path = {{apache_configuration_directory}}/.{{slave_reference}}.htaccess
-command = {{frontend_configuration.get('caddy-directory')}}/bin/htpasswd -cb ${:htaccess-path} {{ slave_reference }} {{ '${' + slave_password_section + ':passwd}' }}
+command = {{frontend_configuration.get('htpasswd')}} -cb ${:htaccess-path} {{ slave_reference }} {{ '${' + slave_password_section + ':passwd}' }}
 
 {# ################################################## #}
 {# Set Slave Certificates if needed                   #}