Commit d36b2da7 authored by Guillaume Hervier's avatar Guillaume Hervier

stack/monitor: Add auto-restart on certificate-authority section

/reviewed-on nexedi/slapos!499
parent 139a2d9c
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = 0713a3987d11dc60649d8105ec9746f4 md5sum = 3b3acb2291fc7458bb11efc80a5aba27
...@@ -51,12 +51,18 @@ recipe = slapos.cookbook:certificate_authority ...@@ -51,12 +51,18 @@ recipe = slapos.cookbook:certificate_authority
openssl-binary = {{ openssl_executable_location }} openssl-binary = {{ openssl_executable_location }}
ca-dir = ${ca-directory:root} ca-dir = ${ca-directory:root}
requests-directory = ${ca-directory:requests} requests-directory = ${ca-directory:requests}
wrapper = ${directory:services}/certificate_authority wrapper = ${directory:bin}/certificate_authority
ca-private = ${ca-directory:private} ca-private = ${ca-directory:private}
ca-certs = ${ca-directory:certs} ca-certs = ${ca-directory:certs}
ca-newcerts = ${ca-directory:newcerts} ca-newcerts = ${ca-directory:newcerts}
ca-crl = ${ca-directory:crl} ca-crl = ${ca-directory:crl}
[certificate-authority-service]
recipe = slapos.cookbook:wrapper
command-line = ${certificate-authority:wrapper}
wrapper-path = ${directory:services}/certificate_authority
hash-files = ${buildout:directory}/software_release/buildout.cfg
[ca-monitor-httpd] [ca-monitor-httpd]
<= certificate-authority <= certificate-authority
recipe = slapos.cookbook:certificate_authority.request recipe = slapos.cookbook:certificate_authority.request
...@@ -404,7 +410,7 @@ depends = ...@@ -404,7 +410,7 @@ depends =
${monitor-collect-cron-entry:name} ${monitor-collect-cron-entry:name}
${cron-entry-logrotate:name} ${cron-entry-logrotate:name}
${logrotate-entry-cron:name} ${logrotate-entry-cron:name}
${certificate-authority:wrapper} ${certificate-authority-service:wrapper}
${monitor-conf:rendered} ${monitor-conf:rendered}
${start-monitor:wrapper-path} ${start-monitor:wrapper-path}
${ca-monitor-httpd-service:wrapper-path} ${ca-monitor-httpd-service:wrapper-path}
......
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