Commit 5e418da4 authored by Alain Takoudjou's avatar Alain Takoudjou

monitor: improve compatibility with others software releases

parent 44efc1ac
...@@ -10,10 +10,12 @@ extends = ...@@ -10,10 +10,12 @@ extends =
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/gzip/buildout.cfg
parts += parts =
slapos-cookbook slapos-cookbook
eggs monitor-eggs
extra-eggs extra-eggs
monitor2-template monitor2-template
...@@ -39,20 +41,17 @@ url = ${:_profile_base_location_}/scripts/${:filename} ...@@ -39,20 +41,17 @@ url = ${:_profile_base_location_}/scripts/${:filename}
destination = ${buildout:parts-directory}/monitor-scripts destination = ${buildout:parts-directory}/monitor-scripts
on-update = true on-update = true
[eggs]
[monitor-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs += eggs =
collective.recipe.template collective.recipe.template
cns.recipe.symlink cns.recipe.symlink
# XXX - for compatibility
[monitor-eggs]
<= eggs
[extra-eggs] [extra-eggs]
<= eggs <= monitor-eggs
interpreter = pythonwitheggs interpreter = pythonwitheggs
eggs += eggs =
psutil psutil
PyRSS2Gen PyRSS2Gen
Jinja2 Jinja2
...@@ -69,7 +68,7 @@ filename = monitor-httpd.conf.in ...@@ -69,7 +68,7 @@ filename = monitor-httpd.conf.in
filename = monitor-service.cfg.in filename = monitor-service.cfg.in
md5sum = 5913d2a0096b50537f394a49b762b3e5 md5sum = 5913d2a0096b50537f394a49b762b3e5
[template-wrapper] [monitor-template-wrapper]
<= monitor-template-base <= monitor-template-base
filename = wrapper.in filename = wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
...@@ -90,15 +89,17 @@ filename = httpd-cors.cfg.in ...@@ -90,15 +89,17 @@ filename = httpd-cors.cfg.in
md5sum = 5afad2bb6e088e080e907f1d837effbb md5sum = 5afad2bb6e088e080e907f1d837effbb
# End templates files # End templates files
# XXX keep compatibility (with software/ipython_notebook/software.cfg )
[monitor-template] [monitor-template]
rendered = ${monitor2-template:rendered} rendered = ${monitor2-template:rendered}
output = ${monitor2-template:rendered}
[monitor2-template] [monitor2-template]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
filename = template-monitor.cfg filename = template-monitor.cfg
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
rendered = ${buildout:directory}/template-monitor.cfg rendered = ${buildout:directory}/template-monitor.cfg
md5sum = 7667f68455a6fd35c75b62f7472c2454 md5sum = b8c804aba89a3938aa00bed914b1729a
context = context =
key apache_location apache:location key apache_location apache:location
key gzip_location gzip:location key gzip_location gzip:location
...@@ -120,8 +121,11 @@ context = ...@@ -120,8 +121,11 @@ context =
raw python_executable ${buildout:executable} raw python_executable ${buildout:executable}
raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter} raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
raw promise_executor_py ${run-promise-py:rendered} raw promise_executor_py ${run-promise-py:rendered}
raw template_wrapper ${template-wrapper:output} raw template_wrapper ${monitor-template-wrapper:location}/${monitor-template-wrapper:filename}
raw status2rss_executable_path ${status2rss-executable:location}/${status2rss-executable:filename} raw status2rss_executable_path ${status2rss-executable:location}/${status2rss-executable:filename}
depends =
${monitor-eggs:eggs}
[monitor2-bin] [monitor2-bin]
<= monitor-template-script <= monitor-template-script
...@@ -170,23 +174,3 @@ md5sum = 98c8f6fd81e405b0ad10db07c3776321 ...@@ -170,23 +174,3 @@ md5sum = 98c8f6fd81e405b0ad10db07c3776321
output = ${buildout:directory}/template-make-rss.sh.in output = ${buildout:directory}/template-make-rss.sh.in
mode = 0644 mode = 0644
[monitor-web-monitor-logout-cgi]
recipe = slapos.recipe.template:jinja2
filename = monitor-logout.py.cgi
md5sum = 5b3c0aa559722a3bae5a692ea9a0a441
mode = 0755
template = ${:_profile_base_location_}/${:filename}
rendered = ${buildout:directory}/monitor-logout.cgi
context = key python_executable buildout:executable
[monitor-web-monitor-promise-runner-cgi]
<= monitor-download-base
filename = monitor-run-promise.py.cgi
md5sum = 15625e5bf6c1b57b9199250951ffc16e
[monitor-password-py-cgi]
<= monitor-download-base
md5sum = 04fc7e6d892d29a601cfd43d1700eeda
filename = monitor-password.py.cgi
...@@ -6,6 +6,10 @@ url = ${slap-connection:server-url} ...@@ -6,6 +6,10 @@ url = ${slap-connection:server-url}
key = ${slap-connection:key-file} key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file} cert = ${slap-connection:cert-file}
# XXX Default values if doesn't exists
root-instance-title = UNKNOWN H-S
instance-title = UNKNOWN Instance
[cron] [cron]
recipe = slapos.cookbook:cron recipe = slapos.cookbook:cron
cron-entries = ${logrotate-directory:cron-entries} cron-entries = ${logrotate-directory:cron-entries}
...@@ -129,8 +133,7 @@ public-folder = ${monitor-directory:public} ...@@ -129,8 +133,7 @@ public-folder = ${monitor-directory:public}
private-folder = ${monitor-directory:private} private-folder = ${monitor-directory:private}
webdav-folder = ${monitor-directory:webdav} webdav-folder = ${monitor-directory:webdav}
web-folder = ${monitor-directory:web-dir} web-folder = ${monitor-directory:web-dir}
base-url = ${monitor-frontend-promise:url} base-url = ${monitor-instance-parameter:monitor-base-url}
#base-url = ${monitor-httpd-conf-parameter:url}
monitor-hal-json = ${monitor-directory:public}/monitor.hal.json monitor-hal-json = ${monitor-directory:public}/monitor.hal.json
service-pid-folder = ${monitor-directory:pids} service-pid-folder = ${monitor-directory:pids}
crond-folder = ${logrotate-directory:cron-entries} crond-folder = ${logrotate-directory:cron-entries}
...@@ -366,6 +369,8 @@ monitor-password = ${monitor-instance-parameter:password} ...@@ -366,6 +369,8 @@ monitor-password = ${monitor-instance-parameter:password}
monitor-title = ${slap-configuration:instance-title} monitor-title = ${slap-configuration:instance-title}
monitor-httpd-ipv6 = ${slap-configuration:ipv6-random} monitor-httpd-ipv6 = ${slap-configuration:ipv6-random}
monitor-httpd-port = 8196 monitor-httpd-port = 8196
# XXX - Set monitor-base-url = ${monitor-httpd-conf-parameter:url} => https://[ipv6]:port
monitor-base-url = ${monitor-frontend-promise:url}
root-instance-title = ${slap-configuration:root-instance-title} root-instance-title = ${slap-configuration:root-instance-title}
opml-url-list = opml-url-list =
cors-domains = cors-domains =
......
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