diff --git a/Longhelp.md b/Longhelp.md index 5194530c..79645f96 100644 --- a/Longhelp.md +++ b/Longhelp.md @@ -932,13 +932,6 @@ it falls back to default `HAPROXY_GROUP` and gets associated with Load balancers with the group '*' will collect all groups. -## `HAPROXY_{n}_HTTPS_FRONTEND_ACL_ONLY_WITH_PATH_AND_AUTH` - *per service port* - -Specified as `HAPROXY_{n}_HTTPS_FRONTEND_ACL_ONLY_WITH_PATH_AND_AUTH`. - - - ## `HAPROXY_{n}_MODE` *per service port* diff --git a/README.md b/README.md index 7a375389..2b954b68 100644 --- a/README.md +++ b/README.md @@ -303,4 +303,4 @@ PRs are welcome, but here are a few general guidelines: - Use the pre-commit hook to automatically generate docs: ``` bash /path/to/marathon-lb/scripts/install-git-hooks.sh - ``` + ``` \ No newline at end of file diff --git a/config.py b/config.py index 889fd1ab..eb7ce670 100644 --- a/config.py +++ b/config.py @@ -1293,9 +1293,6 @@ def __init__(self, name, func, description, perServicePort=True): labels.append(Label(name='HTTPS_FRONTEND_ACL_ONLY_WITH_PATH', func=set_label, description='')) -labels.append(Label(name='HTTPS_FRONTEND_ACL_ONLY_WITH_PATH_AND_AUTH', - func=set_label, - description='')) labels.append(Label(name='HTTP_FRONTEND_ROUTING_ONLY_WITH_PATH', func=set_label, description='')) @@ -1308,9 +1305,15 @@ def __init__(self, name, func, description, perServicePort=True): labels.append(Label(name='HTTPS_FRONTEND_ACL', func=set_label, description='')) +labels.append(Label(name='HTTPS_FRONTEND_ACL_WITH_AUTH', + func=set_label, + description='')) labels.append(Label(name='HTTPS_FRONTEND_ACL_WITH_PATH', func=set_label, description='')) +labels.append(Label(name='HTTPS_FRONTEND_ACL_WITH_AUTH_AND_PATH', + func=set_label, + description='')) labels.append(Label(name='BACKEND_HTTP_OPTIONS', func=set_label, description=''))