Merge pull request #75 from tgeywitz-transporeon/unique-id-format

Make unique-id-format configurable
uoi-io · Jul 27, 2023 · 0e06ee0 · 0e06ee0
2 parents 2a17a45 + 91a12a9
commit 0e06ee0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -119,6 +119,7 @@ haproxy_default_errorfiles:
   - "403 {{ haproxy_errors_directory }}/403.http"
 haproxy_default_http_check:
 haproxy_default_monitor_uri:
+haproxy_default_unique_id_format:
 
 # Userlist
 haproxy_userlist:

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -82,6 +82,7 @@ haproxy_default_errorfiles:
   - "403 {{ haproxy_errors_directory }}/403.http"
 # haproxy_default_http_check:
 # haproxy_default_monitor_uri:
+# haproxy_default_unique_id_format:
 
 # Stats
 haproxy_stats: true

diff --git a/templates/etc/haproxy/haproxy-default.cfg.j2 b/templates/etc/haproxy/haproxy-default.cfg.j2
@@ -42,3 +42,6 @@ defaults
 {% if haproxy_default_mode is defined and haproxy_default_mode | length > 0 %}
     mode        {{ haproxy_default_mode }}
 {% endif %}
+{% if haproxy_default_unique_id_format is defined and haproxy_default_unique_id_format | length %}
+    unique-id-format {{ haproxy_default_unique_id_format }}
+{% endif %}
diff --git a/templates/etc/haproxy/haproxy-frontend.cfg.j2 b/templates/etc/haproxy/haproxy-frontend.cfg.j2
@@ -121,6 +121,9 @@ frontend {{ name }}
             {% if value.default_backend is defined %}
     default_backend {{ value.default_backend }}
             {% endif %}
+            {% if value.unique_id_format is defined %}
+    unique-id-format {{ value.unique_id_format }}
+            {% endif %}
         {% endfor %}
 
     {% endfor %}

diff --git a/templates/etc/haproxy/haproxy-listen.cfg.j2 b/templates/etc/haproxy/haproxy-listen.cfg.j2
@@ -133,6 +133,9 @@ listen {{ name }}
     log-format      {{ log_format }}
                 {% endfor %}
             {% endif %}
+            {% if value.unique_id_format is defined %}
+    unique-id-format {{ value.unique_id_format }}
+            {% endif %}
         {% endfor %}
 
     {% endfor %}