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
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
Kwabena Antwi-Boasiako
slapos
Commits
c24e81d0
Commit
c24e81d0
authored
Jun 04, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Review for tyops
parent
279ea676
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+4
-4
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/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 @
c24e81d0
...
...
@@ -18,15 +18,15 @@ md5sum = 906e5bd66b1265b8109a86b6ab46e91f
[template-apache-frontend]
filename = instance-apache-frontend.cfg
md5sum =
0d780f4889bb52b4f7a4fcc486b9d9e1
md5sum =
3490155542f31cefd5c3f5aea8767586
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
md5sum =
361054e6566461e728ee62e2835904f9
md5sum =
a30d4bc21ae94d0eca42cea5032468a8
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
904084604341fe8eb00d493cd05e46c0
md5sum =
acfe2c5530ddd46803f99e7f5249aa5e
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
...
...
@@ -42,7 +42,7 @@ md5sum = 5c048a80c2e9374adea0cd647d14b192
[template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
904084604341fe8eb00d493cd05e46c0
md5sum =
acfe2c5530ddd46803f99e7f5249aa5e
[template-not-found-html]
filename = templates/notfound.html
...
...
software/caddy-frontend/instance-apache-frontend.cfg
View file @
c24e81d0
...
...
@@ -287,7 +287,7 @@ pid-file = $${directory:run}/httpd.pid
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
not-found-file = $${caddy-directory:document-root}/notfound.html
# Com
unication with ats
# Com
munication with ATS
cache-port = $${trafficserver-variable:input-port}
cache-through-port = 26011
ssl-cache-through-port = 26012
...
...
@@ -585,7 +585,7 @@ command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $$
wrapper-path = $${directory:promise}/caddy-frontend-is-running-actual-software-release
[slap_connection]
# Kept for backward compatiblity
# Kept for backward compatib
i
lity
computer_id = $${slap-connection:computer-id}
partition_id = $${slap-connection:partition-id}
server_url = $${slap-connection:server-url}
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
c24e81d0
...
...
@@ -33,7 +33,7 @@ context =
{% do slapparameter_dict.__setitem__(sla_computer_caddy_1_key, '${slap-connection:computer-id}') -%}
{% 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
{% for i in range(1, frontend_quantity + 1) -%}
{% set frontend_name = "%s-%s" % (namebase, i) -%}
...
...
@@ -169,7 +169,7 @@ offline = true
[slap_connection]
# Kept for backward compatiblity
# Kept for backward compatib
i
lity
computer_id = ${slap-connection:computer-id}
partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url}
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
c24e81d0
...
...
@@ -45,7 +45,7 @@ certs = {{ custom_ssl_directory }}/certs/
newcerts = {{ custom_ssl_directory }}/newcerts/
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 -%}
{% set slave_reference = slave_instance.get('slave_reference') -%}
{% 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