Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
8cbe7790
Commit
8cbe7790
authored
Oct 08, 2015
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor2: add monitor password promise configuration
parent
42a86cde
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
stack/monitor2/buildout.cfg
stack/monitor2/buildout.cfg
+4
-4
stack/monitor2/instance-monitor.cfg.jinja2.in
stack/monitor2/instance-monitor.cfg.jinja2.in
+13
-1
stack/monitor2/monitor-service.cfg.in
stack/monitor2/monitor-service.cfg.in
+0
-0
No files found.
stack/monitor2/buildout.cfg
View file @
8cbe7790
...
@@ -106,7 +106,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -106,7 +106,7 @@ 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 =
07504e9bccb50ff17945363f7440472e
md5sum =
382f764b4d8fe203a9b2abe380323c03
context =
context =
key apache_location apache:location
key apache_location apache:location
key gzip_location gzip:location
key gzip_location gzip:location
...
@@ -124,8 +124,8 @@ context =
...
@@ -124,8 +124,8 @@ context =
raw dash_executable_location ${dash:location}/bin/dash
raw dash_executable_location ${dash:location}/bin/dash
raw dcron_executable_location ${dcron:location}/sbin/crond
raw dcron_executable_location ${dcron:location}/sbin/crond
raw logrotate_executable_location ${logrotate:location}/usr/sbin/logrotate
raw logrotate_executable_location ${logrotate:location}/usr/sbin/logrotate
raw monitor_httpd_promise_conf ${monitor-httpd-promise-conf:location}/${monitor-httpd-promise-conf:filename}
raw monitor_httpd_template ${monitor-httpd-conf:location}/${monitor-httpd-conf:filename}
raw monitor_httpd_template ${monitor-httpd-conf:location}/${monitor-httpd-conf:filename}
raw monitor_service_conf_template ${monitor-service-conf-template:location}/${monitor-service-conf-template:filename}
raw monitor_service_run ${monitor-service-template-run:location}/${monitor-service-template-run:filename}
raw monitor_service_run ${monitor-service-template-run:location}/${monitor-service-template-run:filename}
raw openssl_executable_location ${openssl:location}/bin/openssl
raw openssl_executable_location ${openssl:location}/bin/openssl
raw python_executable ${buildout:executable}
raw python_executable ${buildout:executable}
...
@@ -137,9 +137,9 @@ context =
...
@@ -137,9 +137,9 @@ context =
md5sum = 625d3d948c0af7b4848d7fad92bfb844
md5sum = 625d3d948c0af7b4848d7fad92bfb844
filename = monitor-httpd.conf.in
filename = monitor-httpd.conf.in
[monitor-
httpd-promise-conf
]
[monitor-
service-conf-template
]
<= monitor-download-base
<= monitor-download-base
filename = monitor-
httpd-promise.conf
.in
filename = monitor-
service.cfg
.in
md5sum = 5913d2a0096b50537f394a49b762b3e5
md5sum = 5913d2a0096b50537f394a49b762b3e5
[monitor-service-template-run]
[monitor-service-template-run]
...
...
stack/monitor2/instance-monitor.cfg.jinja2.in
View file @
8cbe7790
...
@@ -260,7 +260,7 @@ curl_path = {{ curl_executable_location }}
...
@@ -260,7 +260,7 @@ curl_path = {{ curl_executable_location }}
[monitor-httpd-promise-conf]
[monitor-httpd-promise-conf]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
rendered = ${directory:monitor-promise}/${monitor-httpd-promise:filename}.cfg
rendered = ${directory:monitor-promise}/${monitor-httpd-promise:filename}.cfg
template = {{ monitor_
httpd_promise_conf
}}
template = {{ monitor_
service_conf_template
}}
mode = 0644
mode = 0644
context = section parameter_dict monitor-httpd-promise-conf-parameter
context = section parameter_dict monitor-httpd-promise-conf-parameter
...
@@ -281,6 +281,17 @@ context =
...
@@ -281,6 +281,17 @@ context =
raw python_executable {{ python_executable }}
raw python_executable {{ python_executable }}
raw password_changed_once_path ${directory:var}/monitor-password-changed-once
raw password_changed_once_path ${directory:var}/monitor-password-changed-once
[monitor-password-promise-conf-parameter]
title = Monitor password
frequency = */5 * * * *
[monitor-password-promise-conf]
recipe = slapos.recipe.template:jinja2
template = {{ monitor_service_conf_template }}
rendered = ${directory:monitor-promise}/${monitor-password-promise:filename}.cfg
mode = 0644
context = section parameter_dict monitor-password-promise-conf-parameter
[publish]
[publish]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
monitor-url = ${monitor-httpd-conf-parameter:url}
monitor-url = ${monitor-httpd-conf-parameter:url}
...
@@ -305,4 +316,5 @@ parts =
...
@@ -305,4 +316,5 @@ parts =
monitor-httpd-promise
monitor-httpd-promise
monitor-httpd-promise-conf
monitor-httpd-promise-conf
monitor-password-promise
monitor-password-promise
monitor-password-promise-conf
publish
publish
stack/monitor2/monitor-
httpd-promise.conf
.in
→
stack/monitor2/monitor-
service.cfg
.in
View file @
8cbe7790
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment