]> git.apps.os.sepia.ceph.com Git - ceph-cm-ansible.git/commitdiff
nsupdate_web: support opensuse leap 42.3
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Wed, 6 Mar 2019 17:43:15 +0000 (18:43 +0100)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Wed, 6 Mar 2019 17:48:50 +0000 (18:48 +0100)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
roles/nsupdate_web/tasks/main.yml
roles/nsupdate_web/vars/opensuse_leap_42.yml [new file with mode: 0644]
roles/nsupdate_web/vars/ubuntu_16.yml

index 6fabefa30055cab8ddbafd12930faeeeb6436a14..33d6a61f21f00896b4001e5a1c5e27e39a26c49e 100644 (file)
@@ -6,7 +6,7 @@
 - name: Including major version specific variables.
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution | lower | replace(' ', '_') }}_{{ ansible_distribution_major_version }}.yml"
     - empty.yml
 
 - name: Install packages
 - name: Ship nginx configuration
   template:
     src: nsupdate_web_nginx
-    dest: "/etc/nginx/sites-available/nsupdate_web"
+    dest: "{{ nginx_available }}/nsupdate_web"
     owner: root
     group: root
     mode: 0644
 
 - name: Disable default nginx configuration
   file:
-    path: "/etc/nginx/sites-enabled/default"
+    path: "{{ nginx_enabled }}/default"
     state: absent
 
 - name: Enable our nginx configuration
   file:
-    src: "/etc/nginx/sites-available/nsupdate_web"
-    dest: "/etc/nginx/sites-enabled/nsupdate_web"
+    src: "{{ nginx_available }}/nsupdate_web"
+    dest: "{{ nginx_enabled }}/nsupdate_web"
     state: link
 
 - name: Enable and restart nginx
diff --git a/roles/nsupdate_web/vars/opensuse_leap_42.yml b/roles/nsupdate_web/vars/opensuse_leap_42.yml
new file mode 100644 (file)
index 0000000..9268a57
--- /dev/null
@@ -0,0 +1,8 @@
+packages:
+  - git
+  - python3
+  - python3-virtualenv
+  - bind-utils
+  - nginx
+nginx_available: "/etc/nginx"
+nginx_enabled: "/etc/nginx/vhosts.d"
index efe100f59f34454bdc2910c8c839077b1a36464c..d74459f00529eedaaedcd8d7433ba139fb60ff08 100644 (file)
@@ -4,3 +4,6 @@ packages:
   - virtualenv
   - dnsutils
   - nginx
+
+nginx_available: "/etc/nginx/sites-available"
+nginx_enabled: "/etc/nginx/sites-enabled"