Commit bf95d234 authored by Romain Courteaud's avatar Romain Courteaud

software/backupserver: check that nginx is listening on port

parent 3296040c
...@@ -27,6 +27,7 @@ statistic = $${:srv}/statistic ...@@ -27,6 +27,7 @@ statistic = $${:srv}/statistic
backupscript = $${:etc}/backup backupscript = $${:etc}/backup
www = $${:srv}/www www = $${:srv}/www
home = $${:etc}/home home = $${:etc}/home
promises = $${:etc}/promise
ssl = $${:etc}/ssl ssl = $${:etc}/ssl
ssh = $${:home}/.ssh ssh = $${:home}/.ssh
...@@ -167,6 +168,12 @@ mode = 0700 ...@@ -167,6 +168,12 @@ mode = 0700
virtual-depends = virtual-depends =
$${nginx-configuration:ip} $${nginx-configuration:ip}
[nginx-listen-promise]
recipe = slapos.cookbook:check_port_listening
hostname = $${nginx-configuration:ip}
port = $${nginx-configuration:port}
path = $${directory:promises}/nginx_listen
[nginx-configuration] [nginx-configuration]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${template-nginx-configuration:output} url = ${template-nginx-configuration:output}
...@@ -185,6 +192,7 @@ ssl_crt = $${directory:ssl}/nginx.crt ...@@ -185,6 +192,7 @@ ssl_crt = $${directory:ssl}/nginx.crt
parts = parts =
dcron-service dcron-service
nginx-service nginx-service
nginx-listen-promise
activate-crontab-file activate-crontab-file
publish-global-rss publish-global-rss
{% for part in part_list -%} {% for part in part_list -%}
......
...@@ -105,7 +105,7 @@ mode = 0644 ...@@ -105,7 +105,7 @@ mode = 0644
[template-pullrdiffbackup] [template-pullrdiffbackup]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pullrdiffbackup.cfg.in url = ${:_profile_base_location_}/instance-pullrdiffbackup.cfg.in
md5sum = e2a20871288e30ebc299cc29d4c596d2 md5sum = a2fb7b0cdd944be99da4122eb6f07749
output = ${buildout:directory}/template-pullrdiffbackup.cfg output = ${buildout:directory}/template-pullrdiffbackup.cfg
mode = 0644 mode = 0644
......
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