Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

labels fix #173

Merged
merged 13 commits into from
Apr 28, 2016
7 changes: 0 additions & 7 deletions Longhelp.md
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
```
9 changes: 6 additions & 3 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=''))
Expand All @@ -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=''))
Expand Down