Commit 932d0003 authored by Łukasz Nowak's avatar Łukasz Nowak

apache-frontend: Fix name clash in etc/service

Another part wrote to etc/service/frontend_apache, which resulted of
impossibility to start apache after instance is restarted.
parent 83c32880
...@@ -18,7 +18,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e ...@@ -18,7 +18,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
md5sum = eb2143422d824e96abe99619f11d3523 md5sum = ec825cba3ea775452716f1da7cd2e549
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
......
...@@ -248,10 +248,7 @@ extra-context = ...@@ -248,10 +248,7 @@ extra-context =
[apache-frontend] [apache-frontend]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${apache:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND command-line = ${apache:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
wrapper-path = $${directory:service}/frontend_apache wrapper-path = $${directory:bin}/frontend_apache
wait-for-files =
$${ca-frontend:cert-file}
$${ca-frontend:key-file}
[not-found-html] [not-found-html]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
...@@ -315,7 +312,7 @@ crl = $${directory:ca-dir}/crl/ ...@@ -315,7 +312,7 @@ crl = $${directory:ca-dir}/crl/
recipe = slapos.cookbook:certificate_authority.request recipe = slapos.cookbook:certificate_authority.request
key-file = $${cadirectory:certs}/apache_frontend.key key-file = $${cadirectory:certs}/apache_frontend.key
cert-file = $${cadirectory:certs}/apache_frontend.crt cert-file = $${cadirectory:certs}/apache_frontend.crt
executable = $${directory:service}/frontend_apache executable = $${apache-frontend:wrapper-path}
wrapper = $${directory:service}/frontend_apache wrapper = $${directory:service}/frontend_apache
key-content = $${instance-parameter:configuration.apache-key} key-content = $${instance-parameter:configuration.apache-key}
cert-content = $${instance-parameter:configuration.apache-certificate} cert-content = $${instance-parameter:configuration.apache-certificate}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment