From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Tue, 19 Mar 2019 18:18:06 +0000 (+0100)
Subject: nsupdate_web: use .conf extention for opensuse nginx
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b32e492805ed742c83eb778d79a837c4d7470db0;p=ceph-cm-ansible.git

nsupdate_web: use .conf extention for opensuse nginx

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
(cherry picked from commit cbb0a82a0380038d33d1b59eb65eed9622ec61d6)
---

diff --git a/roles/nsupdate_web/tasks/main.yml b/roles/nsupdate_web/tasks/main.yml
index 591d9326..ae78e0ce 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 b/roles/nsupdate_web/templates/nsupdate_web_nginx
deleted file mode 100644
index 0a73d8e8..00000000
--- a/roles/nsupdate_web/templates/nsupdate_web_nginx
+++ /dev/null
@@ -1,8 +0,0 @@
-server {
-    listen 80;
-
-    location = /update {
-        include proxy_params;
-        proxy_pass http://localhost:{{ nsupdate_web_port }};
-    }
-}
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 00000000..d9054d33
--- /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_ubuntu_16 b/roles/nsupdate_web/templates/nsupdate_web_nginx_ubuntu_16
new file mode 100644
index 00000000..0a73d8e8
--- /dev/null
+++ b/roles/nsupdate_web/templates/nsupdate_web_nginx_ubuntu_16
@@ -0,0 +1,8 @@
+server {
+    listen 80;
+
+    location = /update {
+        include proxy_params;
+        proxy_pass http://localhost:{{ nsupdate_web_port }};
+    }
+}
diff --git a/roles/nsupdate_web/vars/opensuse_leap_15.yml b/roles/nsupdate_web/vars/opensuse_leap_15.yml
index 9268a574..2de26aa3 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 d74459f0..d4761cdb 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"