Add several options for RestAPI (#93)

Co-authored-by: Samuel Mutel <smu-dw@deveryware.net>
kostiantyn-nemchenko · May 10, 2021 · fa6cdae · fa6cdae
1 parent 7a1a5b3
commit fa6cdae
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -41,12 +41,18 @@ patroni_log_loggers:
   - { module: "urllib3",            level: "DEBUG" }
 
 # https://patroni.readthedocs.io/en/latest/SETTINGS.html#rest-api
-patroni_restapi_listen: 0.0.0.0:8008
 patroni_restapi_connect_address: "{{ ansible_host }}:8008"
-patroni_restapi_certfile: ""
-patroni_restapi_keyfile: ""
+patroni_restapi_listen: 0.0.0.0:8008
 patroni_restapi_username: ""
 patroni_restapi_password: ""
+patroni_restapi_certfile: ""
+patroni_restapi_keyfile: ""
+patroni_restapi_keyfile_password: ""
+patroni_restapi_cafile: ""
+patroni_restapi_ciphers: ""
+patroni_restapi_verify_client: ""
+patroni_restapi_http_extra_headers: ""
+patroni_restapi_https_extra_headers: ""
 
 patroni_dcs: etcd
 patroni_dcs_exists: true

diff --git a/templates/patroni.yml.j2 b/templates/patroni.yml.j2
@@ -21,17 +21,35 @@ log:
 
 {% endif %}
 restapi:
-  listen: {{ patroni_restapi_listen |d('0.0.0.0:8008', true) }}
   connect_address: {{ patroni_restapi_connect_address |d(ansible_host + ':8008', true) }}
-{% if patroni_restapi_certfile |d(None, true) and patroni_restapi_keyfile |d(None, true) %}
-  certfile: {{ patroni_restapi_certfile }}
-  keyfile: {{ patroni_restapi_keyfile }}
-{% endif %}
+  listen: {{ patroni_restapi_listen |d('0.0.0.0:8008', true) }}
 {% if patroni_restapi_username |d(None, true) and patroni_restapi_password |d(None, true) %}
   authentication:
     username: {{ patroni_restapi_username }}
     password: {{ patroni_restapi_password }}
 {% endif %}
+{% if patroni_restapi_certfile |d(None, true) and patroni_restapi_keyfile |d(None, true) %}
+  certfile: {{ patroni_restapi_certfile }}
+  keyfile: {{ patroni_restapi_keyfile }}
+{% endif %}
+{% if patroni_restapi_keyfile_password |d(None, true) %}
+  keyfile_password: {{ patroni_restapi_keyfile_password }}
+{% endif %}
+{% if patroni_restapi_cafile |d(None, true) %}
+  cafile: {{ patroni_restapi_cafile }}
+{% endif %}
+{% if patroni_restapi_ciphers |d(None, true) %}
+  ciphers: {{ patroni_restapi_ciphers }}
+{% endif %}
+{% if patroni_restapi_verify_client |d(None, true) %}
+  verify_client: {{ patroni_restapi_verify_client }}
+{% endif %}
+{% if patroni_restapi_http_extra_headers |d(None, true) %}
+  http_extra_headers: {{ patroni_restapi_http_extra_headers }}
+{% endif %}
+{% if patroni_restapi_https_extra_headers |d(None, true) %}
+  https_extra_headers: {{ patroni_restapi_https_extra_headers }}
+{% endif %}
 
 {% include 'dcs/' + (patroni_dcs |d('etcd')) + '.yml.j2' %}
 
@@ -237,4 +255,4 @@ tags:
     {{ tag.name }}: {{ tag.value }}
     {% endif %}
   {% endfor %}
-{% endif %}
+{% endif %}