Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
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
Mynij
slapos-mynij-dev
Commits
96c1515d
Commit
96c1515d
authored
Sep 24, 2018
by
Guillaume Hervier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/re6stnet: auto-restart services on SR upgrade.
parent
3c5b51c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
software/re6stnet/instance-re6stnet.cfg.in
software/re6stnet/instance-re6stnet.cfg.in
+11
-5
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+1
-1
No files found.
software/re6stnet/instance-re6stnet.cfg.in
View file @
96c1515d
...
@@ -80,13 +80,19 @@ wrapper-path = {{ apache_wrapper }}
...
@@ -80,13 +80,19 @@ wrapper-path = {{ apache_wrapper }}
command-line = "{{ parameter_dict['apache-location'] }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
command-line = "{{ parameter_dict['apache-location'] }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
{% if uri_scheme == 'https' %}
{% if uri_scheme == 'https' %}
[
{{ section('apache-ca') }}
]
[
apache-ca
]
<= certificate-authority
<= certificate-authority
recipe = slapos.cookbook:certificate_authority.request
recipe = slapos.cookbook:certificate_authority.request
executable = ${apache-httpd:wrapper-path}
executable = ${apache-httpd:wrapper-path}
wrapper = ${directory:
services
}/httpd
wrapper = ${directory:
bin
}/httpd
key-file = ${certificate-authority:ca-private}/apache.key
key-file = ${certificate-authority:ca-private}/apache.key
cert-file = ${certificate-authority:ca-certs}/apache.crt
cert-file = ${certificate-authority:ca-certs}/apache.crt
[{{ section('apache-ca-service') }}]
recipe = slapos.cookbook:wrapper
command-line = ${apache-ca:wrapper}
wrapper-path = ${directory:services}/httpd
hash-files = ${buildout:directory}/software_release/buildout.cfg
{% endif %}
{% endif %}
[apache-httpd-graceful]
[apache-httpd-graceful]
...
...
software/re6stnet/software.cfg
View file @
96c1515d
...
@@ -86,7 +86,7 @@ extra-context =
...
@@ -86,7 +86,7 @@ extra-context =
[template-re6stnet]
[template-re6stnet]
< = download-base
< = download-base
filename = instance-re6stnet.cfg.in
filename = instance-re6stnet.cfg.in
md5sum =
8c167f2adb2ed36aeaff773f59214981
md5sum =
09683c66c16361b77867d8f2e1140a35
[template-apache-conf]
[template-apache-conf]
< = download-base
< = download-base
...
...
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