Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
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
Show 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
[monitor-template-wrapper]
<= monitor-template-base
filename = wrapper.in
md5sum =
8cde04bfd0c0e9bd56744b988275cfd8
md5sum =
1695c9a06a2b11ccfe893d7a224e489d
[monitor-conf]
<= monitor-template-base
...
...
@@ -99,7 +99,7 @@ recipe = slapos.recipe.template:jinja2
filename = template-monitor.cfg
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
rendered = ${buildout:directory}/template-monitor.cfg
md5sum =
b8c804aba89a3938aa00bed914b1729a
md5sum =
eab45fd2b0f017ab97a9c8f466c8dceb
context =
key apache_location apache:location
key gzip_location gzip:location
...
...
@@ -173,4 +173,3 @@ url = ${:_profile_base_location_}/make-rss.sh.in
md5sum = 98c8f6fd81e405b0ad10db07c3776321
output = ${buildout:directory}/template-make-rss.sh.in
mode = 0644
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
a04ba384
...
...
@@ -269,6 +269,7 @@ rendered = ${directory:scripts}/monitor-httpd-graceful
mode = 0700
context =
key content :command
raw dash_binary {{ dash_executable_location }}
command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
[monitor-status2rss-wrapper]
...
...
stack/monitor/templates/wrapper.in
View file @
a04ba384
#!
${dash-output:dash
}
#!
{{ dash_binary }
}
{{ 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