mirror of
https://github.com/GeekOops/geekoops-nginx.git
synced 2024-05-20 05:32:22 +00:00
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.
This commit is contained in:
parent
e8c580e72e
commit
e9045aa96d
GPG key ID:
31860289A704FB3C
|
|
@ -1,6 +1,8 @@
|
||||||
---
|
---
|
||||||
galaxy_info:
|
galaxy_info:
|
||||||
author: Felix Niederwanger
|
author: Felix Niederwanger
|
||||||
|
role_name: nginx
|
||||||
|
namespace: geekoops
|
||||||
description: Configurable nginx setup role
|
description: Configurable nginx setup role
|
||||||
company: SUSE
|
company: SUSE
|
||||||
issue_tracker_url: https://github.com/GeekOops/geekoops-nginx/issues
|
issue_tracker_url: https://github.com/GeekOops/geekoops-nginx/issues
|
||||||
|
|
@ -9,16 +11,14 @@ galaxy_info:
|
||||||
|
|
||||||
min_ansible_version: 2.9
|
min_ansible_version: 2.9
|
||||||
|
|
||||||
# To view available platforms and versions (or releases), visit:
|
|
||||||
# https://galaxy.ansible.com/api/v1/platforms/
|
|
||||||
#
|
|
||||||
platforms:
|
platforms:
|
||||||
- name: opensuse
|
- name: opensuse
|
||||||
versions:
|
versions:
|
||||||
- 15.2
|
- 15.3
|
||||||
|
- 15.4
|
||||||
- name: debian
|
- name: debian
|
||||||
versions:
|
versions:
|
||||||
- buster
|
- bullseye
|
||||||
|
|
||||||
galaxy_tags:
|
galaxy_tags:
|
||||||
- nginx
|
- nginx
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@
|
||||||
content: |
|
content: |
|
||||||
<html>Success! The test page is displayed correctly</html>
|
<html>Success! The test page is displayed correctly</html>
|
||||||
dest: "{{www_dir}}/index.html"
|
dest: "{{www_dir}}/index.html"
|
||||||
group: "{{nginxuser}}"
|
group: "{{ nginx_user }}"
|
||||||
owner: "{{nginxgroup}}"
|
owner: "{{ nginx_group }}"
|
||||||
mode: 0754
|
mode: 0754
|
||||||
register: deployed
|
register: deployed
|
||||||
- name: Deploy nginx configuration
|
- name: Deploy nginx configuration
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,11 @@ dependency:
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: docker
|
||||||
platforms:
|
platforms:
|
||||||
- name: leap15_2
|
- name: leap
|
||||||
image: grisu48/leap-ansible
|
image: registry.opensuse.org/home/ph03nix/containers/containers/leap:ansible-leap
|
||||||
pre_build_image: true
|
pre_build_image: true
|
||||||
|
command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
|
||||||
|
privileged: true
|
||||||
volumes:
|
volumes:
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
capabilities:
|
capabilities:
|
||||||
|
|
@ -14,14 +16,15 @@ platforms:
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /run
|
- /run
|
||||||
- /tmp
|
- /tmp
|
||||||
- name: buster
|
- name: bullseye
|
||||||
image: grisu48/buster-ansible
|
image: grisu48/bullseye-ansible
|
||||||
pre_build_image: true
|
pre_build_image: true
|
||||||
|
command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
|
||||||
|
privileged: true
|
||||||
volumes:
|
volumes:
|
||||||
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
- /sys/fs/cgroup:/sys/fs/cgroup:ro
|
||||||
capabilities:
|
capabilities:
|
||||||
- SYS_ADMIN
|
- SYS_ADMIN
|
||||||
privileged: true
|
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /run
|
- /run
|
||||||
- /tmp
|
- /tmp
|
||||||
|
|
@ -29,15 +32,11 @@ provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
inventory:
|
inventory:
|
||||||
host_vars:
|
host_vars:
|
||||||
leap15_2:
|
leap:
|
||||||
vhosts_dir: "/etc/nginx/vhosts.d"
|
vhosts_dir: "/etc/nginx/vhosts.d"
|
||||||
nginxuser: nginx
|
|
||||||
nginxgroup: nginx
|
|
||||||
deploy_nginx_config: true
|
deploy_nginx_config: true
|
||||||
buster:
|
bullseye:
|
||||||
vhosts_dir: "/etc/nginx/sites-enabled"
|
vhosts_dir: "/etc/nginx/sites-enabled"
|
||||||
nginxuser: www-data
|
|
||||||
nginxgroup: www-data
|
|
||||||
deploy_nginx_config: false
|
deploy_nginx_config: false
|
||||||
verifier:
|
verifier:
|
||||||
name: testinfra
|
name: testinfra
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
tags: ['nginx']
|
tags: ['nginx']
|
||||||
- name: Ensure default page exists
|
- name: Ensure default page exists
|
||||||
template:
|
template:
|
||||||
src: index.html.j2
|
src: index.j2
|
||||||
dest: "{{www_dir}}/default/index.html"
|
dest: "{{www_dir}}/default/index.html"
|
||||||
owner: "{{nginx_user}}"
|
owner: "{{nginx_user}}"
|
||||||
group: "{{nginx_group}}"
|
group: "{{nginx_group}}"
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@
|
||||||
include_vars: "{{ansible_distribution}}_{{ansible_distribution_version}}.yml"
|
include_vars: "{{ansible_distribution}}_{{ansible_distribution_version}}.yml"
|
||||||
tags: ['nginx', 'firewall', 'systemd']
|
tags: ['nginx', 'firewall', 'systemd']
|
||||||
|
|
||||||
- include: software.yml
|
- include_tasks: software.yml
|
||||||
- include: firewall.yml
|
- include_tasks: firewall.yml
|
||||||
when: config_firewall == true
|
when: config_firewall == true
|
||||||
- include: default-page.yml
|
- include_tasks: default-page.yml
|
||||||
when: setup_default_page == true
|
when: setup_default_page == true
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
## Default page handling for nginx
|
## Default page for nginx
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
@ -12,11 +12,5 @@ server {
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ =404;
|
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,5 +11,5 @@ nginx_service: "nginx"
|
||||||
www_dir: "/var/www/html"
|
www_dir: "/var/www/html"
|
||||||
vhosts_dir: "/etc/nginx/sites-enabled"
|
vhosts_dir: "/etc/nginx/sites-enabled"
|
||||||
|
|
||||||
nginx_user: "nginx"
|
nginx_user: "www-data"
|
||||||
nginx_group: "nginx"
|
nginx_group: "www-data"
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
# openSUSE Leap 15.2 specific variables
|
# openSUSE Leap 15.3 specific variables
|
||||||
|
|
||||||
## Software packages
|
## Software packages
|
||||||
|
|
||||||
|
|
@ -8,7 +8,7 @@ nginx_service: "nginx"
|
||||||
|
|
||||||
## OS-Specific directories
|
## OS-Specific directories
|
||||||
|
|
||||||
www_dir: "/srv/www/htdocs"
|
www_dir: "/srv/www/"
|
||||||
vhosts_dir: "/etc/nginx/vhosts.d"
|
vhosts_dir: "/etc/nginx/vhosts.d"
|
||||||
nginx_user: "nginx"
|
nginx_user: "nginx"
|
||||||
nginx_group: "nginx"
|
nginx_group: "nginx"
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
---
|
---
|
||||||
# openSUSE Leap 15.2 specific variables
|
# openSUSE Leap 15.4 specific variables
|
||||||
|
|
||||||
## Software packages
|
## Software packages
|
||||||
|
|
||||||
packages: ['nginx', 'nginx-module-brotli']
|
packages: ['nginx']
|
||||||
nginx_service: "nginx"
|
nginx_service: "nginx"
|
||||||
|
|
||||||
## OS-Specific directories
|
## OS-Specific directories
|
||||||
|
|
||||||
www_dir: "/srv/www/htdocs"
|
www_dir: "/srv/www/"
|
||||||
vhosts_dir: "/etc/nginx/vhosts.d"
|
vhosts_dir: "/etc/nginx/vhosts.d"
|
||||||
nginx_user: "nginx"
|
nginx_user: "nginx"
|
||||||
nginx_group: "nginx"
|
nginx_group: "nginx"
|
||||||
Loading…
Reference in a new issue