Refactored native-

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
+- [Btrfs Health Check](./roles/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 Health Check](./roles/docker-health-check/) - Checks the health of docker containers
-- [Docker Reverse Proxy](./roles/native-docker-reverse-proxy/README.md) - Docker Reverse Proxy Solution
+- [Docker Reverse Proxy](./roles/docker-reverse-proxy/README.md) - Docker Reverse Proxy Solution
-- [Docker Volume Backup](./roles/native-docker-volume-backup/) - Backup Solution for Docker Volumes
+- [Docker Volume Backup](./roles/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
+- [Pull Primary Backups](./roles/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
+- [Wireguard](./roles/wireguard/README.md) - Integrates the server in an wireguard vpn
 
 ### Server Administration
 

playbook.yml

@@ -10,10 +10,10 @@
   become: true
   roles:
     - system-security
-    - native-journalctl
+    - journalctl
-    - native-disc-space-check
+    - disc-space-check
-    - native-free-disc-space
+    - free-disc-space
-    - native-btrfs-health-check
+    - 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

roles/backups-cleanup-service/meta/main.yml

@@ -1,3 +1,3 @@
 dependencies:
-  - native-python-pip
+  - python-pip
   - systemd_notifier

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.

roles/backups-consumer/meta/main.yml

@@ -1,4 +1,4 @@
 dependencies:
-  - native-git
+  - git
   - systemd_notifier
   - backups-cleanup-timer

roles/backups-provider-user/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-sshd
+- sshd

roles/backups-provider-user/readme.md

@@ -1,4 +1,4 @@
-# role native-backups-provider-user
+# role backups-provider-user
 User for backups
 
 ## todo

roles/backups-provider/README.md

@@ -1,4 +1,4 @@
-# role native-backups-provider-host
+# role backups-provider-host
 
 ## todo
 - add full system backup

roles/backups-provider/meta/main.yml

@@ -1,3 +1,3 @@
 dependencies:
-- native-backups-provider-user
+- backups-provider-user
 - backups-cleanup-timer

roles/certbot-nginx/meta/main.yml

@@ -1,3 +1,3 @@
 dependencies:
-- native-nginx
+- nginx
 - systemd_notifier

roles/docker-akaunting/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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

roles/docker-attendize/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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 }}"

roles/docker-bigbluebutton/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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

roles/docker-elk/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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

roles/docker-funkwhale/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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}}"

roles/docker-gitea/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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}}"

roles/docker-jenkins/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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"

roles/docker-joomla/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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}}"

roles/docker-mailu/meta/main.yml

@@ -1,3 +1,3 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy
 - systemd_notifier

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"

roles/docker-mastodon/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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;

roles/docker-mediawiki/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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"

roles/docker-mybb/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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

roles/docker-nextcloud/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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;

roles/docker-peertube/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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

roles/docker-pixelfed/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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}}"

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.
 

roles/docker-reverse-proxy/meta/main.yml

@@ -0,0 +1,3 @@
+dependencies:
+- docker
+- https-server

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' %}
 

roles/docker-roulette-wheel/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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}}"

roles/docker-volume-backup/meta/main.yml

@@ -0,0 +1,4 @@
+dependencies:
+  - git
+  - backups-provider
+  - systemd_notifier

roles/docker-wordpress/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy

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
 

roles/docker-yourls/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- native-docker-reverse-proxy
+- docker-reverse-proxy