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
Thomas Leymonerie
slapos
Commits
fc9dd002
Commit
fc9dd002
authored
Nov 29, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Dec 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Use CADDYPATH to separate processes
parent
b6d28b29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+7
-0
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
fc9dd002
...
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
...
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
filename = instance-apache-frontend.cfg.in
md5sum =
f6b764f928656999b40fbcabafcfbcba
md5sum =
822e78eea24952ed1f748118a499f1d9
[template-apache-replicate]
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
...
...
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
fc9dd002
...
@@ -86,6 +86,9 @@ ca-dir = ${:srv}/ssl
...
@@ -86,6 +86,9 @@ ca-dir = ${:srv}/ssl
varnginx = ${:var}/nginx
varnginx = ${:var}/nginx
frontend_cluster = ${:var}/frontend_cluster
nginx_cluster = ${:var}/nginx_cluster
[switch-caddy-softwaretype]
[switch-caddy-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
single-default = ${dynamic-custom-personal-template-slave-list:rendered}
single-default = ${dynamic-custom-personal-template-slave-list:rendered}
...
@@ -224,6 +227,8 @@ extra-context =
...
@@ -224,6 +227,8 @@ extra-context =
[caddy-wrapper]
[caddy-wrapper]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
environment =
CADDYPATH=${directory:frontend_cluster}
command-line = {{ parameter_dict['caddy'] }}
command-line = {{ parameter_dict['caddy'] }}
-conf ${dynamic-caddy-frontend-template:rendered}
-conf ${dynamic-caddy-frontend-template:rendered}
-log stdout
-log stdout
...
@@ -648,6 +653,8 @@ curl_path = {{ parameter_dict['curl'] }}/bin/curl
...
@@ -648,6 +653,8 @@ curl_path = {{ parameter_dict['curl'] }}/bin/curl
#
#
[nginx-wrapper]
[nginx-wrapper]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
environment =
CADDYPATH=${directory:nginx_cluster}
command-line = {{ parameter_dict['caddy'] }}
command-line = {{ parameter_dict['caddy'] }}
-conf ${dynamic-nginx-frontend-template:rendered}
-conf ${dynamic-nginx-frontend-template:rendered}
-log stdout
-log stdout
...
...
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