From 8161cb335952d414c93501ec5cd74c5db81e5497 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Wed, 6 Mar 2019 18:43:15 +0100 Subject: [PATCH] nsupdate_web: support opensuse leap 42.3 Signed-off-by: Kyr Shatskyy --- roles/nsupdate_web/tasks/main.yml | 10 +++++----- roles/nsupdate_web/vars/opensuse_leap_42.yml | 8 ++++++++ roles/nsupdate_web/vars/ubuntu_16.yml | 3 +++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 roles/nsupdate_web/vars/opensuse_leap_42.yml diff --git a/roles/nsupdate_web/tasks/main.yml b/roles/nsupdate_web/tasks/main.yml index 6fabefa3..33d6a61f 100644 --- a/roles/nsupdate_web/tasks/main.yml +++ b/roles/nsupdate_web/tasks/main.yml @@ -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 @@ -64,20 +64,20 @@ - 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 index 00000000..9268a574 --- /dev/null +++ b/roles/nsupdate_web/vars/opensuse_leap_42.yml @@ -0,0 +1,8 @@ +packages: + - git + - python3 + - python3-virtualenv + - bind-utils + - nginx +nginx_available: "/etc/nginx" +nginx_enabled: "/etc/nginx/vhosts.d" diff --git a/roles/nsupdate_web/vars/ubuntu_16.yml b/roles/nsupdate_web/vars/ubuntu_16.yml index efe100f5..d74459f0 100644 --- a/roles/nsupdate_web/vars/ubuntu_16.yml +++ b/roles/nsupdate_web/vars/ubuntu_16.yml @@ -4,3 +4,6 @@ packages: - virtualenv - dnsutils - nginx + +nginx_available: "/etc/nginx/sites-available" +nginx_enabled: "/etc/nginx/sites-enabled" -- 2.47.3