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
3c301b2a
Commit
3c301b2a
authored
Jun 04, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Review for tyops
parent
bca19c1a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+5
-5
software/caddy-frontend/instance-apache-frontend.cfg
software/caddy-frontend/instance-apache-frontend.cfg
+2
-2
software/caddy-frontend/instance-apache-replicate.cfg.in
software/caddy-frontend/instance-apache-replicate.cfg.in
+2
-2
software/caddy-frontend/templates/Caddyfile.in
software/caddy-frontend/templates/Caddyfile.in
+1
-1
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+1
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
3c301b2a
...
@@ -19,15 +19,15 @@ md5sum = 906e5bd66b1265b8109a86b6ab46e91f
...
@@ -19,15 +19,15 @@ md5sum = 906e5bd66b1265b8109a86b6ab46e91f
[template-apache-frontend]
[template-apache-frontend]
filename = instance-apache-frontend.cfg
filename = instance-apache-frontend.cfg
md5sum =
40ed35a0b8c567197665c51c561d6e07
md5sum =
21f4e3ac43b662e734ce1bd6c98516a6
[template-apache-replicate]
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
md5sum =
361054e6566461e728ee62e2835904f9
md5sum =
a30d4bc21ae94d0eca42cea5032468a8
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
10d3f1a3be413208a8cf8ee6e3d735ed
md5sum =
ecca3955ba747444f505216839fd1645
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
@@ -39,11 +39,11 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
...
@@ -39,11 +39,11 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
[template-caddy-frontend-configuration]
[template-caddy-frontend-configuration]
filename = templates/Caddyfile.in
filename = templates/Caddyfile.in
md5sum =
4d17c13865d1d858a9af3635ff86e683
md5sum =
829d8fc33d3e12ebe6ed79fd77faf0e9
[template-custom-slave-list]
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
10d3f1a3be413208a8cf8ee6e3d735ed
md5sum =
ecca3955ba747444f505216839fd1645
[template-not-found-html]
[template-not-found-html]
filename = templates/notfound.html
filename = templates/notfound.html
...
...
software/caddy-frontend/instance-apache-frontend.cfg
View file @
3c301b2a
...
@@ -293,7 +293,7 @@ access-control-string = none
...
@@ -293,7 +293,7 @@ access-control-string = none
frontend-configuration-verification = $${caddy-wrapper:rendered} -validate > /dev/null
frontend-configuration-verification = $${caddy-wrapper:rendered} -validate > /dev/null
frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
not-found-file = $${caddy-directory:document-root}/notfound.html
not-found-file = $${caddy-directory:document-root}/notfound.html
# Com
unication with ats
# Com
munication with ATS
cache-port = $${trafficserver-variable:input-port}
cache-port = $${trafficserver-variable:input-port}
cache-through-port = 26011
cache-through-port = 26011
ssl-cache-through-port = 26012
ssl-cache-through-port = 26012
...
@@ -591,7 +591,7 @@ command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $$
...
@@ -591,7 +591,7 @@ command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $$
wrapper-path = $${directory:promise}/caddy-frontend-is-running-actual-software-release
wrapper-path = $${directory:promise}/caddy-frontend-is-running-actual-software-release
[slap_connection]
[slap_connection]
# Kept for backward compatiblity
# Kept for backward compatib
i
lity
computer_id = $${slap-connection:computer-id}
computer_id = $${slap-connection:computer-id}
partition_id = $${slap-connection:partition-id}
partition_id = $${slap-connection:partition-id}
server_url = $${slap-connection:server-url}
server_url = $${slap-connection:server-url}
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
3c301b2a
...
@@ -33,7 +33,7 @@ context =
...
@@ -33,7 +33,7 @@ context =
{% do slapparameter_dict.__setitem__(sla_computer_caddy_1_key, '${slap-connection:computer-id}') -%}
{% do slapparameter_dict.__setitem__(sla_computer_caddy_1_key, '${slap-connection:computer-id}') -%}
{% endif -%}
{% endif -%}
# Here we request individualy each frontend.
# Here we request individual
l
y each frontend.
# The presence of sla parameters is checked and added if found
# The presence of sla parameters is checked and added if found
{% for i in range(1, frontend_quantity + 1) -%}
{% for i in range(1, frontend_quantity + 1) -%}
{% set frontend_name = "%s-%s" % (namebase, i) -%}
{% set frontend_name = "%s-%s" % (namebase, i) -%}
...
@@ -169,7 +169,7 @@ offline = true
...
@@ -169,7 +169,7 @@ offline = true
[slap_connection]
[slap_connection]
# Kept for backward compatiblity
# Kept for backward compatib
i
lity
computer_id = ${slap-connection:computer-id}
computer_id = ${slap-connection:computer-id}
partition_id = ${slap-connection:partition-id}
partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url}
server_url = ${slap-connection:server-url}
...
...
software/caddy-frontend/templates/Caddyfile.in
View file @
3c301b2a
# Automatically generated
# Automatically generated
# Basic server configuration
# Basic server configuration
# XXX: Does Caddy need ServerRoot equ
avi
lence?
# XXX: Does Caddy need ServerRoot equ
iva
lence?
#ServerRoot {{ instance_home }}
#ServerRoot {{ instance_home }}
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
3c301b2a
...
@@ -45,7 +45,7 @@ certs = {{ custom_ssl_directory }}/certs/
...
@@ -45,7 +45,7 @@ certs = {{ custom_ssl_directory }}/certs/
newcerts = {{ custom_ssl_directory }}/newcerts/
newcerts = {{ custom_ssl_directory }}/newcerts/
crl = {{ custom_ssl_directory }}/crl/
crl = {{ custom_ssl_directory }}/crl/
{# Loop th
r
ought slave list to set up slaves #}
{# Loop thought slave list to set up slaves #}
{% for slave_instance in slave_instance_list -%}
{% for slave_instance in slave_instance_list -%}
{% set slave_reference = slave_instance.get('slave_reference') -%}
{% set slave_reference = slave_instance.get('slave_reference') -%}
{% set slave_type = slave_instance.get('type', '') -%}
{% set slave_type = slave_instance.get('type', '') -%}
...
...
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