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
Cédric Le Ninivin
slapos
Commits
7ec20d5c
Commit
7ec20d5c
authored
Nov 19, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Nov 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Fix typo
authorised --> authorized
parent
ce7de156
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-apache-replicate.cfg.in
software/caddy-frontend/instance-apache-replicate.cfg.in
+3
-3
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+6
-6
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
7ec20d5c
...
@@ -26,7 +26,7 @@ md5sum = ab1795f92e32655d05c662c965d2b1f5
...
@@ -26,7 +26,7 @@ md5sum = ab1795f92e32655d05c662c965d2b1f5
[template-apache-replicate]
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
md5sum =
f49cf291a0e46eddcf4bc4b4710e88d8
md5sum =
5e750fa9a5fd37932d31f8fb8b5f3694
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
7ec20d5c
...
@@ -68,7 +68,7 @@ context =
...
@@ -68,7 +68,7 @@ context =
{% set authorized_slave_list = [] %}
{% set authorized_slave_list = [] %}
{% set rejected_slave_dict = {} %}
{% set rejected_slave_dict = {} %}
{% set used_host_list = [] %}
{% set used_host_list = [] %}
{% set unauthori
sed_message = 'slave not authoris
ed' %}
{% set unauthori
zed_message = 'slave not authoriz
ed' %}
{% for slave in slave_instance_list %}
{% for slave in slave_instance_list %}
{% set slave_error_list = [] %}
{% set slave_error_list = [] %}
{# BBB: apache_custom_https AND apache_custom_http #}
{# BBB: apache_custom_https AND apache_custom_http #}
...
@@ -94,8 +94,8 @@ context =
...
@@ -94,8 +94,8 @@ context =
{% for key in ['caddy_custom_http', 'caddy_custom_https', 'apache_custom_http', 'apache_custom_https'] %}
{% for key in ['caddy_custom_http', 'caddy_custom_https', 'apache_custom_http', 'apache_custom_https'] %}
{% if slave.get(key) %}
{% if slave.get(key) %}
{% if not slave.get('slave_reference') in authorized_slave_string_list %}
{% if not slave.get('slave_reference') in authorized_slave_string_list %}
{% if not unauthori
s
ed_message in slave_error_list %}
{% if not unauthori
z
ed_message in slave_error_list %}
{% do slave_error_list.append(unauthori
s
ed_message) %}
{% do slave_error_list.append(unauthori
z
ed_message) %}
{% endif %}
{% endif %}
{% elif subprocess_module.call([caddy_custom_http_validator, slave[key]]) == 1 %}
{% elif subprocess_module.call([caddy_custom_http_validator, slave[key]]) == 1 %}
{% do slave_error_list.append('slave %s configuration invalid' % (key,)) %}
{% do slave_error_list.append('slave %s configuration invalid' % (key,)) %}
...
...
software/caddy-frontend/test/test.py
View file @
7ec20d5c
...
@@ -758,9 +758,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -758,9 +758,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'rejected-slave-amount'
:
'2'
,
'rejected-slave-amount'
:
'2'
,
'slave-amount'
:
'35'
,
'slave-amount'
:
'35'
,
'rejected-slave-dict'
:
'rejected-slave-dict'
:
'{"_apache_custom_http_s-rejected": ["slave not authori
s
ed"], '
'{"_apache_custom_http_s-rejected": ["slave not authori
z
ed"], '
'"_caddy_custom_http_s-rejected": ["slave not authori
s
ed"], '
'"_caddy_custom_http_s-rejected": ["slave not authori
z
ed"], '
'"_caddy_custom_http_s": ["slave not authori
s
ed"]'
'"_caddy_custom_http_s": ["slave not authori
z
ed"]'
}
}
self
.
assertEqual
(
self
.
assertEqual
(
...
@@ -2103,7 +2103,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -2103,7 +2103,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'
apache_custom_http_s
-
rejected
']
'
apache_custom_http_s
-
rejected
']
self.assertEqual(
self.assertEqual(
{
{
'
request
-
error
-
list
': '
[
"slave not authori
s
ed"
]
'
'
request
-
error
-
list
': '
[
"slave not authori
z
ed"
]
'
},
},
parameter_dict)
parameter_dict)
slave_configuration_file_list = glob.glob(os.path.join(
slave_configuration_file_list = glob.glob(os.path.join(
...
@@ -2181,7 +2181,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -2181,7 +2181,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'
caddy_custom_http_s
-
rejected
']
'
caddy_custom_http_s
-
rejected
']
self.assertEqual(
self.assertEqual(
{
{
'
request
-
error
-
list
': '
[
"slave not authori
s
ed"
]
'
'
request
-
error
-
list
': '
[
"slave not authori
z
ed"
]
'
},
},
parameter_dict)
parameter_dict)
slave_configuration_file_list = glob.glob(os.path.join(
slave_configuration_file_list = glob.glob(os.path.join(
...
@@ -2202,7 +2202,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
...
@@ -2202,7 +2202,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'
caddy_custom_http_s
']
'
caddy_custom_http_s
']
self.assertEqual(
self.assertEqual(
{
{
'
request
-
error
-
list
': '
[
"slave not authori
s
ed"
]
'
'
request
-
error
-
list
': '
[
"slave not authori
z
ed"
]
'
},
},
parameter_dict)
parameter_dict)
slave_configuration_file_list = glob.glob(os.path.join(
slave_configuration_file_list = glob.glob(os.path.join(
...
...
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