From b32e492805ed742c83eb778d79a837c4d7470db0 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Tue, 19 Mar 2019 19:18:06 +0100 Subject: [PATCH] nsupdate_web: use .conf extention for opensuse nginx Signed-off-by: Kyr Shatskyy (cherry picked from commit cbb0a82a0380038d33d1b59eb65eed9622ec61d6) --- roles/nsupdate_web/tasks/main.yml | 4 ++-- .../templates/nsupdate_web_nginx_opensuse_leap_15 | 7 +++++++ .../{nsupdate_web_nginx => nsupdate_web_nginx_ubuntu_16} | 0 roles/nsupdate_web/vars/opensuse_leap_15.yml | 1 + roles/nsupdate_web/vars/ubuntu_16.yml | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 roles/nsupdate_web/templates/nsupdate_web_nginx_opensuse_leap_15 rename roles/nsupdate_web/templates/{nsupdate_web_nginx => nsupdate_web_nginx_ubuntu_16} (100%) diff --git a/roles/nsupdate_web/tasks/main.yml b/roles/nsupdate_web/tasks/main.yml index 591d932..ae78e0c 100644 --- a/roles/nsupdate_web/tasks/main.yml +++ b/roles/nsupdate_web/tasks/main.yml @@ -89,7 +89,7 @@ - name: Ship nginx configuration template: - src: nsupdate_web_nginx + src: "nsupdate_web_nginx_{{ ansible_distribution | lower | replace(' ', '_') }}_{{ ansible_distribution_major_version }}" dest: "{{ nginx_available }}/nsupdate_web" owner: root group: root @@ -103,7 +103,7 @@ - name: Enable our nginx configuration file: src: "{{ nginx_available }}/nsupdate_web" - dest: "{{ nginx_enabled }}/nsupdate_web" + dest: "{{ nginx_enabled }}/{{ nsupdate_web_conf }}" state: link - name: Enable and restart nginx diff --git a/roles/nsupdate_web/templates/nsupdate_web_nginx_opensuse_leap_15 b/roles/nsupdate_web/templates/nsupdate_web_nginx_opensuse_leap_15 new file mode 100644 index 0000000..d9054d3 --- /dev/null +++ b/roles/nsupdate_web/templates/nsupdate_web_nginx_opensuse_leap_15 @@ -0,0 +1,7 @@ +server { + listen 80; + + location = /update { + proxy_pass http://localhost:{{ nsupdate_web_port }}; + } +} diff --git a/roles/nsupdate_web/templates/nsupdate_web_nginx b/roles/nsupdate_web/templates/nsupdate_web_nginx_ubuntu_16 similarity index 100% rename from roles/nsupdate_web/templates/nsupdate_web_nginx rename to roles/nsupdate_web/templates/nsupdate_web_nginx_ubuntu_16 diff --git a/roles/nsupdate_web/vars/opensuse_leap_15.yml b/roles/nsupdate_web/vars/opensuse_leap_15.yml index 9268a57..2de26aa 100644 --- a/roles/nsupdate_web/vars/opensuse_leap_15.yml +++ b/roles/nsupdate_web/vars/opensuse_leap_15.yml @@ -6,3 +6,4 @@ packages: - nginx nginx_available: "/etc/nginx" nginx_enabled: "/etc/nginx/vhosts.d" +nsupdate_web_conf: "nsupdate_web.conf" diff --git a/roles/nsupdate_web/vars/ubuntu_16.yml b/roles/nsupdate_web/vars/ubuntu_16.yml index d74459f..d4761cd 100644 --- a/roles/nsupdate_web/vars/ubuntu_16.yml +++ b/roles/nsupdate_web/vars/ubuntu_16.yml @@ -7,3 +7,4 @@ packages: nginx_available: "/etc/nginx/sites-available" nginx_enabled: "/etc/nginx/sites-enabled" +nsupdate_web_conf: "nsupdate_web" -- 2.39.5