File tree Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ defaults_haproxy:
33
33
challenge_port : 8405 # port the webserver for challenge-responses listens on
34
34
ca : ' letsencrypt'
35
35
domains : []
36
+ domains_ignore : []
36
37
37
38
geoip :
38
39
enable : false
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ class FilterModule(object):
5
5
def filters (self ):
6
6
return {
7
7
"ensure_list" : self .ensure_list ,
8
+ "exclude" : self .exclude ,
8
9
"is_string" : self .is_string ,
9
10
"is_dict" : self .is_dict ,
10
11
"safe_key" : self .safe_key ,
@@ -29,6 +30,11 @@ def ensure_list(data: (str, list)) -> list:
29
30
def is_string (data ) -> bool :
30
31
return isinstance (data , str )
31
32
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
+
32
38
@staticmethod
33
39
def is_dict (data ) -> bool :
34
40
return isinstance (data , dict )
Original file line number Diff line number Diff line change 9
9
{% set fe_cnf = defaults_frontend | combine (fe_cnf_user , recursive =true ) %}
10
10
# FRONTEND: {{ fe_name }}
11
11
{% 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 }}
13
13
{% endif %}
14
14
{% for be_name , be_cnf_user in fe_cnf .routes .items () %}
15
15
{% set be_cnf = defaults_backend | combine (be_cnf_user , recursive =true ) %}
16
16
## 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 %}
20
20
{% endfor %}
21
21
{% endfor %}
You can’t perform that action at this time.
0 commit comments