diff --git a/README.md b/README.md index fa912853..df5efe5a 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,12 @@ This software allows to setup the docker following applications: This software shipts the following tools which are natively setup on the server: - [Backups Cleanup](./roles/backups-cleanup-timer/README.md) - Cleans up old backups -- [Btrfs Health Check](./roles/native-btrfs-health-check/README.md) - Checks the health of Btrfs file systems -- [Docker Health Check](./roles/native-docker-health-check/) - Checks the health of docker containers -- [Docker Reverse Proxy](./roles/native-docker-reverse-proxy/README.md) - Docker Reverse Proxy Solution -- [Docker Volume Backup](./roles/native-docker-volume-backup/) - Backup Solution for Docker Volumes -- [Pull Primary Backups](./roles/native-backups-consumer/README.md) - Pulls the backups from another server and stores them -- [Wireguard](./roles/native-wireguard/README.md) - Integrates the server in an wireguard vpn +- [Btrfs Health Check](./roles/btrfs-health-check/README.md) - Checks the health of Btrfs file systems +- [Docker Health Check](./roles/docker-health-check/) - Checks the health of docker containers +- [Docker Reverse Proxy](./roles/docker-reverse-proxy/README.md) - Docker Reverse Proxy Solution +- [Docker Volume Backup](./roles/docker-volume-backup/) - Backup Solution for Docker Volumes +- [Pull Primary Backups](./roles/backups-consumer/README.md) - Pulls the backups from another server and stores them +- [Wireguard](./roles/wireguard/README.md) - Integrates the server in an wireguard vpn ### Server Administration diff --git a/playbook.yml b/playbook.yml index 06fdd66d..d552e4e2 100644 --- a/playbook.yml +++ b/playbook.yml @@ -10,10 +10,10 @@ become: true roles: - system-security - - native-journalctl - - native-disc-space-check - - native-free-disc-space - - native-btrfs-health-check + - journalctl + - disc-space-check + - free-disc-space + - btrfs-health-check # Wireguard Rollen - name: setup standard wireguard @@ -39,14 +39,14 @@ hosts: homepage become: true roles: - - role: native-homepage + - role: homepage vars: domain: "{{top_domain}}" - name: setup redirect hosts hosts: redirect become: true roles: - - role: native-https-redirect + - role: https-redirect vars: domain_mappings: "{{redirect_domain_mappings}}" @@ -196,7 +196,7 @@ hosts: replica_backup become: true roles: - - role: native-backups-consumer + - role: backups-consumer ## PC services - name: general host setup diff --git a/roles/backups-cleanup-service/meta/main.yml b/roles/backups-cleanup-service/meta/main.yml index 646774f9..9bc75d41 100644 --- a/roles/backups-cleanup-service/meta/main.yml +++ b/roles/backups-cleanup-service/meta/main.yml @@ -1,3 +1,3 @@ dependencies: - - native-python-pip + - python-pip - systemd_notifier diff --git a/roles/native-backups-consumer/README.md b/roles/backups-consumer/README.md similarity index 96% rename from roles/native-backups-consumer/README.md rename to roles/backups-consumer/README.md index c49711bd..64a33cfb 100644 --- a/roles/native-backups-consumer/README.md +++ b/roles/backups-consumer/README.md @@ -1,4 +1,4 @@ -# role native-backups-consumer +# role backups-consumer ## goal This script allows to pull backups from a remote server. diff --git a/roles/native-backups-consumer/files/pull-remote-backup.sh b/roles/backups-consumer/files/pull-remote-backup.sh similarity index 100% rename from roles/native-backups-consumer/files/pull-remote-backup.sh rename to roles/backups-consumer/files/pull-remote-backup.sh diff --git a/roles/native-backups-consumer/handlers/main.yml b/roles/backups-consumer/handlers/main.yml similarity index 100% rename from roles/native-backups-consumer/handlers/main.yml rename to roles/backups-consumer/handlers/main.yml diff --git a/roles/native-backups-consumer/meta/main.yml b/roles/backups-consumer/meta/main.yml similarity index 80% rename from roles/native-backups-consumer/meta/main.yml rename to roles/backups-consumer/meta/main.yml index 08361544..d92407dc 100644 --- a/roles/native-backups-consumer/meta/main.yml +++ b/roles/backups-consumer/meta/main.yml @@ -1,4 +1,4 @@ dependencies: - - native-git + - git - systemd_notifier - backups-cleanup-timer diff --git a/roles/native-backups-consumer/tasks/main.yml b/roles/backups-consumer/tasks/main.yml similarity index 100% rename from roles/native-backups-consumer/tasks/main.yml rename to roles/backups-consumer/tasks/main.yml diff --git a/roles/native-backups-consumer/templates/pull-remote-backups.service.j2 b/roles/backups-consumer/templates/pull-remote-backups.service.j2 similarity index 100% rename from roles/native-backups-consumer/templates/pull-remote-backups.service.j2 rename to roles/backups-consumer/templates/pull-remote-backups.service.j2 diff --git a/roles/native-backups-consumer/templates/pull-remote-backups.sh.j2 b/roles/backups-consumer/templates/pull-remote-backups.sh.j2 similarity index 100% rename from roles/native-backups-consumer/templates/pull-remote-backups.sh.j2 rename to roles/backups-consumer/templates/pull-remote-backups.sh.j2 diff --git a/roles/native-backups-consumer/templates/pull-remote-backups.timer.j2 b/roles/backups-consumer/templates/pull-remote-backups.timer.j2 similarity index 100% rename from roles/native-backups-consumer/templates/pull-remote-backups.timer.j2 rename to roles/backups-consumer/templates/pull-remote-backups.timer.j2 diff --git a/roles/native-backups-consumer/vars/main.yml b/roles/backups-consumer/vars/main.yml similarity index 100% rename from roles/native-backups-consumer/vars/main.yml rename to roles/backups-consumer/vars/main.yml diff --git a/roles/native-backups-provider-user/files/backup b/roles/backups-provider-user/files/backup similarity index 100% rename from roles/native-backups-provider-user/files/backup rename to roles/backups-provider-user/files/backup diff --git a/roles/native-backups-provider-user/files/ssh-wrapper.sh b/roles/backups-provider-user/files/ssh-wrapper.sh similarity index 100% rename from roles/native-backups-provider-user/files/ssh-wrapper.sh rename to roles/backups-provider-user/files/ssh-wrapper.sh diff --git a/roles/native-backups-provider-user/meta/main.yml b/roles/backups-provider-user/meta/main.yml similarity index 50% rename from roles/native-backups-provider-user/meta/main.yml rename to roles/backups-provider-user/meta/main.yml index 94856f23..51d4db8f 100644 --- a/roles/native-backups-provider-user/meta/main.yml +++ b/roles/backups-provider-user/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-sshd +- sshd diff --git a/roles/native-backups-provider-user/readme.md b/roles/backups-provider-user/readme.md similarity index 95% rename from roles/native-backups-provider-user/readme.md rename to roles/backups-provider-user/readme.md index 4b5509e9..c9dc289e 100644 --- a/roles/native-backups-provider-user/readme.md +++ b/roles/backups-provider-user/readme.md @@ -1,4 +1,4 @@ -# role native-backups-provider-user +# role backups-provider-user User for backups ## todo diff --git a/roles/native-backups-provider-user/tasks/main.yml b/roles/backups-provider-user/tasks/main.yml similarity index 100% rename from roles/native-backups-provider-user/tasks/main.yml rename to roles/backups-provider-user/tasks/main.yml diff --git a/roles/native-backups-provider-user/templates/authorized_keys.j2 b/roles/backups-provider-user/templates/authorized_keys.j2 similarity index 100% rename from roles/native-backups-provider-user/templates/authorized_keys.j2 rename to roles/backups-provider-user/templates/authorized_keys.j2 diff --git a/roles/native-backups-provider-user/vars/main.yml b/roles/backups-provider-user/vars/main.yml similarity index 100% rename from roles/native-backups-provider-user/vars/main.yml rename to roles/backups-provider-user/vars/main.yml diff --git a/roles/native-backups-provider/README.md b/roles/backups-provider/README.md similarity index 92% rename from roles/native-backups-provider/README.md rename to roles/backups-provider/README.md index cec89ca4..f7d6d94b 100644 --- a/roles/native-backups-provider/README.md +++ b/roles/backups-provider/README.md @@ -1,4 +1,4 @@ -# role native-backups-provider-host +# role backups-provider-host ## todo - add full system backup diff --git a/roles/native-backups-provider/meta/main.yml b/roles/backups-provider/meta/main.yml similarity index 55% rename from roles/native-backups-provider/meta/main.yml rename to roles/backups-provider/meta/main.yml index 6eead035..42922c94 100644 --- a/roles/native-backups-provider/meta/main.yml +++ b/roles/backups-provider/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-backups-provider-user +- backups-provider-user - backups-cleanup-timer diff --git a/roles/native-btrfs-health-check/README.md b/roles/btrfs-health-check/README.md similarity index 100% rename from roles/native-btrfs-health-check/README.md rename to roles/btrfs-health-check/README.md diff --git a/roles/native-btrfs-health-check/files/btrfs-health-check.sh b/roles/btrfs-health-check/files/btrfs-health-check.sh similarity index 100% rename from roles/native-btrfs-health-check/files/btrfs-health-check.sh rename to roles/btrfs-health-check/files/btrfs-health-check.sh diff --git a/roles/native-btrfs-health-check/handlers/main.yml b/roles/btrfs-health-check/handlers/main.yml similarity index 100% rename from roles/native-btrfs-health-check/handlers/main.yml rename to roles/btrfs-health-check/handlers/main.yml diff --git a/roles/native-btrfs-health-check/meta/main.yml b/roles/btrfs-health-check/meta/main.yml similarity index 100% rename from roles/native-btrfs-health-check/meta/main.yml rename to roles/btrfs-health-check/meta/main.yml diff --git a/roles/native-btrfs-health-check/tasks/main.yml b/roles/btrfs-health-check/tasks/main.yml similarity index 100% rename from roles/native-btrfs-health-check/tasks/main.yml rename to roles/btrfs-health-check/tasks/main.yml diff --git a/roles/native-btrfs-health-check/templates/btrfs-health-check.service.j2 b/roles/btrfs-health-check/templates/btrfs-health-check.service.j2 similarity index 100% rename from roles/native-btrfs-health-check/templates/btrfs-health-check.service.j2 rename to roles/btrfs-health-check/templates/btrfs-health-check.service.j2 diff --git a/roles/native-btrfs-health-check/templates/btrfs-health-check.timer.j2 b/roles/btrfs-health-check/templates/btrfs-health-check.timer.j2 similarity index 100% rename from roles/native-btrfs-health-check/templates/btrfs-health-check.timer.j2 rename to roles/btrfs-health-check/templates/btrfs-health-check.timer.j2 diff --git a/roles/native-btrfs-health-check/vars/main.yml b/roles/btrfs-health-check/vars/main.yml similarity index 100% rename from roles/native-btrfs-health-check/vars/main.yml rename to roles/btrfs-health-check/vars/main.yml diff --git a/roles/native-certbot-nginx/handlers/main.yml b/roles/certbot-nginx/handlers/main.yml similarity index 100% rename from roles/native-certbot-nginx/handlers/main.yml rename to roles/certbot-nginx/handlers/main.yml diff --git a/roles/native-certbot-nginx/meta/main.yml b/roles/certbot-nginx/meta/main.yml similarity index 68% rename from roles/native-certbot-nginx/meta/main.yml rename to roles/certbot-nginx/meta/main.yml index 2fc7d0bb..e7b10f1e 100644 --- a/roles/native-certbot-nginx/meta/main.yml +++ b/roles/certbot-nginx/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-nginx +- nginx - systemd_notifier diff --git a/roles/native-certbot-nginx/tasks/main.yml b/roles/certbot-nginx/tasks/main.yml similarity index 100% rename from roles/native-certbot-nginx/tasks/main.yml rename to roles/certbot-nginx/tasks/main.yml diff --git a/roles/native-certbot-nginx/templates/certbot.service.j2 b/roles/certbot-nginx/templates/certbot.service.j2 similarity index 100% rename from roles/native-certbot-nginx/templates/certbot.service.j2 rename to roles/certbot-nginx/templates/certbot.service.j2 diff --git a/roles/native-certbot-nginx/templates/certbot.timer.j2 b/roles/certbot-nginx/templates/certbot.timer.j2 similarity index 100% rename from roles/native-certbot-nginx/templates/certbot.timer.j2 rename to roles/certbot-nginx/templates/certbot.timer.j2 diff --git a/roles/native-disc-space-check/README.md b/roles/disc-space-check/README.md similarity index 100% rename from roles/native-disc-space-check/README.md rename to roles/disc-space-check/README.md diff --git a/roles/native-disc-space-check/files/disc-space-check.sh b/roles/disc-space-check/files/disc-space-check.sh similarity index 100% rename from roles/native-disc-space-check/files/disc-space-check.sh rename to roles/disc-space-check/files/disc-space-check.sh diff --git a/roles/native-disc-space-check/handlers/main.yml b/roles/disc-space-check/handlers/main.yml similarity index 100% rename from roles/native-disc-space-check/handlers/main.yml rename to roles/disc-space-check/handlers/main.yml diff --git a/roles/native-disc-space-check/meta/main.yml b/roles/disc-space-check/meta/main.yml similarity index 100% rename from roles/native-disc-space-check/meta/main.yml rename to roles/disc-space-check/meta/main.yml diff --git a/roles/native-disc-space-check/tasks/main.yml b/roles/disc-space-check/tasks/main.yml similarity index 100% rename from roles/native-disc-space-check/tasks/main.yml rename to roles/disc-space-check/tasks/main.yml diff --git a/roles/native-disc-space-check/templates/disc-space-check.service.j2 b/roles/disc-space-check/templates/disc-space-check.service.j2 similarity index 100% rename from roles/native-disc-space-check/templates/disc-space-check.service.j2 rename to roles/disc-space-check/templates/disc-space-check.service.j2 diff --git a/roles/native-disc-space-check/templates/disc-space-check.timer.j2 b/roles/disc-space-check/templates/disc-space-check.timer.j2 similarity index 100% rename from roles/native-disc-space-check/templates/disc-space-check.timer.j2 rename to roles/disc-space-check/templates/disc-space-check.timer.j2 diff --git a/roles/native-disc-space-check/vars/main.yml b/roles/disc-space-check/vars/main.yml similarity index 100% rename from roles/native-disc-space-check/vars/main.yml rename to roles/disc-space-check/vars/main.yml diff --git a/roles/docker-akaunting/meta/main.yml b/roles/docker-akaunting/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-akaunting/meta/main.yml +++ b/roles/docker-akaunting/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-akaunting/tasks/main.yml b/roles/docker-akaunting/tasks/main.yml index bed781f6..7881fc9f 100644 --- a/roles/docker-akaunting/tasks/main.yml +++ b/roles/docker-akaunting/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: register directory diff --git a/roles/docker-attendize/meta/main.yml b/roles/docker-attendize/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-attendize/meta/main.yml +++ b/roles/docker-attendize/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-attendize/tasks/main.yml b/roles/docker-attendize/tasks/main.yml index 8d6320c6..7b00cfa0 100644 --- a/roles/docker-attendize/tasks/main.yml +++ b/roles/docker-attendize/tasks/main.yml @@ -7,13 +7,13 @@ - name: configure {{domain}}.conf template: - src: roles/native-docker-reverse-proxy/templates/domain.conf.j2 + src: roles/docker-reverse-proxy/templates/domain.conf.j2 dest: /etc/nginx/conf.d/{{domain}}.conf notify: restart nginx #- name: configure {{ mail_interface_domain }}.conf # template: -# src: roles/native-docker-reverse-proxy/templates/domain.conf.j2 +# src: roles/docker-reverse-proxy/templates/domain.conf.j2 # dest: /etc/nginx/conf.d/{{ mail_interface_domain }}.conf # vars: # http_port: "{{ mail_interface_http_port }}" diff --git a/roles/docker-bigbluebutton/meta/main.yml b/roles/docker-bigbluebutton/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-bigbluebutton/meta/main.yml +++ b/roles/docker-bigbluebutton/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/native-docker-compose-restart-unhealthy/README.md b/roles/docker-compose-restart-unhealthy/README.md similarity index 61% rename from roles/native-docker-compose-restart-unhealthy/README.md rename to roles/docker-compose-restart-unhealthy/README.md index 8bf0d0fe..246761fa 100644 --- a/roles/native-docker-compose-restart-unhealthy/README.md +++ b/roles/docker-compose-restart-unhealthy/README.md @@ -1,2 +1,2 @@ -# native-docker-compose-restart-unhealthy +# docker-compose-restart-unhealthy docker-compose restart for containers which are unhealty or excited \ No newline at end of file diff --git a/roles/native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py b/roles/docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py similarity index 100% rename from roles/native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py rename to roles/docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py diff --git a/roles/native-docker-compose-restart-unhealthy/handlers/main.yml b/roles/docker-compose-restart-unhealthy/handlers/main.yml similarity index 100% rename from roles/native-docker-compose-restart-unhealthy/handlers/main.yml rename to roles/docker-compose-restart-unhealthy/handlers/main.yml diff --git a/roles/native-docker-compose-restart-unhealthy/tasks/main.yml b/roles/docker-compose-restart-unhealthy/tasks/main.yml similarity index 100% rename from roles/native-docker-compose-restart-unhealthy/tasks/main.yml rename to roles/docker-compose-restart-unhealthy/tasks/main.yml diff --git a/roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 b/roles/docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 similarity index 100% rename from roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 rename to roles/docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 diff --git a/roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 b/roles/docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 similarity index 100% rename from roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 rename to roles/docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 diff --git a/roles/native-docker-compose-restart-unhealthy/vars/main.yml b/roles/docker-compose-restart-unhealthy/vars/main.yml similarity index 100% rename from roles/native-docker-compose-restart-unhealthy/vars/main.yml rename to roles/docker-compose-restart-unhealthy/vars/main.yml diff --git a/roles/docker-elk/meta/main.yml b/roles/docker-elk/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-elk/meta/main.yml +++ b/roles/docker-elk/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-elk/tasks/main.yml b/roles/docker-elk/tasks/main.yml index f558f484..c965fbd5 100644 --- a/roles/docker-elk/tasks/main.yml +++ b/roles/docker-elk/tasks/main.yml @@ -4,7 +4,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: create elasticsearch-sysctl.conf diff --git a/roles/docker-funkwhale/meta/main.yml b/roles/docker-funkwhale/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-funkwhale/meta/main.yml +++ b/roles/docker-funkwhale/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-funkwhale/tasks/main.yml b/roles/docker-funkwhale/tasks/main.yml index 8df826a8..fbc08e90 100644 --- a/roles/docker-funkwhale/tasks/main.yml +++ b/roles/docker-funkwhale/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" diff --git a/roles/docker-gitea/meta/main.yml b/roles/docker-gitea/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-gitea/meta/main.yml +++ b/roles/docker-gitea/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-gitea/tasks/main.yml b/roles/docker-gitea/tasks/main.yml index 1afba247..71d1210b 100644 --- a/roles/docker-gitea/tasks/main.yml +++ b/roles/docker-gitea/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}} https - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{path_docker_compose_folder}}" diff --git a/roles/native-docker-health-check/files/docker-health-check.sh b/roles/docker-health-check/files/docker-health-check.sh similarity index 100% rename from roles/native-docker-health-check/files/docker-health-check.sh rename to roles/docker-health-check/files/docker-health-check.sh diff --git a/roles/native-docker-health-check/handlers/main.yml b/roles/docker-health-check/handlers/main.yml similarity index 100% rename from roles/native-docker-health-check/handlers/main.yml rename to roles/docker-health-check/handlers/main.yml diff --git a/roles/native-docker-health-check/meta/main.yml b/roles/docker-health-check/meta/main.yml similarity index 100% rename from roles/native-docker-health-check/meta/main.yml rename to roles/docker-health-check/meta/main.yml diff --git a/roles/native-docker-health-check/tasks/main.yml b/roles/docker-health-check/tasks/main.yml similarity index 100% rename from roles/native-docker-health-check/tasks/main.yml rename to roles/docker-health-check/tasks/main.yml diff --git a/roles/native-docker-health-check/templates/docker-health-check.service.j2 b/roles/docker-health-check/templates/docker-health-check.service.j2 similarity index 100% rename from roles/native-docker-health-check/templates/docker-health-check.service.j2 rename to roles/docker-health-check/templates/docker-health-check.service.j2 diff --git a/roles/native-docker-health-check/templates/docker-health-check.timer.j2 b/roles/docker-health-check/templates/docker-health-check.timer.j2 similarity index 100% rename from roles/native-docker-health-check/templates/docker-health-check.timer.j2 rename to roles/docker-health-check/templates/docker-health-check.timer.j2 diff --git a/roles/native-docker-health-check/vars/main.yml b/roles/docker-health-check/vars/main.yml similarity index 100% rename from roles/native-docker-health-check/vars/main.yml rename to roles/docker-health-check/vars/main.yml diff --git a/roles/docker-jenkins/meta/main.yml b/roles/docker-jenkins/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-jenkins/meta/main.yml +++ b/roles/docker-jenkins/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/docker-jenkins/tasks/main.yml index 8d614581..bcc2435c 100644 --- a/roles/docker-jenkins/tasks/main.yml +++ b/roles/docker-jenkins/tasks/main.yml @@ -2,7 +2,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "docker jenkins" diff --git a/roles/docker-joomla/meta/main.yml b/roles/docker-joomla/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-joomla/meta/main.yml +++ b/roles/docker-joomla/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml index fc262c3c..c77cc4a7 100644 --- a/roles/docker-joomla/tasks/main.yml +++ b/roles/docker-joomla/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{path_docker_compose_folder}}" diff --git a/roles/docker-mailu/meta/main.yml b/roles/docker-mailu/meta/main.yml index 61a06add..c9901d26 100644 --- a/roles/docker-mailu/meta/main.yml +++ b/roles/docker-mailu/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy - systemd_notifier diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index 73b31049..0a983e7d 100644 --- a/roles/docker-mailu/tasks/main.yml +++ b/roles/docker-mailu/tasks/main.yml @@ -6,7 +6,7 @@ - name: configure {{domain}}.conf vars: client_max_body_size: "31M" - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{path_docker_compose_files}}mailu" diff --git a/roles/docker-mastodon/meta/main.yml b/roles/docker-mastodon/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-mastodon/meta/main.yml +++ b/roles/docker-mastodon/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-mastodon/templates/mastodon.conf.j2 b/roles/docker-mastodon/templates/mastodon.conf.j2 index 2c043346..6e688bb6 100644 --- a/roles/docker-mastodon/templates/mastodon.conf.j2 +++ b/roles/docker-mastodon/templates/mastodon.conf.j2 @@ -6,7 +6,7 @@ map $http_upgrade $connection_upgrade { server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/letsencrypt/templates/ssl_header.j2' %} keepalive_timeout 70; sendfile on; @@ -23,7 +23,7 @@ server { add_header Strict-Transport-Security "max-age=31536000"; - {% include 'roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} + {% include 'roles/docker-reverse-proxy/templates/proxy_pass.conf.j2' %} location /api/v1/streaming { proxy_set_header Host $host; diff --git a/roles/docker-mediawiki/meta/main.yml b/roles/docker-mediawiki/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-mediawiki/meta/main.yml +++ b/roles/docker-mediawiki/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml index 0d597ddd..77397243 100644 --- a/roles/docker-mediawiki/tasks/main.yml +++ b/roles/docker-mediawiki/tasks/main.yml @@ -2,7 +2,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "docker mediawiki" diff --git a/roles/docker-mybb/meta/main.yml b/roles/docker-mybb/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-mybb/meta/main.yml +++ b/roles/docker-mybb/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-mybb/tasks/main.yml b/roles/docker-mybb/tasks/main.yml index 574a62fa..42a72d2b 100644 --- a/roles/docker-mybb/tasks/main.yml +++ b/roles/docker-mybb/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: create data folder diff --git a/roles/docker-nextcloud/meta/main.yml b/roles/docker-nextcloud/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-nextcloud/meta/main.yml +++ b/roles/docker-nextcloud/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-nextcloud/templates/nextcloud.conf.j2 b/roles/docker-nextcloud/templates/nextcloud.conf.j2 index 5e02aeac..bc707a82 100644 --- a/roles/docker-nextcloud/templates/nextcloud.conf.j2 +++ b/roles/docker-nextcloud/templates/nextcloud.conf.j2 @@ -2,7 +2,7 @@ server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/letsencrypt/templates/ssl_header.j2' %} # Remove X-Powered-By, which is an information leak fastcgi_hide_header X-Powered-By; @@ -12,7 +12,7 @@ server client_body_buffer_size 400M; fastcgi_buffers 64 4K; - {% include 'roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} + {% include 'roles/docker-reverse-proxy/templates/proxy_pass.conf.j2' %} location ^~ /.well-known { rewrite ^/\.well-known/host-meta\.json /public.php?service=host-meta-json last; diff --git a/roles/docker-peertube/meta/main.yml b/roles/docker-peertube/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-peertube/meta/main.yml +++ b/roles/docker-peertube/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-peertube/templates/peertube.conf.j2 b/roles/docker-peertube/templates/peertube.conf.j2 index b1503de8..7337c947 100644 --- a/roles/docker-peertube/templates/peertube.conf.j2 +++ b/roles/docker-peertube/templates/peertube.conf.j2 @@ -6,7 +6,7 @@ upstream backend { server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/letsencrypt/templates/ssl_header.j2' %} ## # Application diff --git a/roles/docker-pixelfed/meta/main.yml b/roles/docker-pixelfed/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-pixelfed/meta/main.yml +++ b/roles/docker-pixelfed/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-pixelfed/tasks/main.yml b/roles/docker-pixelfed/tasks/main.yml index 0fadaba9..aa238ef3 100644 --- a/roles/docker-pixelfed/tasks/main.yml +++ b/roles/docker-pixelfed/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" diff --git a/roles/native-docker-reverse-proxy/README.md b/roles/docker-reverse-proxy/README.md similarity index 96% rename from roles/native-docker-reverse-proxy/README.md rename to roles/docker-reverse-proxy/README.md index ce9f74ae..04c5659c 100644 --- a/roles/native-docker-reverse-proxy/README.md +++ b/roles/docker-reverse-proxy/README.md @@ -1,4 +1,4 @@ -# role native-docker-reverse-proxy +# role docker-reverse-proxy Uses nginx as an [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy) for local docker applications. diff --git a/roles/docker-reverse-proxy/meta/main.yml b/roles/docker-reverse-proxy/meta/main.yml new file mode 100644 index 00000000..5c9a6781 --- /dev/null +++ b/roles/docker-reverse-proxy/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: +- docker +- https-server diff --git a/roles/native-docker-reverse-proxy/templates/domain.conf.j2 b/roles/docker-reverse-proxy/templates/domain.conf.j2 similarity index 73% rename from roles/native-docker-reverse-proxy/templates/domain.conf.j2 rename to roles/docker-reverse-proxy/templates/domain.conf.j2 index 6482acf1..5362189b 100644 --- a/roles/native-docker-reverse-proxy/templates/domain.conf.j2 +++ b/roles/docker-reverse-proxy/templates/domain.conf.j2 @@ -6,7 +6,7 @@ server client_max_body_size {{ client_max_body_size }}; {% endif %} - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/letsencrypt/templates/ssl_header.j2' %} {% include 'proxy_pass.conf.j2' %} diff --git a/roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2 b/roles/docker-reverse-proxy/templates/proxy_pass.conf.j2 similarity index 100% rename from roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2 rename to roles/docker-reverse-proxy/templates/proxy_pass.conf.j2 diff --git a/roles/docker-roulette-wheel/meta/main.yml b/roles/docker-roulette-wheel/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-roulette-wheel/meta/main.yml +++ b/roles/docker-roulette-wheel/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-roulette-wheel/tasks/main.yml b/roles/docker-roulette-wheel/tasks/main.yml index 8829f948..caf118c5 100644 --- a/roles/docker-roulette-wheel/tasks/main.yml +++ b/roles/docker-roulette-wheel/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" diff --git a/roles/native-docker-volume-backup/handlers/main.yml b/roles/docker-volume-backup/handlers/main.yml similarity index 100% rename from roles/native-docker-volume-backup/handlers/main.yml rename to roles/docker-volume-backup/handlers/main.yml diff --git a/roles/docker-volume-backup/meta/main.yml b/roles/docker-volume-backup/meta/main.yml new file mode 100644 index 00000000..b83c5c92 --- /dev/null +++ b/roles/docker-volume-backup/meta/main.yml @@ -0,0 +1,4 @@ +dependencies: + - git + - backups-provider + - systemd_notifier diff --git a/roles/native-docker-volume-backup/tasks/main.yml b/roles/docker-volume-backup/tasks/main.yml similarity index 100% rename from roles/native-docker-volume-backup/tasks/main.yml rename to roles/docker-volume-backup/tasks/main.yml diff --git a/roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2 b/roles/docker-volume-backup/templates/docker-volume-backup.service.j2 similarity index 100% rename from roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2 rename to roles/docker-volume-backup/templates/docker-volume-backup.service.j2 diff --git a/roles/native-docker-volume-backup/templates/docker-volume-backup.timer.j2 b/roles/docker-volume-backup/templates/docker-volume-backup.timer.j2 similarity index 100% rename from roles/native-docker-volume-backup/templates/docker-volume-backup.timer.j2 rename to roles/docker-volume-backup/templates/docker-volume-backup.timer.j2 diff --git a/roles/native-docker-volume-backup/vars/main.yml b/roles/docker-volume-backup/vars/main.yml similarity index 100% rename from roles/native-docker-volume-backup/vars/main.yml rename to roles/docker-volume-backup/vars/main.yml diff --git a/roles/docker-wordpress/meta/main.yml b/roles/docker-wordpress/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-wordpress/meta/main.yml +++ b/roles/docker-wordpress/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-wordpress/tasks/main.yml b/roles/docker-wordpress/tasks/main.yml index d19764fe..2e282b06 100644 --- a/roles/docker-wordpress/tasks/main.yml +++ b/roles/docker-wordpress/tasks/main.yml @@ -7,7 +7,7 @@ vars: client_max_body_size: "2M" domain: "{{item}}" - template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ item }}.conf + template: src=roles/docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ item }}.conf loop: "{{domains}}" notify: restart nginx diff --git a/roles/docker-yourls/meta/main.yml b/roles/docker-yourls/meta/main.yml index fb4d4f7b..f25ef891 100644 --- a/roles/docker-yourls/meta/main.yml +++ b/roles/docker-yourls/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- docker-reverse-proxy diff --git a/roles/docker-yourls/tasks/main.yml b/roles/docker-yourls/tasks/main.yml index a46e5848..e14aefe1 100644 --- a/roles/docker-yourls/tasks/main.yml +++ b/roles/docker-yourls/tasks/main.yml @@ -4,7 +4,7 @@ - name: configure {{domain}}.conf template: - src: "roles/native-docker-reverse-proxy/templates/domain.conf.j2" + src: "roles/docker-reverse-proxy/templates/domain.conf.j2" dest: "/etc/nginx/conf.d/{{domain}}.conf" notify: restart nginx diff --git a/roles/native-docker/Readme.md b/roles/docker/Readme.md similarity index 95% rename from roles/native-docker/Readme.md rename to roles/docker/Readme.md index 332c10b2..ccc94bc0 100644 --- a/roles/native-docker/Readme.md +++ b/roles/docker/Readme.md @@ -1,4 +1,4 @@ -# role native-docker +# role docker ## maintanance diff --git a/roles/native-docker/handlers/main.yml b/roles/docker/handlers/main.yml similarity index 100% rename from roles/native-docker/handlers/main.yml rename to roles/docker/handlers/main.yml diff --git a/roles/docker/meta/main.yml b/roles/docker/meta/main.yml new file mode 100644 index 00000000..fa459e27 --- /dev/null +++ b/roles/docker/meta/main.yml @@ -0,0 +1,5 @@ +dependencies: + - docker-volume-backup + - user-administrator + - docker-health-check + - docker-compose-restart-unhealthy diff --git a/roles/native-docker/tasks/main.yml b/roles/docker/tasks/main.yml similarity index 100% rename from roles/native-docker/tasks/main.yml rename to roles/docker/tasks/main.yml diff --git a/roles/native-free-disc-space/README.md b/roles/free-disc-space/README.md similarity index 100% rename from roles/native-free-disc-space/README.md rename to roles/free-disc-space/README.md diff --git a/roles/native-free-disc-space/handlers/main.yml b/roles/free-disc-space/handlers/main.yml similarity index 100% rename from roles/native-free-disc-space/handlers/main.yml rename to roles/free-disc-space/handlers/main.yml diff --git a/roles/native-free-disc-space/meta/main.yml b/roles/free-disc-space/meta/main.yml similarity index 100% rename from roles/native-free-disc-space/meta/main.yml rename to roles/free-disc-space/meta/main.yml diff --git a/roles/native-free-disc-space/tasks/main.yml b/roles/free-disc-space/tasks/main.yml similarity index 100% rename from roles/native-free-disc-space/tasks/main.yml rename to roles/free-disc-space/tasks/main.yml diff --git a/roles/native-free-disc-space/templates/free-disc-space.service.j2 b/roles/free-disc-space/templates/free-disc-space.service.j2 similarity index 100% rename from roles/native-free-disc-space/templates/free-disc-space.service.j2 rename to roles/free-disc-space/templates/free-disc-space.service.j2 diff --git a/roles/native-free-disc-space/templates/free-disc-space.sh.j2 b/roles/free-disc-space/templates/free-disc-space.sh.j2 similarity index 100% rename from roles/native-free-disc-space/templates/free-disc-space.sh.j2 rename to roles/free-disc-space/templates/free-disc-space.sh.j2 diff --git a/roles/native-free-disc-space/templates/free-disc-space.timer.j2 b/roles/free-disc-space/templates/free-disc-space.timer.j2 similarity index 100% rename from roles/native-free-disc-space/templates/free-disc-space.timer.j2 rename to roles/free-disc-space/templates/free-disc-space.timer.j2 diff --git a/roles/native-free-disc-space/vars/main.yml b/roles/free-disc-space/vars/main.yml similarity index 100% rename from roles/native-free-disc-space/vars/main.yml rename to roles/free-disc-space/vars/main.yml diff --git a/roles/native-git/tasks/main.yml b/roles/git/tasks/main.yml similarity index 100% rename from roles/native-git/tasks/main.yml rename to roles/git/tasks/main.yml diff --git a/roles/homepage/meta/main.yml b/roles/homepage/meta/main.yml new file mode 100644 index 00000000..60e983dc --- /dev/null +++ b/roles/homepage/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: +- https-server +- git diff --git a/roles/native-homepage/tasks/main.yml b/roles/homepage/tasks/main.yml similarity index 100% rename from roles/native-homepage/tasks/main.yml rename to roles/homepage/tasks/main.yml diff --git a/roles/native-homepage/templates/homepage.nginx.conf.j2 b/roles/homepage/templates/homepage.nginx.conf.j2 similarity index 70% rename from roles/native-homepage/templates/homepage.nginx.conf.j2 rename to roles/homepage/templates/homepage.nginx.conf.j2 index ee9fa97c..1646850c 100644 --- a/roles/native-homepage/templates/homepage.nginx.conf.j2 +++ b/roles/homepage/templates/homepage.nginx.conf.j2 @@ -3,7 +3,7 @@ server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/letsencrypt/templates/ssl_header.j2' %} charset utf-8; diff --git a/roles/native-hostname/tasks/main.yml b/roles/hostname/tasks/main.yml similarity index 100% rename from roles/native-hostname/tasks/main.yml rename to roles/hostname/tasks/main.yml diff --git a/roles/https-redirect/meta/main.yml b/roles/https-redirect/meta/main.yml new file mode 100644 index 00000000..f437abff --- /dev/null +++ b/roles/https-redirect/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- https-server diff --git a/roles/native-https-redirect/readme.md b/roles/https-redirect/readme.md similarity index 100% rename from roles/native-https-redirect/readme.md rename to roles/https-redirect/readme.md diff --git a/roles/native-https-redirect/tasks/main.yml b/roles/https-redirect/tasks/main.yml similarity index 100% rename from roles/native-https-redirect/tasks/main.yml rename to roles/https-redirect/tasks/main.yml diff --git a/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 b/roles/https-redirect/templates/redirect.domain.nginx.conf.j2 similarity index 57% rename from roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 rename to roles/https-redirect/templates/redirect.domain.nginx.conf.j2 index 45a234d7..946f7249 100644 --- a/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 +++ b/roles/https-redirect/templates/redirect.domain.nginx.conf.j2 @@ -1,5 +1,5 @@ server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/letsencrypt/templates/ssl_header.j2' %} return 301 https://{{target_domain}}$request_uri; } diff --git a/roles/https-server/meta/main.yml b/roles/https-server/meta/main.yml new file mode 100644 index 00000000..83eb87c5 --- /dev/null +++ b/roles/https-server/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: +- nginx +- letsencrypt diff --git a/roles/native-journalctl-health-check/README.md b/roles/journalctl-health-check/README.md similarity index 100% rename from roles/native-journalctl-health-check/README.md rename to roles/journalctl-health-check/README.md diff --git a/roles/native-journalctl-health-check/files/journalctl-health-check.sh b/roles/journalctl-health-check/files/journalctl-health-check.sh similarity index 100% rename from roles/native-journalctl-health-check/files/journalctl-health-check.sh rename to roles/journalctl-health-check/files/journalctl-health-check.sh diff --git a/roles/native-journalctl-health-check/handlers/main.yml b/roles/journalctl-health-check/handlers/main.yml similarity index 100% rename from roles/native-journalctl-health-check/handlers/main.yml rename to roles/journalctl-health-check/handlers/main.yml diff --git a/roles/native-journalctl-health-check/meta/main.yml b/roles/journalctl-health-check/meta/main.yml similarity index 100% rename from roles/native-journalctl-health-check/meta/main.yml rename to roles/journalctl-health-check/meta/main.yml diff --git a/roles/native-journalctl-health-check/tasks/main.yml b/roles/journalctl-health-check/tasks/main.yml similarity index 100% rename from roles/native-journalctl-health-check/tasks/main.yml rename to roles/journalctl-health-check/tasks/main.yml diff --git a/roles/native-journalctl-health-check/templates/journalctl-health-check.service.j2 b/roles/journalctl-health-check/templates/journalctl-health-check.service.j2 similarity index 100% rename from roles/native-journalctl-health-check/templates/journalctl-health-check.service.j2 rename to roles/journalctl-health-check/templates/journalctl-health-check.service.j2 diff --git a/roles/native-journalctl-health-check/templates/journalctl-health-check.timer.j2 b/roles/journalctl-health-check/templates/journalctl-health-check.timer.j2 similarity index 100% rename from roles/native-journalctl-health-check/templates/journalctl-health-check.timer.j2 rename to roles/journalctl-health-check/templates/journalctl-health-check.timer.j2 diff --git a/roles/native-journalctl-health-check/vars/main.yml b/roles/journalctl-health-check/vars/main.yml similarity index 100% rename from roles/native-journalctl-health-check/vars/main.yml rename to roles/journalctl-health-check/vars/main.yml diff --git a/roles/native-journalctl/README.md b/roles/journalctl/README.md similarity index 66% rename from roles/native-journalctl/README.md rename to roles/journalctl/README.md index cd9cdfcb..fb610db3 100644 --- a/roles/native-journalctl/README.md +++ b/roles/journalctl/README.md @@ -1,4 +1,4 @@ -# role native-journalctl +# role journalctl # live monitoring diff --git a/roles/native-journalctl/handlers/main.yml b/roles/journalctl/handlers/main.yml similarity index 100% rename from roles/native-journalctl/handlers/main.yml rename to roles/journalctl/handlers/main.yml diff --git a/roles/journalctl/meta/main.yml b/roles/journalctl/meta/main.yml new file mode 100644 index 00000000..5156c9b5 --- /dev/null +++ b/roles/journalctl/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - journalctl-health-check diff --git a/roles/native-journalctl/tasks/main.yml b/roles/journalctl/tasks/main.yml similarity index 100% rename from roles/native-journalctl/tasks/main.yml rename to roles/journalctl/tasks/main.yml diff --git a/roles/native-journalctl/templates/journald.conf.j2 b/roles/journalctl/templates/journald.conf.j2 similarity index 100% rename from roles/native-journalctl/templates/journald.conf.j2 rename to roles/journalctl/templates/journald.conf.j2 diff --git a/roles/letsencrypt/meta/main.yml b/roles/letsencrypt/meta/main.yml new file mode 100644 index 00000000..12d1f51a --- /dev/null +++ b/roles/letsencrypt/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- certbot-nginx diff --git a/roles/native-letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml similarity index 100% rename from roles/native-letsencrypt/tasks/main.yml rename to roles/letsencrypt/tasks/main.yml diff --git a/roles/native-letsencrypt/templates/letsencrypt.conf.j2 b/roles/letsencrypt/templates/letsencrypt.conf.j2 similarity index 100% rename from roles/native-letsencrypt/templates/letsencrypt.conf.j2 rename to roles/letsencrypt/templates/letsencrypt.conf.j2 diff --git a/roles/native-letsencrypt/templates/ssl_header.j2 b/roles/letsencrypt/templates/ssl_header.j2 similarity index 100% rename from roles/native-letsencrypt/templates/ssl_header.j2 rename to roles/letsencrypt/templates/ssl_header.j2 diff --git a/roles/native-locales/tasks/main.yml b/roles/locales/tasks/main.yml similarity index 100% rename from roles/native-locales/tasks/main.yml rename to roles/locales/tasks/main.yml diff --git a/roles/native-locales/templates/locale.conf b/roles/locales/templates/locale.conf similarity index 100% rename from roles/native-locales/templates/locale.conf rename to roles/locales/templates/locale.conf diff --git a/roles/native-locales/templates/locale.gen b/roles/locales/templates/locale.gen similarity index 100% rename from roles/native-locales/templates/locale.gen rename to roles/locales/templates/locale.gen diff --git a/roles/native-docker-reverse-proxy/meta/main.yml b/roles/native-docker-reverse-proxy/meta/main.yml deleted file mode 100644 index d33a1cab..00000000 --- a/roles/native-docker-reverse-proxy/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: -- native-docker -- native-https-server diff --git a/roles/native-docker-volume-backup/meta/main.yml b/roles/native-docker-volume-backup/meta/main.yml deleted file mode 100644 index 7c8c8c96..00000000 --- a/roles/native-docker-volume-backup/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: - - native-git - - native-backups-provider - - systemd_notifier diff --git a/roles/native-docker/meta/main.yml b/roles/native-docker/meta/main.yml deleted file mode 100644 index c3028a5e..00000000 --- a/roles/native-docker/meta/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -dependencies: - - native-docker-volume-backup - - user-administrator - - native-docker-health-check - - native-docker-compose-restart-unhealthy diff --git a/roles/native-homepage/meta/main.yml b/roles/native-homepage/meta/main.yml deleted file mode 100644 index de989663..00000000 --- a/roles/native-homepage/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: -- native-https-server -- native-git diff --git a/roles/native-https-redirect/meta/main.yml b/roles/native-https-redirect/meta/main.yml deleted file mode 100644 index 5f4b1fe4..00000000 --- a/roles/native-https-redirect/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- native-https-server diff --git a/roles/native-https-server/meta/main.yml b/roles/native-https-server/meta/main.yml deleted file mode 100644 index 5a1624c3..00000000 --- a/roles/native-https-server/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: -- native-nginx -- native-letsencrypt diff --git a/roles/native-journalctl/meta/main.yml b/roles/native-journalctl/meta/main.yml deleted file mode 100644 index 75444eba..00000000 --- a/roles/native-journalctl/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - native-journalctl-health-check diff --git a/roles/native-letsencrypt/meta/main.yml b/roles/native-letsencrypt/meta/main.yml deleted file mode 100644 index a2823175..00000000 --- a/roles/native-letsencrypt/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- native-certbot-nginx diff --git a/roles/native-nginx/handlers/main.yml b/roles/nginx/handlers/main.yml similarity index 100% rename from roles/native-nginx/handlers/main.yml rename to roles/nginx/handlers/main.yml diff --git a/roles/native-nginx/readme.md b/roles/nginx/readme.md similarity index 96% rename from roles/native-nginx/readme.md rename to roles/nginx/readme.md index 9a5d5b6c..29e1ecb7 100644 --- a/roles/native-nginx/readme.md +++ b/roles/nginx/readme.md @@ -1,4 +1,4 @@ -# role native-nginx +# role nginx ## debug ```bash diff --git a/roles/native-nginx/tasks/main.yml b/roles/nginx/tasks/main.yml similarity index 100% rename from roles/native-nginx/tasks/main.yml rename to roles/nginx/tasks/main.yml diff --git a/roles/native-nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 similarity index 100% rename from roles/native-nginx/templates/nginx.conf.j2 rename to roles/nginx/templates/nginx.conf.j2 diff --git a/roles/native-postfix/meta/main.yml b/roles/postfix/meta/main.yml similarity index 100% rename from roles/native-postfix/meta/main.yml rename to roles/postfix/meta/main.yml diff --git a/roles/native-postfix/tasks/main.yml b/roles/postfix/tasks/main.yml similarity index 100% rename from roles/native-postfix/tasks/main.yml rename to roles/postfix/tasks/main.yml diff --git a/roles/native-postfix/templates/aliases.j2 b/roles/postfix/templates/aliases.j2 similarity index 100% rename from roles/native-postfix/templates/aliases.j2 rename to roles/postfix/templates/aliases.j2 diff --git a/roles/native-postfix/templates/main.cf.j2 b/roles/postfix/templates/main.cf.j2 similarity index 100% rename from roles/native-postfix/templates/main.cf.j2 rename to roles/postfix/templates/main.cf.j2 diff --git a/roles/native-python-pip/tasks/main.yml b/roles/python-pip/tasks/main.yml similarity index 100% rename from roles/native-python-pip/tasks/main.yml rename to roles/python-pip/tasks/main.yml diff --git a/roles/native-sshd/README.md b/roles/sshd/README.md similarity index 95% rename from roles/native-sshd/README.md rename to roles/sshd/README.md index 2d16c91d..aa80be4d 100644 --- a/roles/native-sshd/README.md +++ b/roles/sshd/README.md @@ -1,4 +1,4 @@ -# role native-sshd +# role sshd ## dependencies This role depends on that a well configured user administrator exist. For this reason this role depends on the role user-administrator. diff --git a/roles/native-sshd/handlers/main.yml b/roles/sshd/handlers/main.yml similarity index 100% rename from roles/native-sshd/handlers/main.yml rename to roles/sshd/handlers/main.yml diff --git a/roles/native-sshd/meta/main.yml b/roles/sshd/meta/main.yml similarity index 100% rename from roles/native-sshd/meta/main.yml rename to roles/sshd/meta/main.yml diff --git a/roles/native-sshd/tasks/main.yml b/roles/sshd/tasks/main.yml similarity index 100% rename from roles/native-sshd/tasks/main.yml rename to roles/sshd/tasks/main.yml diff --git a/roles/native-sshd/templates/sshd_config.j2 b/roles/sshd/templates/sshd_config.j2 similarity index 100% rename from roles/native-sshd/templates/sshd_config.j2 rename to roles/sshd/templates/sshd_config.j2 diff --git a/roles/native-sudo/files/sudoers b/roles/sudo/files/sudoers similarity index 100% rename from roles/native-sudo/files/sudoers rename to roles/sudo/files/sudoers diff --git a/roles/native-sudo/tasks/main.yml b/roles/sudo/tasks/main.yml similarity index 100% rename from roles/native-sudo/tasks/main.yml rename to roles/sudo/tasks/main.yml diff --git a/roles/system-security/meta/main.yml b/roles/system-security/meta/main.yml index ee954033..922742df 100644 --- a/roles/system-security/meta/main.yml +++ b/roles/system-security/meta/main.yml @@ -1,3 +1,3 @@ dependencies: - user-alarm -- native-sshd +- sshd diff --git a/roles/user-administrator/meta/main.yml b/roles/user-administrator/meta/main.yml index 7b4707e1..3cd2e45c 100644 --- a/roles/user-administrator/meta/main.yml +++ b/roles/user-administrator/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-sudo \ No newline at end of file +- sudo \ No newline at end of file