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
Aurel
slapos
Commits
c533c361
Commit
c533c361
authored
May 29, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
May 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Run kedifa-updater prepare w/o network requirement
parent
2573a9da
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
6 deletions
+5
-6
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+2
-3
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
...DefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
+1
-1
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
...test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
+1
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
c533c361
...
@@ -30,7 +30,7 @@ md5sum = ef06c04a5aa33b103dc1d25d0dfe8217
...
@@ -30,7 +30,7 @@ md5sum = ef06c04a5aa33b103dc1d25d0dfe8217
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
398f149e5fb6faf2e012ac22381a4bab
md5sum =
a473ded24aed999abed3d79a08bb09a6
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
c533c361
...
@@ -446,9 +446,8 @@ hash-files = ${buildout:directory}/software_release/buildout.cfg
...
@@ -446,9 +446,8 @@ hash-files = ${buildout:directory}/software_release/buildout.cfg
[kedifa-updater-run]
[kedifa-updater-run]
recipe = plone.recipe.command
recipe = plone.recipe.command
# unfortunately slapos.cookbook:wrapper does not return generated wrapper path
stop-on-error = True
# so it is needed to access it via service directory globbing
command = {{ kedifa_updater }} --prepare-only ${kedifa-updater-mapping:file} --on-update "{{ frontend_graceful_reload }}"
command = {{ service_directory }}/kedifa-updater* --prepare-only
update-command = ${:command}
update-command = ${:command}
[kedifa-updater-mapping]
[kedifa-updater-mapping]
...
...
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
View file @
c533c361
...
@@ -19,7 +19,7 @@ T-2/etc/plugin/check-_test-error-log-last-day.py: OK
...
@@ -19,7 +19,7 @@ T-2/etc/plugin/check-_test-error-log-last-day.py: OK
T-2/etc/plugin/check-_test-error-log-last-hour.py: OK
T-2/etc/plugin/check-_test-error-log-last-hour.py: OK
T-2/etc/plugin/check-free-disk-space.py: OK
T-2/etc/plugin/check-free-disk-space.py: OK
T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
T-2/etc/plugin/frontend-caddy-configuration-promise.py:
ERROR
T-2/etc/plugin/frontend-caddy-configuration-promise.py:
OK
T-2/etc/plugin/monitor-bootstrap-status.py: OK
T-2/etc/plugin/monitor-bootstrap-status.py: OK
T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
T-2/etc/plugin/re6st-connectivity.py: OK
T-2/etc/plugin/re6st-connectivity.py: OK
...
...
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
View file @
c533c361
...
@@ -35,7 +35,7 @@ T-3/etc/plugin/check-_replicate-error-log-last-day.py: OK
...
@@ -35,7 +35,7 @@ T-3/etc/plugin/check-_replicate-error-log-last-day.py: OK
T-3/etc/plugin/check-_replicate-error-log-last-hour.py: OK
T-3/etc/plugin/check-_replicate-error-log-last-hour.py: OK
T-3/etc/plugin/check-free-disk-space.py: OK
T-3/etc/plugin/check-free-disk-space.py: OK
T-3/etc/plugin/expose-csr_id-ip-port-listening.py: OK
T-3/etc/plugin/expose-csr_id-ip-port-listening.py: OK
T-3/etc/plugin/frontend-caddy-configuration-promise.py:
ERROR
T-3/etc/plugin/frontend-caddy-configuration-promise.py:
OK
T-3/etc/plugin/monitor-bootstrap-status.py: OK
T-3/etc/plugin/monitor-bootstrap-status.py: OK
T-3/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
T-3/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
T-3/etc/plugin/re6st-connectivity.py: OK
T-3/etc/plugin/re6st-connectivity.py: OK
...
...
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