diff --git a/roles/consul_template/defaults/main.yml b/roles/consul_template/defaults/main.yml index 577e0e3..5529a67 100644 --- a/roles/consul_template/defaults/main.yml +++ b/roles/consul_template/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of consul-template to install -consul_tpl_version: 0.37.2 +consul_tpl_version: 0.37.4 # URL of the archive consul_tpl_archive_url: https://releases.hashicorp.com/consul-template/{{ consul_tpl_version }}/consul-template_{{ consul_tpl_version }}_linux_amd64.zip # Expected sha256 of the archive -consul_tpl_archive_sha256: 9b416cce00d301f1882ca817424e4cb99e37ad630fdb4c06b5ff5274ebc24c8a +consul_tpl_archive_sha256: f43567923e57f1e8ad30b07a3bc0a303b7213d13a5ad5c1ed7b3a9ea09be8275 # Root dir where consul-template will be installed consul_tpl_root_dir: /opt/consul_template diff --git a/roles/lemonldap_ng/templates/nginx_portal.conf.j2 b/roles/lemonldap_ng/templates/nginx_portal.conf.j2 index 8446161..39ed972 100644 --- a/roles/lemonldap_ng/templates/nginx_portal.conf.j2 +++ b/roles/lemonldap_ng/templates/nginx_portal.conf.j2 @@ -87,7 +87,8 @@ server { {% endif %} {% endif %} - location ~ ^/index.psgi/config { + index index.psgi; + location ~ ^(?/index\.psgi)/config { {% if llng_engine == 'fastcgi' %} include /etc/nginx/fastcgi_params; fastcgi_pass unix:/var/run/llng-fastcgi-server/llng-fastcgi.sock; @@ -113,7 +114,7 @@ server { {% endif %} } - location ~ ^/index.psgi/(adminSessions|sessions) { + location ~ ^(?/index\.psgi)/(adminSessions|sessions) { {% if llng_engine == 'fastcgi' %} include /etc/nginx/fastcgi_params; fastcgi_pass unix:/var/run/llng-fastcgi-server/llng-fastcgi.sock;