From e9045aa96da81d1d68544d08877a11244b672b54 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 27 Jun 2022 09:57:17 +0200 Subject: [PATCH] Revive the role This commit revives the role after a long slumber. I've updated the Leap and Debian versions and fixes some minor issues that occured while testing. --- meta/main.yml | 10 ++++----- molecule/default/converge.yml | 4 ++-- molecule/default/molecule.yml | 21 +++++++++---------- tasks/default-page.yml | 2 +- tasks/main.yml | 6 +++--- templates/default-www.j2 | 10 ++------- templates/{index.html.j2 => index.j2} | 0 vars/{Debian_10.yml => Debian_11.yml} | 4 ++-- vars/openSUSE Leap_15.3.yml | 4 ++-- ...E Leap_15.2.yml => openSUSE Leap_15.4.yml} | 6 +++--- 10 files changed, 30 insertions(+), 37 deletions(-) rename templates/{index.html.j2 => index.j2} (100%) rename vars/{Debian_10.yml => Debian_11.yml} (81%) rename vars/{openSUSE Leap_15.2.yml => openSUSE Leap_15.4.yml} (58%) diff --git a/meta/main.yml b/meta/main.yml index a9059d3..e8d1ea3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,8 @@ --- galaxy_info: author: Felix Niederwanger + role_name: nginx + namespace: geekoops description: Configurable nginx setup role company: SUSE issue_tracker_url: https://github.com/GeekOops/geekoops-nginx/issues @@ -9,16 +11,14 @@ galaxy_info: min_ansible_version: 2.9 - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # platforms: - name: opensuse versions: - - 15.2 + - 15.3 + - 15.4 - name: debian versions: - - buster + - bullseye galaxy_tags: - nginx diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 93cebac..915baba 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -12,8 +12,8 @@ content: | Success! The test page is displayed correctly dest: "{{www_dir}}/index.html" - group: "{{nginxuser}}" - owner: "{{nginxgroup}}" + group: "{{ nginx_user }}" + owner: "{{ nginx_group }}" mode: 0754 register: deployed - name: Deploy nginx configuration diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 9e37220..cf478ce 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -4,9 +4,11 @@ dependency: driver: name: docker platforms: - - name: leap15_2 - image: grisu48/leap-ansible + - name: leap + image: registry.opensuse.org/home/ph03nix/containers/containers/leap:ansible-leap pre_build_image: true + command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"} + privileged: true volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro capabilities: @@ -14,14 +16,15 @@ platforms: tmpfs: - /run - /tmp - - name: buster - image: grisu48/buster-ansible + - name: bullseye + image: grisu48/bullseye-ansible pre_build_image: true + command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"} + privileged: true volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro capabilities: - SYS_ADMIN - privileged: true tmpfs: - /run - /tmp @@ -29,15 +32,11 @@ provisioner: name: ansible inventory: host_vars: - leap15_2: + leap: vhosts_dir: "/etc/nginx/vhosts.d" - nginxuser: nginx - nginxgroup: nginx deploy_nginx_config: true - buster: + bullseye: vhosts_dir: "/etc/nginx/sites-enabled" - nginxuser: www-data - nginxgroup: www-data deploy_nginx_config: false verifier: name: testinfra diff --git a/tasks/default-page.yml b/tasks/default-page.yml index 926ae9b..7f672d5 100644 --- a/tasks/default-page.yml +++ b/tasks/default-page.yml @@ -11,7 +11,7 @@ tags: ['nginx'] - name: Ensure default page exists template: - src: index.html.j2 + src: index.j2 dest: "{{www_dir}}/default/index.html" owner: "{{nginx_user}}" group: "{{nginx_group}}" diff --git a/tasks/main.yml b/tasks/main.yml index a95f849..a00f3ab 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,8 +6,8 @@ include_vars: "{{ansible_distribution}}_{{ansible_distribution_version}}.yml" tags: ['nginx', 'firewall', 'systemd'] -- include: software.yml -- include: firewall.yml +- include_tasks: software.yml +- include_tasks: firewall.yml when: config_firewall == true -- include: default-page.yml +- include_tasks: default-page.yml when: setup_default_page == true diff --git a/templates/default-www.j2 b/templates/default-www.j2 index d3a1226..416ecde 100644 --- a/templates/default-www.j2 +++ b/templates/default-www.j2 @@ -1,4 +1,4 @@ -## Default page handling for nginx +## Default page for nginx server { listen 80; @@ -12,11 +12,5 @@ server { location / { try_files $uri $uri/ =404; } - - location ~ \.php$ { - fastcgi_pass unix:{{php_socket}}; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - } + } diff --git a/templates/index.html.j2 b/templates/index.j2 similarity index 100% rename from templates/index.html.j2 rename to templates/index.j2 diff --git a/vars/Debian_10.yml b/vars/Debian_11.yml similarity index 81% rename from vars/Debian_10.yml rename to vars/Debian_11.yml index 2d7aa85..b517dc5 100644 --- a/vars/Debian_10.yml +++ b/vars/Debian_11.yml @@ -11,5 +11,5 @@ nginx_service: "nginx" www_dir: "/var/www/html" vhosts_dir: "/etc/nginx/sites-enabled" -nginx_user: "nginx" -nginx_group: "nginx" +nginx_user: "www-data" +nginx_group: "www-data" diff --git a/vars/openSUSE Leap_15.3.yml b/vars/openSUSE Leap_15.3.yml index 2bf70fe..14de2d4 100644 --- a/vars/openSUSE Leap_15.3.yml +++ b/vars/openSUSE Leap_15.3.yml @@ -1,5 +1,5 @@ --- -# openSUSE Leap 15.2 specific variables +# openSUSE Leap 15.3 specific variables ## Software packages @@ -8,7 +8,7 @@ nginx_service: "nginx" ## OS-Specific directories -www_dir: "/srv/www/htdocs" +www_dir: "/srv/www/" vhosts_dir: "/etc/nginx/vhosts.d" nginx_user: "nginx" nginx_group: "nginx" diff --git a/vars/openSUSE Leap_15.2.yml b/vars/openSUSE Leap_15.4.yml similarity index 58% rename from vars/openSUSE Leap_15.2.yml rename to vars/openSUSE Leap_15.4.yml index 2bf70fe..f566ff3 100644 --- a/vars/openSUSE Leap_15.2.yml +++ b/vars/openSUSE Leap_15.4.yml @@ -1,14 +1,14 @@ --- -# openSUSE Leap 15.2 specific variables +# openSUSE Leap 15.4 specific variables ## Software packages -packages: ['nginx', 'nginx-module-brotli'] +packages: ['nginx'] nginx_service: "nginx" ## OS-Specific directories -www_dir: "/srv/www/htdocs" +www_dir: "/srv/www/" vhosts_dir: "/etc/nginx/vhosts.d" nginx_user: "nginx" nginx_group: "nginx"