Prepare backend templating.

software/erp5/snippet-backend.cfg

-[apache-zope-backend-instance]
+[apache-%(backend_name)s]
 recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${zope-instance:ip}:$${zope-instance:port}/
+backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}/
 ip = $${slap-network-information:global-ipv6}
-port = 16001
-wrapper = $${rootdirectory:bin}/apache
-key-file = $${directory:apache-conf}/apache.key
-cert-file = $${directory:apache-conf}/apache.crt
-configuration-file = $${directory:apache-conf}/apache.conf
-access-control-string = $${slap-parameter:access-control-string}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-error-log = $${basedirectory:log}/apache-error.log
-access-log = $${basedirectory:log}/apache-access.log
+port = %(apache_port)s
+wrapper = $${rootdirectory:bin}/apache-%(backend_name)s
+key-file = $${directory:apache-conf}/apache-%(backend_name)s.key
+cert-file = $${directory:apache-conf}/apache-%(backend_name)s.crt
+configuration-file = $${directory:apache-conf}/apache-%(backend_name)s.conf
+access-control-string = %(access_control_string)s
+pid-file = $${basedirectory:run}/apache-%(backend_name)s.pid
+lock-file = $${basedirectory:run}/apache-%(backend_name)s.lock
+error-log = $${basedirectory:log}/apache-%(backend_name)s-error.log
+access-log = $${basedirectory:log}/apache-%(backend_name)s-access.log
 apache-binary = ${apache:location}/bin/httpd
 
-[ca-apache-zope-backend]
+[ca-apache-%(backend_name)s]
 <= certificate-authority
 recipe = slapos.cookbook:certificate_authority.request
-key-file = $${apache-zope-backend-instance:key-file}
-cert-file = $${apache-zope-backend-instance:cert-file}
-executable = $${apache-zope-backend-instance:wrapper}
-wrapper = $${basedirectory:services}/apache
+key-file = $${apache-%(backend_name)s:key-file}
+cert-file = $${apache-%(backend_name)s:cert-file}
+executable = $${apache-%(backend_name)s:wrapper}
+wrapper = $${basedirectory:services}/apache-%(backend_name)s
 
-[logrotate-entry-apache-zope-backend]
+[logrotate-entry-apache-%(backend_name)s]
 <= logrotate
 recipe = slapos.cookbook:logrotate.d
 name = zope
-log = $${apache-zope-backend-instance:error-log} $${apache-zope-backend-instance:access-log}
+log = $${apache-%(backend_name)s:error-log} $${apache-%(backend_name)s:access-log}
 frequency = daily
 rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance:pid-file} SIGUSR1
+post = ${buildout:bin-directory}/killpidfromfile $${apache-%(backend_name)s:pid-file} SIGUSR1
 sharedscripts = true
 notifempty = true
 create = true
 
-[haproxy-instance]
+[haproxy-%(backend_name)s]
 recipe = slapos.cookbook:haproxy
-name = $${slap-parameter:haproxy-id}
-conf-path = $${rootdirectory:etc}/haproxy-$${slap-parameter:haproxy-id}.cfg
+name = %(backend_name)s
+conf-path = $${rootdirectory:etc}/haproxy-%(backend_name)s.cfg
 ip = $${slap-network-information:local-ipv4}
-port = $${slap-parameter:haproxy-port}
-maxconn = $${slap-parameter:maxconn}
-server-check-path = /$${slap-parameter:site-id}/getId
-
-wrapper-path = $${basedirectory:services}/haproxy_$${slap-parameter:haproxy-id}
-binary-path = ${memcached:location}/bin/memcached
-
+port = %(haproxy_port)s
+maxconn = %(maxconn)s
+server-check-path = %(server_check_path)s
+wrapper-path = $${basedirectory:services}/haproxy-%(backend_name)s
+binary-path = ${haproxy:location}/sbin/haproxy

software/erp5/software.cfg

@@ -102,7 +102,7 @@ mode = 0644
 [template-snippet-backend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-backend.cfg
-md5sum = 50963d43711c1f928841b844d38b7286
+md5sum = 28357b5a1490fc715869b79b6d1bdb8c
 output = ${buildout:directory}/template-snippet-backend.cfg
 mode = 0644