Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
a04ba384
Commit
a04ba384
authored
Apr 15, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: fix httpd-graceful wrapper script
parent
d985bbb9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+2
-3
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+1
-0
stack/monitor/templates/wrapper.in
stack/monitor/templates/wrapper.in
+1
-1
No files found.
stack/monitor/buildout.cfg
View file @
a04ba384
...
@@ -71,7 +71,7 @@ md5sum = 5913d2a0096b50537f394a49b762b3e5
...
@@ -71,7 +71,7 @@ md5sum = 5913d2a0096b50537f394a49b762b3e5
[monitor-template-wrapper]
[monitor-template-wrapper]
<= monitor-template-base
<= monitor-template-base
filename = wrapper.in
filename = wrapper.in
md5sum =
8cde04bfd0c0e9bd56744b988275cfd8
md5sum =
1695c9a06a2b11ccfe893d7a224e489d
[monitor-conf]
[monitor-conf]
<= monitor-template-base
<= monitor-template-base
...
@@ -99,7 +99,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -99,7 +99,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 =
b8c804aba89a3938aa00bed914b1729a
md5sum =
eab45fd2b0f017ab97a9c8f466c8dceb
context =
context =
key apache_location apache:location
key apache_location apache:location
key gzip_location gzip:location
key gzip_location gzip:location
...
@@ -173,4 +173,3 @@ url = ${:_profile_base_location_}/make-rss.sh.in
...
@@ -173,4 +173,3 @@ url = ${:_profile_base_location_}/make-rss.sh.in
md5sum = 98c8f6fd81e405b0ad10db07c3776321
md5sum = 98c8f6fd81e405b0ad10db07c3776321
output = ${buildout:directory}/template-make-rss.sh.in
output = ${buildout:directory}/template-make-rss.sh.in
mode = 0644
mode = 0644
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
a04ba384
...
@@ -269,6 +269,7 @@ rendered = ${directory:scripts}/monitor-httpd-graceful
...
@@ -269,6 +269,7 @@ rendered = ${directory:scripts}/monitor-httpd-graceful
mode = 0700
mode = 0700
context =
context =
key content :command
key content :command
raw dash_binary {{ dash_executable_location }}
command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
[monitor-status2rss-wrapper]
[monitor-status2rss-wrapper]
...
...
stack/monitor/templates/wrapper.in
View file @
a04ba384
#!
${dash-output:dash
}
#!
{{ dash_binary }
}
{{ content }}
{{ content }}
\ No newline at end of file
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