Skip to content

Commit be19c8a

Browse files
committed
enable to exclude configured domains from acme
1 parent 2dc55ca commit be19c8a

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

defaults/main/1_main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ defaults_haproxy:
3333
challenge_port: 8405 # port the webserver for challenge-responses listens on
3434
ca: 'letsencrypt'
3535
domains: []
36+
domains_ignore: []
3637

3738
geoip:
3839
enable: false

filter_plugins/utils.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class FilterModule(object):
55
def filters(self):
66
return {
77
"ensure_list": self.ensure_list,
8+
"exclude": self.exclude,
89
"is_string": self.is_string,
910
"is_dict": self.is_dict,
1011
"safe_key": self.safe_key,
@@ -29,6 +30,11 @@ def ensure_list(data: (str, list)) -> list:
2930
def is_string(data) -> bool:
3031
return isinstance(data, str)
3132

33+
@classmethod
34+
def exclude(cls, data: list, excludes: list) -> list:
35+
data, excludes = cls.ensure_list(data), cls.ensure_list(excludes)
36+
return [d for d in data if d not in excludes]
37+
3238
@staticmethod
3339
def is_dict(data) -> bool:
3440
return isinstance(data, dict)

templates/etc/dehydrated/domains.txt.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
{% set fe_cnf = defaults_frontend | combine(fe_cnf_user, recursive=true) %}
1010
# FRONTEND: {{ fe_name }}
1111
{% if fe_cnf.acme.domains | default([]) | ensure_list | length > 0 %}
12-
{{ fe_cnf.acme.domains | default([]) | domains_not_routed(fe_cnf.routes) | join(' ') }} > {{ fe_name | safe_key }}
12+
{{ fe_cnf.acme.domains | default([]) | domains_not_routed(fe_cnf.routes) | exclude(HAPROXY_CONFIG.acme.domains_ignore) | join(' ') }} > {{ fe_name | safe_key }}
1313
{% endif %}
1414
{% for be_name, be_cnf_user in fe_cnf.routes.items() %}
1515
{% set be_cnf = defaults_backend | combine(be_cnf_user, recursive=true) %}
1616
## BACKEND: {{ be_name }}
17-
{% if be_cnf.domains | default([]) | ensure_list | length > 0 %}
18-
{{ be_cnf.domains | default([]) | ensure_list | join(' ') }} > {{ fe_name | safe_key }}-{{ be_name | safe_key }}
19-
{% endif %}
17+
{% if be_cnf.domains | default([]) | ensure_list | length > 0 %}
18+
{{ be_cnf.domains | default([]) | ensure_list | exclude(HAPROXY_CONFIG.acme.domains_ignore) | join(' ') }} > {{ fe_name | safe_key }}-{{ be_name | safe_key }}
19+
{% endif %}
2020
{% endfor %}
2121
{% endfor %}

0 commit comments

Comments
 (0)