Commit 7ec20d5c authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak

caddy-frontend: Fix typo

authorised --> authorized
parent ce7de156
......@@ -26,7 +26,7 @@ md5sum = ab1795f92e32655d05c662c965d2b1f5
[template-apache-replicate]
filename = instance-apache-replicate.cfg.in
md5sum = f49cf291a0e46eddcf4bc4b4710e88d8
md5sum = 5e750fa9a5fd37932d31f8fb8b5f3694
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
......
......@@ -68,7 +68,7 @@ context =
{% set authorized_slave_list = [] %}
{% set rejected_slave_dict = {} %}
{% set used_host_list = [] %}
{% set unauthorised_message = 'slave not authorised' %}
{% set unauthorized_message = 'slave not authorized' %}
{% for slave in slave_instance_list %}
{% set slave_error_list = [] %}
{# BBB: apache_custom_https AND apache_custom_http #}
......@@ -94,8 +94,8 @@ context =
{% for key in ['caddy_custom_http', 'caddy_custom_https', 'apache_custom_http', 'apache_custom_https'] %}
{% if slave.get(key) %}
{% if not slave.get('slave_reference') in authorized_slave_string_list %}
{% if not unauthorised_message in slave_error_list %}
{% do slave_error_list.append(unauthorised_message) %}
{% if not unauthorized_message in slave_error_list %}
{% do slave_error_list.append(unauthorized_message) %}
{% endif %}
{% elif subprocess_module.call([caddy_custom_http_validator, slave[key]]) == 1 %}
{% do slave_error_list.append('slave %s configuration invalid' % (key,)) %}
......
......@@ -758,9 +758,9 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'rejected-slave-amount': '2',
'slave-amount': '35',
'rejected-slave-dict':
'{"_apache_custom_http_s-rejected": ["slave not authorised"], '
'"_caddy_custom_http_s-rejected": ["slave not authorised"], '
'"_caddy_custom_http_s": ["slave not authorised"]'
'{"_apache_custom_http_s-rejected": ["slave not authorized"], '
'"_caddy_custom_http_s-rejected": ["slave not authorized"], '
'"_caddy_custom_http_s": ["slave not authorized"]'
}
self.assertEqual(
......@@ -2103,7 +2103,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'apache_custom_http_s-rejected']
self.assertEqual(
{
'request-error-list': '["slave not authorised"]'
'request-error-list': '["slave not authorized"]'
},
parameter_dict)
slave_configuration_file_list = glob.glob(os.path.join(
......@@ -2181,7 +2181,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'caddy_custom_http_s-rejected']
self.assertEqual(
{
'request-error-list': '["slave not authorised"]'
'request-error-list': '["slave not authorized"]'
},
parameter_dict)
slave_configuration_file_list = glob.glob(os.path.join(
......@@ -2202,7 +2202,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
'caddy_custom_http_s']
self.assertEqual(
{
'request-error-list': '["slave not authorised"]'
'request-error-list': '["slave not authorized"]'
},
parameter_dict)
slave_configuration_file_list = glob.glob(os.path.join(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment