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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
b63d6be7
Commit
b63d6be7
authored
Mar 28, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: fix missing source directory when creating symlink
parent
2809c260
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
stack/monitor/buildout.hash.cfg
stack/monitor/buildout.hash.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+5
-11
No files found.
stack/monitor/buildout.hash.cfg
View file @
b63d6be7
...
@@ -15,4 +15,4 @@
...
@@ -15,4 +15,4 @@
# not need these here).
# not need these here).
[monitor2-template]
[monitor2-template]
filename = instance-monitor.cfg.jinja2.in
filename = instance-monitor.cfg.jinja2.in
md5sum =
33cdaacb84bac4fc237aef369cc4cb59
md5sum =
4a44e6ae988375ad3e3129d25d440503
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
b63d6be7
...
@@ -36,6 +36,8 @@ public = ${directory:monitor}/public
...
@@ -36,6 +36,8 @@ public = ${directory:monitor}/public
private = ${directory:monitor}/private
private = ${directory:monitor}/private
documents = ${:private}/documents
documents = ${:private}/documents
log = ${directory:log}/monitor
log = ${directory:log}/monitor
promise-result = ${buildout:directory}/.slapgrid/promise/result
promise-log = ${buildout:directory}/.slapgrid/promise/log
[ca-directory]
[ca-directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -121,19 +123,11 @@ context = section parameter_dict monitor-conf-parameters
...
@@ -121,19 +123,11 @@ context = section parameter_dict monitor-conf-parameters
section promise_parameter_dict monitor-promise-conf
section promise_parameter_dict monitor-promise-conf
section monitor_base_urls monitor-base-url-dict
section monitor_base_urls monitor-base-url-dict
[python-symlink]
recipe = plone.recipe.command
target = ${directory:bin}
command = ln -sf {{ python_with_eggs }} ${:target}/python
update-command = ${:command}
[start-monitor]
[start-monitor]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = {{
python_executable }} {{
monitor_bin }} -c ${monitor-conf:rendered}
command-line = {{ monitor_bin }} -c ${monitor-conf:rendered}
name = bootstrap-monitor
name = bootstrap-monitor
wrapper-path = ${directory:scripts}/${:name}
wrapper-path = ${directory:scripts}/${:name}
environment =
PATH=${python-symlink:target}:/usr/local/bin:/usr/bin:/bin
[monitor-htpasswd]
[monitor-htpasswd]
recipe = slapos.cookbook:generate.password
recipe = slapos.cookbook:generate.password
...
@@ -158,8 +152,8 @@ password = ${monitor-instance-parameter:password}
...
@@ -158,8 +152,8 @@ password = ${monitor-instance-parameter:password}
[monitor-symlink]
[monitor-symlink]
recipe = cns.recipe.symlink
recipe = cns.recipe.symlink
symlink =
symlink =
${
buildout:directory}/.slapgrid/promise/result
= ${monitor-directory:public}/promise
${
monitor-directory:promise-result}
= ${monitor-directory:public}/promise
${
buildout:directory}/.slapgrid/promise/log
= ${monitor-directory:log}/promise
${
monitor-directory:promise-result}
= ${monitor-directory:log}/promise
[monitor-httpd-conf-parameter]
[monitor-httpd-conf-parameter]
listening-ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
listening-ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
...
...
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