Commit 1a63cd53 authored by Alain Takoudjou's avatar Alain Takoudjou

fixup: kvm logrotate frequency, webrunner monitor interface url

parent 6b48ba76
...@@ -98,7 +98,7 @@ mode = 0644 ...@@ -98,7 +98,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644 mode = 644
md5sum = de733ac612bf498199e68d1d6b7d8ac9 md5sum = 45f5bcfeac31d029158f4e5e529a12c8
download-only = true download-only = true
on-update = true on-update = true
......
...@@ -501,7 +501,7 @@ context = ...@@ -501,7 +501,7 @@ context =
recipe = slapos.cookbook:cron.d recipe = slapos.cookbook:cron.d
name = logrotate name = logrotate
# One time per week # One time per week
frequency = 0 0 * * * 0 frequency = 0 0 * * *
command = ${logrotate:wrapper} command = ${logrotate:wrapper}
[logrotate-vm-bootstrap] [logrotate-vm-bootstrap]
......
...@@ -54,7 +54,7 @@ mode = 0644 ...@@ -54,7 +54,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in output = ${buildout:directory}/template-runner.cfg.in
md5sum = 315f8d0e391fbe81e815e143470f1b92 md5sum = f7076baab3b51818d76be2aa8ce23f4c
mode = 0644 mode = 0644
[template-runner-import-script] [template-runner-import-script]
......
...@@ -477,8 +477,9 @@ monitor-base-url = $${publish:monitor-base-url} ...@@ -477,8 +477,9 @@ monitor-base-url = $${publish:monitor-base-url}
monitor-url = $${publish:monitor-url} monitor-url = $${publish:monitor-url}
monitor-user = $${publish:monitor-user} monitor-user = $${publish:monitor-user}
monitor-password = $${publish:monitor-password} monitor-password = $${publish:monitor-password}
{% if slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%} {% if not slapparameter_dict.get('authorized-key', '') -%}
monitor_setup_url = {{ slapparameter_dict['monitor-interface-url'] }}/#page=settings_configurator&url=$${publish:monitor-url} {% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url}
{% endif -%} {% endif -%}
#--------------------------- #---------------------------
#-- #--
......
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