From cd9eca8ee3a8b7e33c824110d904674146044a67 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 18 Apr 2023 15:41:14 +0200 Subject: [PATCH] Renamed server roles --- README.md | 40 +++++++------- playbook.yml | 52 +++++++++---------- roles/pc_application-docker/tasks/main.yml | 2 +- roles/pc_driver-epson-multiprinter/Readme.md | 2 +- roles/pc_driver-msi-perkeyrgb/Readme.md | 2 +- roles/server_docker-akaunting/README.md | 26 +++++----- .../server_docker-akaunting/handlers/main.yml | 2 +- roles/server_docker-akaunting/meta/main.yml | 2 +- roles/server_docker-akaunting/tasks/main.yml | 2 +- roles/server_docker-akaunting/vars/main.yml | 2 +- roles/server_docker-bigbluebutton/README.md | 6 +-- .../handlers/main.yml | 4 +- .../server_docker-bigbluebutton/meta/main.yml | 2 +- .../server_docker-bigbluebutton/vars/main.yml | 2 +- roles/server_docker-elk/Readme.md | 6 +-- roles/server_docker-elk/defaults/main.yml | 2 +- roles/server_docker-elk/handlers/main.yml | 4 +- roles/server_docker-elk/meta/main.yml | 2 +- roles/server_docker-elk/tasks/main.yml | 22 ++++---- .../templates/elasticsearch.yml.j2 | 2 +- roles/server_docker-funkwhale/README.md | 2 +- .../server_docker-funkwhale/handlers/main.yml | 4 +- roles/server_docker-funkwhale/meta/main.yml | 2 +- roles/server_docker-funkwhale/tasks/main.yml | 6 +-- .../server_docker-funkwhale/templates/env.j2 | 2 +- roles/server_docker-funkwhale/vars/main.yml | 2 +- roles/server_docker-gitea/README.md | 12 ++--- roles/server_docker-gitea/handlers/main.yml | 4 +- roles/server_docker-gitea/meta/main.yml | 2 +- roles/server_docker-gitea/tasks/main.yml | 10 ++-- roles/server_docker-jenkins/meta/main.yml | 2 +- roles/server_docker-jenkins/tasks/main.yml | 2 +- roles/server_docker-joomla/README.md | 2 +- roles/server_docker-joomla/meta/main.yml | 2 +- roles/server_docker-joomla/tasks/main.yml | 2 +- roles/server_docker-mailu/README.md | 6 +-- roles/server_docker-mailu/handlers/main.yml | 4 +- roles/server_docker-mailu/meta/main.yml | 4 +- roles/server_docker-mailu/tasks/main.yml | 12 ++--- .../templates/mailu.env.j2 | 4 +- roles/server_docker-mastodon/README.md | 12 ++--- .../server_docker-mastodon/handlers/main.yml | 2 +- roles/server_docker-mastodon/meta/main.yml | 2 +- roles/server_docker-mastodon/tasks/main.yml | 4 +- .../templates/mastodon.conf.j2 | 4 +- roles/server_docker-mastodon/vars/main.yml | 2 +- roles/server_docker-mediawiki/README.md | 2 +- roles/server_docker-mediawiki/meta/main.yml | 2 +- roles/server_docker-mediawiki/tasks/main.yml | 2 +- roles/server_docker-mybb/meta/main.yml | 2 +- roles/server_docker-mybb/tasks/main.yml | 2 +- roles/server_docker-nextcloud/README.md | 28 +++++----- .../server_docker-nextcloud/handlers/main.yml | 4 +- roles/server_docker-nextcloud/meta/main.yml | 2 +- roles/server_docker-nextcloud/tasks/main.yml | 8 +-- .../templates/nextcloud.conf.j2 | 4 +- roles/server_docker-peertube/README.md | 6 +-- .../server_docker-peertube/handlers/main.yml | 2 +- roles/server_docker-peertube/meta/main.yml | 2 +- roles/server_docker-peertube/tasks/main.yml | 4 +- .../templates/peertube.conf.j2 | 2 +- roles/server_docker-peertube/vars/main.yml | 2 +- roles/server_docker-pixelfed/README.md | 18 +++---- .../server_docker-pixelfed/handlers/main.yml | 4 +- roles/server_docker-pixelfed/meta/main.yml | 2 +- roles/server_docker-pixelfed/tasks/main.yml | 6 +-- roles/server_docker-pixelfed/vars/main.yml | 2 +- .../handlers/main.yml | 2 +- .../meta/main.yml | 2 +- roles/server_docker-roulette-wheel/readme.md | 4 +- .../tasks/main.yml | 6 +-- .../vars/main.yml | 4 +- roles/server_docker-turn-server/readme.md | 10 ++-- roles/server_docker-wordpress/README.md | 2 +- .../server_docker-wordpress/handlers/main.yml | 4 +- roles/server_docker-wordpress/meta/main.yml | 2 +- roles/server_docker-wordpress/tasks/main.yml | 10 ++-- roles/server_docker-yourls/README.md | 2 +- roles/server_docker-yourls/handlers/main.yml | 4 +- roles/server_docker-yourls/meta/main.yml | 2 +- roles/server_docker-yourls/tasks/main.yml | 10 ++-- roles/server_native-backups-cleanup/README.md | 2 +- .../meta/main.yml | 4 +- .../meta/main.yml | 2 +- .../server_native-certbot-nginx/meta/main.yml | 4 +- .../meta/main.yml | 2 +- .../README.md | 4 +- .../files/docker-compose-restart-unhealthy.py | 6 +-- .../handlers/main.yml | 8 +-- .../tasks/main.yml | 22 ++++---- ...ocker-compose-restart-unhealthy.service.j2 | 2 +- .../docker-compose-restart-unhealthy.timer.j2 | 2 +- .../vars/main.yml | 2 +- .../handlers/main.yml | 8 +-- .../meta/main.yml | 2 +- .../tasks/main.yml | 20 +++---- .../templates/docker-health-check.service.j2 | 2 +- .../templates/docker-health-check.timer.j2 | 2 +- .../vars/main.yml | 2 +- .../README.md | 4 +- .../meta/main.yml | 4 +- .../templates/domain.conf.j2 | 2 +- .../handlers/main.yml | 8 +-- .../meta/main.yml | 6 +-- .../tasks/main.yml | 18 +++---- .../templates/docker-volume-backup.service.j2 | 2 +- .../vars/main.yml | 2 +- roles/server_native-docker/Readme.md | 4 +- roles/server_native-docker/meta/main.yml | 8 +-- roles/server_native-docker/tasks/main.yml | 6 +-- .../meta/main.yml | 2 +- roles/server_native-homepage/meta/main.yml | 4 +- .../templates/homepage.nginx.conf.j2 | 2 +- .../meta/main.yml | 2 +- .../templates/redirect.domain.nginx.conf.j2 | 2 +- .../server_native-https-server/meta/main.yml | 4 +- .../meta/main.yml | 2 +- roles/server_native-journalctl/README.md | 2 +- roles/server_native-journalctl/meta/main.yml | 2 +- roles/server_native-letsencrypt/meta/main.yml | 2 +- roles/server_native-nginx/readme.md | 4 +- roles/server_native-postfix/meta/main.yml | 2 +- roles/server_native-primary-backup/README.md | 2 +- .../meta/main.yml | 4 +- .../README.md | 2 +- .../meta/main.yml | 6 +-- roles/server_native-sshd/meta/main.yml | 2 +- roles/server_native-sshd/readme.md | 4 +- roles/server_native-systemd-email/readme.md | 2 +- .../meta/main.yml | 2 +- roles/server_native-user-backup/meta/main.yml | 2 +- roles/server_native-user-backup/readme.md | 2 +- .../templates/ssh-wrapper.sh.j2 | 4 +- .../meta/main.yml | 2 +- .../readme.md | 2 +- roles/server_system-security/meta/main.yml | 4 +- 136 files changed, 348 insertions(+), 348 deletions(-) diff --git a/README.md b/README.md index edb24b09..6e2b772f 100644 --- a/README.md +++ b/README.md @@ -13,30 +13,30 @@ With this tool you can setup all of the following application on bare metal serv This software allows to setup the docker following applications: -- [Nextcloud](./roles/docker-nextcloud/README.md) - Cloud Software -- [Akaunting](./roles/docker-akaunting/README.md) - Business Controlling Software -- [Big Blue Button](./roles/docker-bigbluebutton/README.md) - Video Conference Software -- [Gitea](./roles/docker-gitea/README.md) - Version Controll Software -- [Joomla](./roles/docker-joomla/) - CMS Software -- [Mailu](./roles/docker-mailu/README.md) - Mailsoftware -- [Peertube](./roles/docker-peertube/README.md) - Video Platform Software -- [pixelfed](./roles/docker-pixelfed/README.md) - Photo Platform Software -- [Wordpress](./roles/docker-wordpress/README.md) - Blog Software -- [YOURLS](./roles/docker-yourls/README.md) - URL Shortening Software -- [Mastodon](./roles/docker-mastodon/README.md) - Micro Blog Software -- [Media Wiki](./roles/docker-mediawiki/README.md) - Wiki Software -- [MyBB](./roles/docker-mybb/README.md) - Forum Software +- [Nextcloud](./roles/server_docker-nextcloud/README.md) - Cloud Software +- [Akaunting](./roles/server_docker-akaunting/README.md) - Business Controlling Software +- [Big Blue Button](./roles/server_docker-bigbluebutton/README.md) - Video Conference Software +- [Gitea](./roles/server_docker-gitea/README.md) - Version Controll Software +- [Joomla](./roles/server_docker-joomla/) - CMS Software +- [Mailu](./roles/server_docker-mailu/README.md) - Mailsoftware +- [Peertube](./roles/server_docker-peertube/README.md) - Video Platform Software +- [pixelfed](./roles/server_docker-pixelfed/README.md) - Photo Platform Software +- [Wordpress](./roles/server_docker-wordpress/README.md) - Blog Software +- [YOURLS](./roles/server_docker-yourls/README.md) - URL Shortening Software +- [Mastodon](./roles/server_docker-mastodon/README.md) - Micro Blog Software +- [Media Wiki](./roles/server_docker-mediawiki/README.md) - Wiki Software +- [MyBB](./roles/server_docker-mybb/README.md) - Forum Software #### Native Applications This software shipts the following tools which are natively setup on the server: -- [Backups Cleanup](./roles/native-backups-cleanup/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-pull-primary-backups/README.md) - Pulls the backups from another server and stores them -- [Wireguard](./roles/native-wireguard/README.md) - Integrates the server in an wireguard vpn +- [Backups Cleanup](./roles/server_native-backups-cleanup/README.md) - Cleans up old backups +- [Btrfs Health Check](./roles/server_native-btrfs-health-check/README.md) - Checks the health of Btrfs file systems +- [Docker Health Check](./roles/server_native-docker-health-check/) - Checks the health of docker containers +- [Docker Reverse Proxy](./roles/server_native-docker-reverse-proxy/README.md) - Docker Reverse Proxy Solution +- [Docker Volume Backup](./roles/server_native-docker-volume-backup/) - Backup Solution for Docker Volumes +- [Pull Primary Backups](./roles/server_native-pull-primary-backups/README.md) - Pulls the backups from another server and stores them +- [Wireguard](./roles/server_native-wireguard/README.md) - Integrates the server in an wireguard vpn ### Server Administration diff --git a/playbook.yml b/playbook.yml index 0b32134e..37c67f92 100644 --- a/playbook.yml +++ b/playbook.yml @@ -9,35 +9,35 @@ hosts: servers become: true roles: - - system-security - - native-journalctl - - native-disc-space-check - - native-free-disc-space - - native-btrfs-health-check + - server_system-security + - server_native-journalctl + - server_native-disc-space-check + - server_native-free-disc-space + - server_native-btrfs-health-check - name: setup standard wireguard hosts hosts: wireguard_hosts become: true roles: - - native-wireguard + - server_native-wireguard - name: setup wireguard hosts behind firewall\nat hosts: wireguard_behind_firewall_hosts become: true roles: - - native-wireguard-behind-firewall + - server_native-wireguard-behind-firewall # Native Webserver Roles - name: setup homepages hosts: homepage_hosts become: true roles: - - role: native-homepage + - role: server_native-homepage vars: domain: "{{top_domain}}" - name: setup redirect hosts hosts: redirect_hosts become: true roles: - - role: native-https-redirect + - role: server_native-https-redirect vars: domain_mappings: "{{redirect_domain_mappings}}" @@ -46,7 +46,7 @@ hosts: nextcloud_hosts become: true roles: - - role: docker-nextcloud + - role: server_docker-nextcloud vars: domain: cloud.{{top_domain}} http_port: 8001 @@ -54,7 +54,7 @@ hosts: gitea_hosts become: true roles: - - role: docker-gitea + - role: server_docker-gitea vars: domain: git.{{top_domain}} http_port: 8002 @@ -64,7 +64,7 @@ hosts: wordpress_hosts become: true roles: - - role: docker-wordpress + - role: server_docker-wordpress vars: domains: "{{wordpress_domains}}" http_port: 8003 @@ -72,7 +72,7 @@ hosts: mediawiki_hosts become: true roles: - - role: docker-mediawiki + - role: server_docker-mediawiki vars: domain: wiki.{{top_domain}} http_port: 8004 @@ -80,7 +80,7 @@ hosts: mybb_hosts become: true roles: - - role: docker-mybb + - role: server_docker-mybb vars: domain: forum.{{top_domain}} http_port: 8005 @@ -88,12 +88,12 @@ hosts: turn_server_hosts become: true roles: - - role: docker-turn-server + - role: server_docker-turn-server - name: setup yourls hosts hosts: yourls_hosts become: true roles: - - role: docker-yourls + - role: server_docker-yourls vars: domain: s.{{top_domain}} http_port: 8006 @@ -101,7 +101,7 @@ hosts: mailu_hosts become: true roles: - - role: docker-mailu + - role: server_docker-mailu vars: domain: "mail.{{top_domain}}" http_port: 8007 @@ -109,7 +109,7 @@ hosts: elk_hosts become: true roles: - - role: docker-elk + - role: server_docker-elk vars: domain: "elk.{{top_domain}}" http_port: 8008 @@ -117,7 +117,7 @@ hosts: mastodon_hosts become: true roles: - - role: docker-mastodon + - role: server_docker-mastodon vars: domain: "mastodon.{{top_domain}}" http_port: 8009 @@ -126,7 +126,7 @@ hosts: pixelfed_hosts become: true roles: - - role: docker-pixelfed + - role: server_docker-pixelfed vars: domain: pixelfed.{{top_domain}} http_port: 8010 @@ -134,7 +134,7 @@ hosts: peertube_hosts become: true roles: - - role: docker-peertube + - role: server_docker-peertube vars: domain: peertube.{{top_domain}} http_port: 8011 @@ -142,14 +142,14 @@ hosts: bigbluebutton_hosts become: true roles: - - role: docker-bigbluebutton + - role: server_docker-bigbluebutton vars: domain: bbb.{{top_domain}} - name: setup funkwhale hosts hosts: funkwhale_hosts become: true roles: - - role: docker-funkwhale + - role: server_docker-funkwhale vars: domain: funkwhale.{{top_domain}} http_port: 8012 @@ -157,7 +157,7 @@ hosts: roulette_wheel_hosts become: true roles: - - role: docker-roulette-wheel + - role: server_docker-roulette-wheel vars: domain: roulette.{{top_domain}} http_port: 8013 @@ -165,7 +165,7 @@ hosts: akaunting_hosts become: true roles: - - role: docker-akaunting + - role: server_docker-akaunting vars: domain: akaunting.{{top_domain}} http_port: 8080 @@ -175,7 +175,7 @@ hosts: replica_backup_hosts become: true roles: - - role: native-pull-primary-backups + - role: server_native-pull-primary-backups ## PC services - name: general host setup diff --git a/roles/pc_application-docker/tasks/main.yml b/roles/pc_application-docker/tasks/main.yml index d45a5d61..307b3f95 100644 --- a/roles/pc_application-docker/tasks/main.yml +++ b/roles/pc_application-docker/tasks/main.yml @@ -2,7 +2,7 @@ community.general.pacman: name: - docker - - docker-compose + - server_docker-compose state: present - name: Adding user {{client_username}} to relevant arduino usergroups diff --git a/roles/pc_driver-epson-multiprinter/Readme.md b/roles/pc_driver-epson-multiprinter/Readme.md index 0d0eab2c..2b87ffb0 100644 --- a/roles/pc_driver-epson-multiprinter/Readme.md +++ b/roles/pc_driver-epson-multiprinter/Readme.md @@ -1,4 +1,4 @@ -# role native-epson-multiprinter +# role pc_driver-epson-multiprinter ## further information - https://bernhardsteindl.at/epson-ecotank-et-3600-unter-arch-linux-einrichten/ - http://download.ebz.epson.net/dsc/search/01/search/searchModule diff --git a/roles/pc_driver-msi-perkeyrgb/Readme.md b/roles/pc_driver-msi-perkeyrgb/Readme.md index 629fed5a..11552454 100644 --- a/roles/pc_driver-msi-perkeyrgb/Readme.md +++ b/roles/pc_driver-msi-perkeyrgb/Readme.md @@ -1,4 +1,4 @@ -# native-msi-gs66 +# pc_driver-msi-perkeyrgb # further information - https://github.com/Askannz/msi-perkeyrgb - https://wiki.archlinux.org/title/MSI_GS66_11UX \ No newline at end of file diff --git a/roles/server_docker-akaunting/README.md b/roles/server_docker-akaunting/README.md index 21d3e4fe..806b86fe 100644 --- a/roles/server_docker-akaunting/README.md +++ b/roles/server_docker-akaunting/README.md @@ -2,17 +2,17 @@ ## new setup ```bash -cd /home/administrator/docker-compose/akaunting/ +cd /home/administrator/server_docker-compose/akaunting/ export COMPOSE_HTTP_TIMEOUT=600 export DOCKER_CLIENT_TIMEOUT=600 -AKAUNTING_SETUP=true docker-compose -p akaunting up -d +AKAUNTING_SETUP=true server_docker-compose -p akaunting up -d ``` Check Webinterface and then execute: ```bash -docker-compose down -docker-compose -p akaunting up -d +server_docker-compose down +server_docker-compose -p akaunting up -d ``` ## administration @@ -68,23 +68,23 @@ export COMPOSE_HTTP_TIMEOUT=600 export DOCKER_CLIENT_TIMEOUT=600 # destroy all containers -cd /home/administrator/docker-compose/akaunting/ && -docker-compose down && +cd /home/administrator/server_docker-compose/akaunting/ && +server_docker-compose down && docker network prune -f # delete all volumes docker volume rm akaunting_akaunting-data akaunting_akaunting-db akaunting_akaunting-modules # rebuild containers -docker-compose pull && -docker-compose build && -docker-compose -p akaunting up -d --force-recreate +server_docker-compose pull && +server_docker-compose build && +server_docker-compose -p akaunting up -d --force-recreate # recover all volumes -cd /home/administrator/scripts/docker-volume-backup && -bash docker-volume-recover.sh akaunting_akaunting-modules ${machine_id:0:64} "$backup_version" && -bash docker-volume-recover.sh akaunting_akaunting-data ${machine_id:0:64} "$backup_version" && -bash docker-volume-recover.sh akaunting_akaunting-db ${machine_id:0:64} "$backup_version" akaunting-db "$akaunting_db_password" akaunting +cd /home/administrator/scripts/server_docker-volume-backup && +bash server_docker-volume-recover.sh akaunting_akaunting-modules ${machine_id:0:64} "$backup_version" && +bash server_docker-volume-recover.sh akaunting_akaunting-data ${machine_id:0:64} "$backup_version" && +bash server_docker-volume-recover.sh akaunting_akaunting-db ${machine_id:0:64} "$backup_version" akaunting-db "$akaunting_db_password" akaunting ``` diff --git a/roles/server_docker-akaunting/handlers/main.yml b/roles/server_docker-akaunting/handlers/main.yml index 03d6e54f..e73d2ea3 100644 --- a/roles/server_docker-akaunting/handlers/main.yml +++ b/roles/server_docker-akaunting/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: setup akaunting command: - cmd: docker-compose -p akaunting up -d --force-recreate + cmd: server_docker-compose -p akaunting up -d --force-recreate chdir: "{{docker_compose_akaunting_path}}" environment: #AKAUNTING_SETUP: true diff --git a/roles/server_docker-akaunting/meta/main.yml b/roles/server_docker-akaunting/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-akaunting/meta/main.yml +++ b/roles/server_docker-akaunting/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-akaunting/tasks/main.yml b/roles/server_docker-akaunting/tasks/main.yml index 42f1fb63..98ff8793 100644 --- a/roles/server_docker-akaunting/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: register directory diff --git a/roles/server_docker-akaunting/vars/main.yml b/roles/server_docker-akaunting/vars/main.yml index 70dc32af..f3e9b085 100644 --- a/roles/server_docker-akaunting/vars/main.yml +++ b/roles/server_docker-akaunting/vars/main.yml @@ -1 +1 @@ -docker_compose_akaunting_path: "/home/administrator/docker-compose/akaunting/" +docker_compose_akaunting_path: "/home/administrator/server_docker-compose/akaunting/" diff --git a/roles/server_docker-bigbluebutton/README.md b/roles/server_docker-bigbluebutton/README.md index 3bfa7091..bf665c2c 100644 --- a/roles/server_docker-bigbluebutton/README.md +++ b/roles/server_docker-bigbluebutton/README.md @@ -5,7 +5,7 @@ Role to deploy [BigBlueButton](https://bigbluebutton.org/). ### cleanup ```bash - docker-compose down; + server_docker-compose down; docker volume rm bigbluebutton_bigbluebutton bigbluebutton_html5-static bigbluebutton_vol-freeswitch bigbluebutton_vol-kurento bigbluebutton_vol-mediasoup bigbluebutton_database ``` @@ -17,8 +17,8 @@ watch -n 2 "docker ps -a | grep bigbluebutton" ## further information - https://github.com/bigbluebutton/docker - https://docs.bigbluebutton.org/greenlight/gl-install.html#setting-bigbluebutton-credentials -- https://goneuland.de/big-blue-button-mit-docker-und-traefik-installieren/ +- https://goneuland.de/big-blue-button-mit-server_docker-und-traefik-installieren/ - https://github.com/docker/compose/issues/4799 - https://www.cyberciti.biz/faq/linux-command-to-remove-virtual-interfaces-or-network-aliases/ - https://www.cyberciti.biz/faq/linux-restart-network-interface/ -- https://stackoverflow.com/questions/53347951/docker-network-not-found \ No newline at end of file +- https://stackoverflow.com/questions/53347951/server_docker-network-not-found \ No newline at end of file diff --git a/roles/server_docker-bigbluebutton/handlers/main.yml b/roles/server_docker-bigbluebutton/handlers/main.yml index b4f67a90..40715e92 100644 --- a/roles/server_docker-bigbluebutton/handlers/main.yml +++ b/roles/server_docker-bigbluebutton/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: create docker-compose.yml for bigbluebutton +- name: create server_docker-compose.yml for bigbluebutton command: cmd: bash ./scripts/generate-compose chdir: "{{docker_compose_bigbluebutton_path}}" @@ -9,7 +9,7 @@ listen: setup bigbluebutton - name: docker compose up bigbluebutton command: - cmd: docker-compose -p bigbluebutton up -d --force-recreate + cmd: server_docker-compose -p bigbluebutton up -d --force-recreate chdir: "{{docker_compose_bigbluebutton_path}}" environment: COMPOSE_HTTP_TIMEOUT: 600 diff --git a/roles/server_docker-bigbluebutton/meta/main.yml b/roles/server_docker-bigbluebutton/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-bigbluebutton/meta/main.yml +++ b/roles/server_docker-bigbluebutton/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-bigbluebutton/vars/main.yml b/roles/server_docker-bigbluebutton/vars/main.yml index 51232f32..ceeb62fe 100644 --- a/roles/server_docker-bigbluebutton/vars/main.yml +++ b/roles/server_docker-bigbluebutton/vars/main.yml @@ -1 +1 @@ -docker_compose_bigbluebutton_path: "/home/administrator/docker-compose/bigbluebutton/" \ No newline at end of file +docker_compose_bigbluebutton_path: "/home/administrator/server_docker-compose/bigbluebutton/" \ No newline at end of file diff --git a/roles/server_docker-elk/Readme.md b/roles/server_docker-elk/Readme.md index 03f2618d..1f97bfed 100644 --- a/roles/server_docker-elk/Readme.md +++ b/roles/server_docker-elk/Readme.md @@ -1,4 +1,4 @@ -# role docker-elk +# role server_docker-elk I decided against using this role for security reasons. I recommend to use another tool if you don't want to pay for keeping your logs save and if you don't want to depend on external servers. @@ -9,5 +9,5 @@ docker restart elk_logstash_1 && docker restart elk_elasticsearch_1 && docker re ## see - https://logz.io/blog/elk-stack-on-docker/ -- https://github.com/kevinveenbirkenbach/docker-elk -- https://logz.io/blog/docker-logging/ +- https://github.com/kevinveenbirkenbach/server_docker-elk +- https://logz.io/blog/server_docker-logging/ diff --git a/roles/server_docker-elk/defaults/main.yml b/roles/server_docker-elk/defaults/main.yml index 303afa19..cb705af5 100644 --- a/roles/server_docker-elk/defaults/main.yml +++ b/roles/server_docker-elk/defaults/main.yml @@ -1,2 +1,2 @@ --- -docker_elk_compose_path: "/srv/github.com/kevinveenbirkenbach/docker-elk/" +docker_elk_compose_path: "/srv/github.com/kevinveenbirkenbach/server_docker-elk/" diff --git a/roles/server_docker-elk/handlers/main.yml b/roles/server_docker-elk/handlers/main.yml index e295b64c..394763f1 100644 --- a/roles/server_docker-elk/handlers/main.yml +++ b/roles/server_docker-elk/handlers/main.yml @@ -1,7 +1,7 @@ --- -- name: recreate docker-elk +- name: recreate server_docker-elk command: - cmd: docker-compose up -d --force-recreate + cmd: server_docker-compose up -d --force-recreate chdir: "{{docker_elk_compose_path}}" environment: COMPOSE_HTTP_TIMEOUT: 600 diff --git a/roles/server_docker-elk/meta/main.yml b/roles/server_docker-elk/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-elk/meta/main.yml +++ b/roles/server_docker-elk/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-elk/tasks/main.yml b/roles/server_docker-elk/tasks/main.yml index 772412b9..2346d4c8 100644 --- a/roles/server_docker-elk/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: create elasticsearch-sysctl.conf @@ -24,29 +24,29 @@ state: directory mode: 0755 -- name: git pull docker-elk +- name: git pull server_docker-elk git: - repo: "https://github.com/kevinveenbirkenbach/docker-elk.git" + repo: "https://github.com/kevinveenbirkenbach/server_docker-elk.git" dest: "{{docker_elk_compose_path}}" update: yes - notify: recreate docker-elk + notify: recreate server_docker-elk -- name: copy docker-compose.yml - template: src=docker-compose.yml.j2 dest={{docker_elk_compose_path}}docker-compose.yml - notify: recreate docker-elk +- name: copy server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest={{docker_elk_compose_path}}server_docker-compose.yml + notify: recreate server_docker-elk - name: copy elasticsearch.yml template: src=elasticsearch.yml.j2 dest={{docker_elk_compose_path}}elasticsearch/config/elasticsearch.yml - notify: recreate docker-elk + notify: recreate server_docker-elk - name: copy kibana.yml template: src=kibana.yml.j2 dest={{docker_elk_compose_path}}kibana/config/kibana.yml - notify: recreate docker-elk + notify: recreate server_docker-elk - name: copy logstash.yml template: src=logstash.yml.j2 dest={{docker_elk_compose_path}}logstash/config/logstash.yml - notify: recreate docker-elk + notify: recreate server_docker-elk - name: copy logstash.conf template: src=logstash.conf.j2 dest={{docker_elk_compose_path}}logstash/pipeline/logstash.conf - notify: recreate docker-elk + notify: recreate server_docker-elk diff --git a/roles/server_docker-elk/templates/elasticsearch.yml.j2 b/roles/server_docker-elk/templates/elasticsearch.yml.j2 index b06c1d21..f75b3b4c 100644 --- a/roles/server_docker-elk/templates/elasticsearch.yml.j2 +++ b/roles/server_docker-elk/templates/elasticsearch.yml.j2 @@ -2,7 +2,7 @@ ## Default Elasticsearch configuration from Elasticsearch base image. ## https://github.com/elastic/elasticsearch/blob/master/distribution/docker/src/docker/config/elasticsearch.yml # -cluster.name: "docker-cluster" +cluster.name: "server_docker-cluster" network.host: 0.0.0.0 ## X-Pack settings diff --git a/roles/server_docker-funkwhale/README.md b/roles/server_docker-funkwhale/README.md index 39ccd3eb..5e8e18c3 100644 --- a/roles/server_docker-funkwhale/README.md +++ b/roles/server_docker-funkwhale/README.md @@ -5,7 +5,7 @@ This role doesn't work and needs to be implemented ## cleanup ```bash -docker-compose down && docker volume rm funkwhale_data +server_docker-compose down && docker volume rm funkwhale_data ``` ## further information diff --git a/roles/server_docker-funkwhale/handlers/main.yml b/roles/server_docker-funkwhale/handlers/main.yml index 965d57ad..7138daaa 100644 --- a/roles/server_docker-funkwhale/handlers/main.yml +++ b/roles/server_docker-funkwhale/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate funkwhale command: - cmd: docker-compose -p funkwhale up -d --force-recreate - chdir: /home/administrator/docker-compose/funkwhale/ + cmd: server_docker-compose -p funkwhale up -d --force-recreate + chdir: /home/administrator/server_docker-compose/funkwhale/ environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/server_docker-funkwhale/meta/main.yml b/roles/server_docker-funkwhale/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-funkwhale/meta/main.yml +++ b/roles/server_docker-funkwhale/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-funkwhale/tasks/main.yml b/roles/server_docker-funkwhale/tasks/main.yml index 8df826a8..5d4b901b 100644 --- a/roles/server_docker-funkwhale/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" @@ -12,8 +12,8 @@ state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest={{docker_compose_path}}docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest={{docker_compose_path}}server_docker-compose.yml notify: recreate funkwhale - name: add .env diff --git a/roles/server_docker-funkwhale/templates/env.j2 b/roles/server_docker-funkwhale/templates/env.j2 index 880d91e3..80bb857a 100644 --- a/roles/server_docker-funkwhale/templates/env.j2 +++ b/roles/server_docker-funkwhale/templates/env.j2 @@ -19,7 +19,7 @@ FUNKWHALE_VERSION={{funkwhale_version}} -# End of Docker-only configuration +# End of server_docker-only configuration # General configuration # --------------------- diff --git a/roles/server_docker-funkwhale/vars/main.yml b/roles/server_docker-funkwhale/vars/main.yml index 4d75d754..7c744896 100644 --- a/roles/server_docker-funkwhale/vars/main.yml +++ b/roles/server_docker-funkwhale/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_path: "/home/administrator/docker-compose/funkwhale/" +docker_compose_path: "/home/administrator/server_docker-compose/funkwhale/" client_max_body_size: "512M" diff --git a/roles/server_docker-gitea/README.md b/roles/server_docker-gitea/README.md index 930c177b..60b69865 100644 --- a/roles/server_docker-gitea/README.md +++ b/roles/server_docker-gitea/README.md @@ -1,11 +1,11 @@ -# role docker-gitea +# role server_docker-gitea ## update ```bash -cd /home/administrator/docker-compose/gitea/ -docker-compose down -docker-compose pull -docker-compose up -d +cd /home/administrator/server_docker-compose/gitea/ +server_docker-compose down +server_docker-compose pull +server_docker-compose up -d ``` Keep in mind to track and to don't interrupt the update process until the migration is done. @@ -19,7 +19,7 @@ Keep in mind to track and to don't interrupt the update process until the migrat ## recreate ```bash -cd /home/administrator/docker-compose/gitea/ && docker-compose -p gitea up -d --force-recreate +cd /home/administrator/server_docker-compose/gitea/ && server_docker-compose -p gitea up -d --force-recreate ``` ## database access diff --git a/roles/server_docker-gitea/handlers/main.yml b/roles/server_docker-gitea/handlers/main.yml index 328cb4d1..2e234d35 100644 --- a/roles/server_docker-gitea/handlers/main.yml +++ b/roles/server_docker-gitea/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate gitea command: - cmd: docker-compose -p gitea up -d --force-recreate - chdir: /home/administrator/docker-compose/gitea/ + cmd: server_docker-compose -p gitea up -d --force-recreate + chdir: /home/administrator/server_docker-compose/gitea/ environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/server_docker-gitea/meta/main.yml b/roles/server_docker-gitea/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-gitea/meta/main.yml +++ b/roles/server_docker-gitea/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-gitea/tasks/main.yml b/roles/server_docker-gitea/tasks/main.yml index 7e38adc0..fb2b9551 100644 --- a/roles/server_docker-gitea/tasks/main.yml +++ b/roles/server_docker-gitea/tasks/main.yml @@ -3,15 +3,15 @@ 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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx -- name: "create /home/administrator/docker-compose/gitea/" +- name: "create /home/administrator/server_docker-compose/gitea/" file: - path: "/home/administrator/docker-compose/gitea/" + path: "/home/administrator/server_docker-compose/gitea/" state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/gitea/docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/gitea/server_docker-compose.yml notify: recreate gitea diff --git a/roles/server_docker-jenkins/meta/main.yml b/roles/server_docker-jenkins/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-jenkins/meta/main.yml +++ b/roles/server_docker-jenkins/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-jenkins/tasks/main.yml b/roles/server_docker-jenkins/tasks/main.yml index 8d614581..9e17179d 100644 --- a/roles/server_docker-jenkins/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "docker jenkins" diff --git a/roles/server_docker-joomla/README.md b/roles/server_docker-joomla/README.md index 2d4ad253..4c767d30 100644 --- a/roles/server_docker-joomla/README.md +++ b/roles/server_docker-joomla/README.md @@ -1,4 +1,4 @@ -# role docker-joomla +# role server_docker-joomla ## delete all data ```bash docker stop joomla_application_1; docker rm -f joomla_application_1; docker volume rm -f joomla-data; diff --git a/roles/server_docker-joomla/meta/main.yml b/roles/server_docker-joomla/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-joomla/meta/main.yml +++ b/roles/server_docker-joomla/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-joomla/tasks/main.yml b/roles/server_docker-joomla/tasks/main.yml index 32b67552..550fbf69 100644 --- a/roles/server_docker-joomla/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "setup joomla" diff --git a/roles/server_docker-mailu/README.md b/roles/server_docker-mailu/README.md index 575f5c34..fc1c2011 100644 --- a/roles/server_docker-mailu/README.md +++ b/roles/server_docker-mailu/README.md @@ -1,4 +1,4 @@ -# role docker-mailu +# role server_docker-mailu ## setup ### bugs @@ -43,7 +43,7 @@ to verify that there aren't port conflicts Before you can use Mailu, you must create the primary administrator user account. This should be admin@{{hostname}}. Use the following command, changing PASSWORD to your liking: ```bash - docker-compose -p mailu exec admin flask mailu admin {{admin}} {{hostname}} PASSWORD + server_docker-compose -p mailu exec admin flask mailu admin {{admin}} {{hostname}} PASSWORD ``` ### cli user management @@ -52,7 +52,7 @@ How to manage users is described here: https://mailu.io/master/cli.html ### Up ```bash - docker-compose -p mailu up -d + server_docker-compose -p mailu up -d ``` ## debug diff --git a/roles/server_docker-mailu/handlers/main.yml b/roles/server_docker-mailu/handlers/main.yml index 1d4c5ff1..a8709be0 100644 --- a/roles/server_docker-mailu/handlers/main.yml +++ b/roles/server_docker-mailu/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate mailu command: - cmd: docker-compose -p mailu up -d --force-recreate - chdir: /home/administrator/docker-compose/mailu/ + cmd: server_docker-compose -p mailu up -d --force-recreate + chdir: /home/administrator/server_docker-compose/mailu/ environment: COMPOSE_HTTP_TIMEOUT: 900 DOCKER_CLIENT_TIMEOUT: 900 diff --git a/roles/server_docker-mailu/meta/main.yml b/roles/server_docker-mailu/meta/main.yml index 8d10d020..e67b2e12 100644 --- a/roles/server_docker-mailu/meta/main.yml +++ b/roles/server_docker-mailu/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-docker-reverse-proxy -- native-systemd-email +- server_native-docker-reverse-proxy +- server_native-systemd-email diff --git a/roles/server_docker-mailu/tasks/main.yml b/roles/server_docker-mailu/tasks/main.yml index c7a8f18f..3d1b3cf7 100644 --- a/roles/server_docker-mailu/tasks/main.yml +++ b/roles/server_docker-mailu/tasks/main.yml @@ -6,12 +6,12 @@ - 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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx -- name: "create /home/administrator/docker-compose/mailu" +- name: "create /home/administrator/server_docker-compose/mailu" file: - path: "/home/administrator/docker-compose/mailu" + path: "/home/administrator/server_docker-compose/mailu" state: directory mode: 0755 @@ -33,12 +33,12 @@ state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/mailu/docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/mailu/server_docker-compose.yml notify: recreate mailu - name: add mailu.env - template: src=mailu.env.j2 dest=/home/administrator/docker-compose/mailu/mailu.env + template: src=mailu.env.j2 dest=/home/administrator/server_docker-compose/mailu/mailu.env notify: recreate mailu - name: add deploy-letsencrypt-mailu.sh diff --git a/roles/server_docker-mailu/templates/mailu.env.j2 b/roles/server_docker-mailu/templates/mailu.env.j2 index 1ea28899..07761aea 100644 --- a/roles/server_docker-mailu/templates/mailu.env.j2 +++ b/roles/server_docker-mailu/templates/mailu.env.j2 @@ -114,10 +114,10 @@ WEBSITE=https://{{domain}} # Log driver for front service. Possible values: # json-file (default) # journald (On systemd platforms, useful for Fail2Ban integration) -# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!) +# syslog (Non systemd platforms, Fail2Ban integration. Disables `server_docker-compose log` for front!) # LOG_DRIVER=json-file -# Docker-compose project name, this will prepended to containers names. +# server_docker-compose project name, this will prepended to containers names. COMPOSE_PROJECT_NAME=mailu # Default password scheme used for newly created accounts and changed passwords diff --git a/roles/server_docker-mastodon/README.md b/roles/server_docker-mastodon/README.md index b9abf46b..e76fd0ac 100644 --- a/roles/server_docker-mastodon/README.md +++ b/roles/server_docker-mastodon/README.md @@ -1,15 +1,15 @@ # docker mastodon ## create configuration ```bash - docker-compose run --rm web bundle exec rake mastodon:setup + server_docker-compose run --rm web bundle exec rake mastodon:setup ``` ## cleanup ```bash -cd /home/administrator/docker-compose/mastodon/ -docker-compose down +cd /home/administrator/server_docker-compose/mastodon/ +server_docker-compose down docker volume rm mastodon_data mastodon_database mastodon_redis -cd /home/administrator/docker-compose/ && -rm -vR /home/administrator/docker-compose/mastodon +cd /home/administrator/server_docker-compose/ && +rm -vR /home/administrator/server_docker-compose/mastodon ``` ## access terminal @@ -26,7 +26,7 @@ docker exec -it -u root mastodon-web-1 chown -R 991:991 public ``` ## further information -- https://goneuland.de/mastodon-mit-docker-und-traefik-installieren/ +- https://goneuland.de/mastodon-mit-server_docker-und-traefik-installieren/ - https://gist.github.com/TrillCyborg/84939cd4013ace9960031b803a0590c4 - https://www.2daygeek.com/linux-command-check-website-is-up-down-alive/ - https://vitobotta.com/2022/11/07/setting-up-a-personal-mastodon-instance/ \ No newline at end of file diff --git a/roles/server_docker-mastodon/handlers/main.yml b/roles/server_docker-mastodon/handlers/main.yml index a0b6b1e4..e31ed307 100644 --- a/roles/server_docker-mastodon/handlers/main.yml +++ b/roles/server_docker-mastodon/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: recreate mastodon command: - cmd: docker-compose -p mastodon up -d --force-recreate + cmd: server_docker-compose -p mastodon up -d --force-recreate chdir: "{{docker_compose_mastodon_path}}" environment: COMPOSE_HTTP_TIMEOUT: 600 diff --git a/roles/server_docker-mastodon/meta/main.yml b/roles/server_docker-mastodon/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-mastodon/meta/main.yml +++ b/roles/server_docker-mastodon/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-mastodon/tasks/main.yml b/roles/server_docker-mastodon/tasks/main.yml index b4b90a28..c02a1686 100644 --- a/roles/server_docker-mastodon/tasks/main.yml +++ b/roles/server_docker-mastodon/tasks/main.yml @@ -12,8 +12,8 @@ state: directory mode: 0755 -- name: copy docker-compose.yml - template: src=docker-compose.yml.j2 dest={{docker_compose_mastodon_path}}docker-compose.yml +- name: copy server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest={{docker_compose_mastodon_path}}server_docker-compose.yml notify: recreate mastodon - name: copy configuration diff --git a/roles/server_docker-mastodon/templates/mastodon.conf.j2 b/roles/server_docker-mastodon/templates/mastodon.conf.j2 index 2c043346..3d9f9380 100644 --- a/roles/server_docker-mastodon/templates/mastodon.conf.j2 +++ b/roles/server_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/server_native-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/server_native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} location /api/v1/streaming { proxy_set_header Host $host; diff --git a/roles/server_docker-mastodon/vars/main.yml b/roles/server_docker-mastodon/vars/main.yml index 968df619..a1a67638 100644 --- a/roles/server_docker-mastodon/vars/main.yml +++ b/roles/server_docker-mastodon/vars/main.yml @@ -1 +1 @@ -docker_compose_mastodon_path: "/home/administrator/docker-compose/mastodon/" +docker_compose_mastodon_path: "/home/administrator/server_docker-compose/mastodon/" diff --git a/roles/server_docker-mediawiki/README.md b/roles/server_docker-mediawiki/README.md index 9ff8c415..c3174c12 100644 --- a/roles/server_docker-mediawiki/README.md +++ b/roles/server_docker-mediawiki/README.md @@ -1,4 +1,4 @@ -# role docker-mediawiki +# role server_docker-mediawiki ## Generate LocalSettings.php Login to the container: diff --git a/roles/server_docker-mediawiki/meta/main.yml b/roles/server_docker-mediawiki/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-mediawiki/meta/main.yml +++ b/roles/server_docker-mediawiki/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-mediawiki/tasks/main.yml b/roles/server_docker-mediawiki/tasks/main.yml index 0d597ddd..fb0ce70c 100644 --- a/roles/server_docker-mediawiki/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "docker mediawiki" diff --git a/roles/server_docker-mybb/meta/main.yml b/roles/server_docker-mybb/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-mybb/meta/main.yml +++ b/roles/server_docker-mybb/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-mybb/tasks/main.yml b/roles/server_docker-mybb/tasks/main.yml index 574a62fa..ee80af0a 100644 --- a/roles/server_docker-mybb/tasks/main.yml +++ b/roles/server_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/server_native-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/server_docker-nextcloud/README.md b/roles/server_docker-nextcloud/README.md index b01f16fa..182b7e02 100644 --- a/roles/server_docker-nextcloud/README.md +++ b/roles/server_docker-nextcloud/README.md @@ -1,4 +1,4 @@ -# role docker-nextcloud +# role server_docker-nextcloud ## precondition @@ -13,10 +13,10 @@ NEXTCLOUD_APPLICATION_DOCKER_CONTAINER=nextcloud-application-1 To update the nextcloud container execute the following commands on the server: ```bash docker exec -it -u www-data $NEXTCLOUD_APPLICATION_DOCKER_CONTAINER /var/www/html/occ maintenance:mode --on - sudo python /home/administrator/scripts/docker-volume-backup/docker-volume-backup.py + sudo python /home/administrator/scripts/server_docker-volume-backup/server_docker-volume-backup.py export COMPOSE_HTTP_TIMEOUT=600 export DOCKER_CLIENT_TIMEOUT=600 - cd /home/administrator/docker-compose/nextcloud && docker-compose down + cd /home/administrator/server_docker-compose/nextcloud && server_docker-compose down ``` Afterwards update the ***nextcloud_version*** variable to the next version and run the this repository with this ansible role. @@ -55,11 +55,11 @@ and disable the not functioning apps. ## recover latest backup ```bash -cd /home/administrator/docker-compose/nextcloud && -docker-compose down && -docker exec -i nextcloud_database_1 mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/docker-volume-backup/latest/nextcloud_database/sql/backup.sql" && -cd /home/administrator/scripts/docker-volume-backup && -bash ./docker-volume-recover.sh "nextcloud_data" "$(sha256sum /etc/machine-id | head -c 64)" +cd /home/administrator/server_docker-compose/nextcloud && +server_docker-compose down && +docker exec -i nextcloud_database_1 mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/server_docker-volume-backup/latest/nextcloud_database/sql/backup.sql" && +cd /home/administrator/scripts/server_docker-volume-backup && +bash ./server_docker-volume-recover.sh "nextcloud_data" "$(sha256sum /etc/machine-id | head -c 64)" ``` ## database @@ -124,15 +124,15 @@ Until NC24 MariaDB version has to be used. - https://help.nextcloud.com/t/solved-manual-lemp-install-php-fpm-timing-out/39070 ## further information -- https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml +- https://github.com/nextcloud/docker/blob/master/.examples/server_docker-compose/with-nginx-proxy/mariadb/fpm/server_docker-compose.yml - https://goneuland.de/nextcloud-upgrade-auf-neue-versionen-mittels-docker/ -- https://help.nextcloud.com/t/cant-start-nextcloud-because-the-version-of-the-data-is-higher-than-the-docker-image-version-and-downgrading-is-not-supported/109438 +- https://help.nextcloud.com/t/cant-start-nextcloud-because-the-version-of-the-data-is-higher-than-the-server_docker-image-version-and-downgrading-is-not-supported/109438 - https://github.com/nextcloud/docker/issues/1302 - https://help.nextcloud.com/t/update-to-22-failed-with-database-error-updated/120682 - https://help.nextcloud.com/t/nc-update-to-21-0-0-beta1-exception-database-error/101124/4 - https://wolfgang.gassler.org/reset-password-mariadb-mysql-docker/ -- https://unix.stackexchange.com/questions/478855/ansible-docker-container-and-depends-on -- https://github.com/gdiepen/docker-convenience-scripts +- https://unix.stackexchange.com/questions/478855/ansible-server_docker-container-and-depends-on +- https://github.com/gdiepen/server_docker-convenience-scripts - https://help.nextcloud.com/t/several-issues-after-upgrading-to-nextcloud-21/113118/3 -- https://forum.openmediavault.org/index.php?thread/31782-docker-nextcloud-talk-plugin-and-turnserver/ -- https://help.nextcloud.com/t/nextcloud-talk-im-docker-container-turn-server-auf-docker-host-kein-video/84133/10 +- https://forum.openmediavault.org/index.php?thread/31782-server_docker-nextcloud-talk-plugin-and-turnserver/ +- https://help.nextcloud.com/t/nextcloud-talk-im-server_docker-container-turn-server-auf-server_docker-host-kein-video/84133/10 diff --git a/roles/server_docker-nextcloud/handlers/main.yml b/roles/server_docker-nextcloud/handlers/main.yml index bba6641f..8124e483 100644 --- a/roles/server_docker-nextcloud/handlers/main.yml +++ b/roles/server_docker-nextcloud/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate nextcloud command: - cmd: docker-compose -p nextcloud up -d --force-recreate - chdir: /home/administrator/docker-compose/nextcloud/ + cmd: server_docker-compose -p nextcloud up -d --force-recreate + chdir: /home/administrator/server_docker-compose/nextcloud/ environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/server_docker-nextcloud/meta/main.yml b/roles/server_docker-nextcloud/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-nextcloud/meta/main.yml +++ b/roles/server_docker-nextcloud/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-nextcloud/tasks/main.yml b/roles/server_docker-nextcloud/tasks/main.yml index 832f6343..ef8658d6 100644 --- a/roles/server_docker-nextcloud/tasks/main.yml +++ b/roles/server_docker-nextcloud/tasks/main.yml @@ -16,12 +16,12 @@ template: src=templates/nginx.conf.j2 dest=/home/administrator/volumes/docker/nextcloud/nginx.conf notify: recreate nextcloud -- name: "create /home/administrator/docker-compose/nextcloud/" +- name: "create /home/administrator/server_docker-compose/nextcloud/" file: - path: "/home/administrator/docker-compose/nextcloud/" + path: "/home/administrator/server_docker-compose/nextcloud/" state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/nextcloud/docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/nextcloud/server_docker-compose.yml notify: recreate nextcloud diff --git a/roles/server_docker-nextcloud/templates/nextcloud.conf.j2 b/roles/server_docker-nextcloud/templates/nextcloud.conf.j2 index 5e02aeac..e791f021 100644 --- a/roles/server_docker-nextcloud/templates/nextcloud.conf.j2 +++ b/roles/server_docker-nextcloud/templates/nextcloud.conf.j2 @@ -2,7 +2,7 @@ server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/server_native-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/server_native-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/server_docker-peertube/README.md b/roles/server_docker-peertube/README.md index b172b777..3b8b3ae8 100644 --- a/roles/server_docker-peertube/README.md +++ b/roles/server_docker-peertube/README.md @@ -7,10 +7,10 @@ watch -n 2 "docker ps -a | grep peertube" ## clean rebuild ```bash -cd /home/administrator/docker-compose/peertube/ && -docker-compose down +cd /home/administrator/server_docker-compose/peertube/ && +server_docker-compose down docker volume rm peertube_assets peertube_config peertube_data peertube_database peertube_redis -docker-compose up -d +server_docker-compose up -d ``` ## access terminal diff --git a/roles/server_docker-peertube/handlers/main.yml b/roles/server_docker-peertube/handlers/main.yml index 6b935214..933ea804 100644 --- a/roles/server_docker-peertube/handlers/main.yml +++ b/roles/server_docker-peertube/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: recreate peertube command: - cmd: docker-compose -p peertube up -d --force-recreate + cmd: server_docker-compose -p peertube up -d --force-recreate chdir: "{{docker_compose_peertube_path}}" environment: COMPOSE_HTTP_TIMEOUT: 600 diff --git a/roles/server_docker-peertube/meta/main.yml b/roles/server_docker-peertube/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-peertube/meta/main.yml +++ b/roles/server_docker-peertube/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-peertube/tasks/main.yml b/roles/server_docker-peertube/tasks/main.yml index 83b70026..d09b7a75 100644 --- a/roles/server_docker-peertube/tasks/main.yml +++ b/roles/server_docker-peertube/tasks/main.yml @@ -12,8 +12,8 @@ state: directory mode: 0755 -- name: copy docker-compose.yml - template: src=docker-compose.yml.j2 dest={{docker_compose_peertube_path}}docker-compose.yml +- name: copy server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest={{docker_compose_peertube_path}}server_docker-compose.yml notify: recreate peertube - name: copy configuration diff --git a/roles/server_docker-peertube/templates/peertube.conf.j2 b/roles/server_docker-peertube/templates/peertube.conf.j2 index b1503de8..4f474a64 100644 --- a/roles/server_docker-peertube/templates/peertube.conf.j2 +++ b/roles/server_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/server_native-letsencrypt/templates/ssl_header.j2' %} ## # Application diff --git a/roles/server_docker-peertube/vars/main.yml b/roles/server_docker-peertube/vars/main.yml index ad0f030f..a468eb2f 100644 --- a/roles/server_docker-peertube/vars/main.yml +++ b/roles/server_docker-peertube/vars/main.yml @@ -1 +1 @@ -docker_compose_peertube_path: "/home/administrator/docker-compose/peertube/" +docker_compose_peertube_path: "/home/administrator/server_docker-compose/peertube/" diff --git a/roles/server_docker-pixelfed/README.md b/roles/server_docker-pixelfed/README.md index f67705dc..5dfc2cd1 100644 --- a/roles/server_docker-pixelfed/README.md +++ b/roles/server_docker-pixelfed/README.md @@ -1,26 +1,26 @@ -# role docker-pixelfed +# role server_docker-pixelfed ## hard cleanup ```bash -docker-compose down +server_docker-compose down docker volume rm pixelfed_application_data pixelfed_database pixelfed_redis_data ``` ## update ```bash -cd /home/administrator/docker-compose/pixelfed/ && -docker-compose down && +cd /home/administrator/server_docker-compose/pixelfed/ && +server_docker-compose down && docker network prune -f && -docker-compose pull && -docker-compose build && -docker-compose -p pixelfed up -d --force-recreate +server_docker-compose pull && +server_docker-compose build && +server_docker-compose -p pixelfed up -d --force-recreate ``` ## inspect ```bash -docker-compose ps -a -docker-compose logs -f +server_docker-compose ps -a +server_docker-compose logs -f ``` ## further information diff --git a/roles/server_docker-pixelfed/handlers/main.yml b/roles/server_docker-pixelfed/handlers/main.yml index 7eacd53a..1ebbb5f8 100644 --- a/roles/server_docker-pixelfed/handlers/main.yml +++ b/roles/server_docker-pixelfed/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate pixelfed command: - cmd: docker-compose -p pixelfed up -d --force-recreate - chdir: /home/administrator/docker-compose/pixelfed/ + cmd: server_docker-compose -p pixelfed up -d --force-recreate + chdir: /home/administrator/server_docker-compose/pixelfed/ environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/server_docker-pixelfed/meta/main.yml b/roles/server_docker-pixelfed/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-pixelfed/meta/main.yml +++ b/roles/server_docker-pixelfed/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-pixelfed/tasks/main.yml b/roles/server_docker-pixelfed/tasks/main.yml index 0fadaba9..1a099e09 100644 --- a/roles/server_docker-pixelfed/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" @@ -12,8 +12,8 @@ state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest={{docker_compose_path}}docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest={{docker_compose_path}}server_docker-compose.yml notify: recreate pixelfed - name: add env diff --git a/roles/server_docker-pixelfed/vars/main.yml b/roles/server_docker-pixelfed/vars/main.yml index 5418c5ec..f0fcbd26 100644 --- a/roles/server_docker-pixelfed/vars/main.yml +++ b/roles/server_docker-pixelfed/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_path: "/home/administrator/docker-compose/pixelfed/" +docker_compose_path: "/home/administrator/server_docker-compose/pixelfed/" client_max_body_size: "512M" diff --git a/roles/server_docker-roulette-wheel/handlers/main.yml b/roles/server_docker-roulette-wheel/handlers/main.yml index 96a4a963..c639b0fb 100644 --- a/roles/server_docker-roulette-wheel/handlers/main.yml +++ b/roles/server_docker-roulette-wheel/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: recreate and build roulette-wheel command: - cmd: docker-compose -p roulette-wheel up -d --force-recreate --build + cmd: server_docker-compose -p roulette-wheel up -d --force-recreate --build chdir: "{{docker_compose_path}}" environment: COMPOSE_HTTP_TIMEOUT: 600 diff --git a/roles/server_docker-roulette-wheel/meta/main.yml b/roles/server_docker-roulette-wheel/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-roulette-wheel/meta/main.yml +++ b/roles/server_docker-roulette-wheel/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-roulette-wheel/readme.md b/roles/server_docker-roulette-wheel/readme.md index 689dff46..816ee412 100644 --- a/roles/server_docker-roulette-wheel/readme.md +++ b/roles/server_docker-roulette-wheel/readme.md @@ -2,6 +2,6 @@ ## further information - https://github.com/p-wojt/roulette-wheel -- https://dev.to/ms314006/how-to-package-front-end-projects-into-docker-images-and-use-it-with-webpack-go3 -- https://stackoverflow.com/questions/53178820/dockerfile-to-run-nodejs-static-content-in-docker-container +- https://dev.to/ms314006/how-to-package-front-end-projects-into-server_docker-images-and-use-it-with-webpack-go3 +- https://stackoverflow.com/questions/53178820/dockerfile-to-run-nodejs-static-content-in-server_docker-container - https://stackoverflow.com/questions/43619644/i-am-getting-an-invalid-host-header-message-when-connecting-to-webpack-dev-ser \ No newline at end of file diff --git a/roles/server_docker-roulette-wheel/tasks/main.yml b/roles/server_docker-roulette-wheel/tasks/main.yml index 65cf9148..bd81bf35 100644 --- a/roles/server_docker-roulette-wheel/tasks/main.yml +++ b/roles/server_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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" @@ -20,8 +20,8 @@ notify: recreate and build roulette-wheel become: true -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest={{docker_compose_path}}docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest={{docker_compose_path}}server_docker-compose.yml notify: recreate and build roulette-wheel - name: add Dockerfile diff --git a/roles/server_docker-roulette-wheel/vars/main.yml b/roles/server_docker-roulette-wheel/vars/main.yml index d63ac859..56358aaf 100644 --- a/roles/server_docker-roulette-wheel/vars/main.yml +++ b/roles/server_docker-roulette-wheel/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_path: "/home/administrator/docker-compose/roulette-wheel/" -app_path: "/home/administrator/docker-compose/roulette-wheel/app/" \ No newline at end of file +docker_compose_path: "/home/administrator/server_docker-compose/roulette-wheel/" +app_path: "/home/administrator/server_docker-compose/roulette-wheel/app/" \ No newline at end of file diff --git a/roles/server_docker-turn-server/readme.md b/roles/server_docker-turn-server/readme.md index c7ef940b..a3c86f16 100644 --- a/roles/server_docker-turn-server/readme.md +++ b/roles/server_docker-turn-server/readme.md @@ -1,10 +1,10 @@ -#role docker-turn-server +#role server_docker-turn-server -May this service needs to be implemented for jitis. It's directly integrated in the docker compose file of role docker-nextcloud +May this service needs to be implemented for jitis. It's directly integrated in the docker compose file of role server_docker-nextcloud ## see - https://nextcloud-talk.readthedocs.io/en/latest/TURN/ - https://hub.docker.com/r/instrumentisto/coturn -- https://forum.openmediavault.org/index.php?thread/31782-docker-nextcloud-talk-plugin-and-turnserver/ -- https://markus-blog.de/index.php/2020/11/20/how-to-run-nextcloud-talk-high-performance-backend-with-stun-turnserver-on-ubuntu-with-docker-compose/ -- https://github.com/crazy-max/docker-nextcloud/issues/15 +- https://forum.openmediavault.org/index.php?thread/31782-server_docker-nextcloud-talk-plugin-and-turnserver/ +- https://markus-blog.de/index.php/2020/11/20/how-to-run-nextcloud-talk-high-performance-backend-with-stun-turnserver-on-ubuntu-with-server_docker-compose/ +- https://github.com/crazy-max/server_docker-nextcloud/issues/15 diff --git a/roles/server_docker-wordpress/README.md b/roles/server_docker-wordpress/README.md index e3780150..6c13b390 100644 --- a/roles/server_docker-wordpress/README.md +++ b/roles/server_docker-wordpress/README.md @@ -1,4 +1,4 @@ -# role docker-wordpress +# role server_docker-wordpress ## database diff --git a/roles/server_docker-wordpress/handlers/main.yml b/roles/server_docker-wordpress/handlers/main.yml index a0e69d58..5bc513f1 100644 --- a/roles/server_docker-wordpress/handlers/main.yml +++ b/roles/server_docker-wordpress/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate wordpress command: - cmd: docker-compose -p wordpress up -d --force-recreate - chdir: /home/administrator/docker-compose/wordpress/ + cmd: server_docker-compose -p wordpress up -d --force-recreate + chdir: /home/administrator/server_docker-compose/wordpress/ environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/server_docker-wordpress/meta/main.yml b/roles/server_docker-wordpress/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-wordpress/meta/main.yml +++ b/roles/server_docker-wordpress/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-wordpress/tasks/main.yml b/roles/server_docker-wordpress/tasks/main.yml index f8b1a383..35aaf2a8 100644 --- a/roles/server_docker-wordpress/tasks/main.yml +++ b/roles/server_docker-wordpress/tasks/main.yml @@ -7,16 +7,16 @@ 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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ item }}.conf loop: "{{domains}}" notify: restart nginx -- name: "create /home/administrator/docker-compose/wordpress/" +- name: "create /home/administrator/server_docker-compose/wordpress/" file: - path: "/home/administrator/docker-compose/wordpress/" + path: "/home/administrator/server_docker-compose/wordpress/" state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/wordpress/docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/wordpress/server_docker-compose.yml notify: recreate wordpress diff --git a/roles/server_docker-yourls/README.md b/roles/server_docker-yourls/README.md index 586c3b67..516976af 100644 --- a/roles/server_docker-yourls/README.md +++ b/roles/server_docker-yourls/README.md @@ -1,4 +1,4 @@ -# role docker-yourls +# role server_docker-yourls ## database diff --git a/roles/server_docker-yourls/handlers/main.yml b/roles/server_docker-yourls/handlers/main.yml index e31116c5..bc98fe31 100644 --- a/roles/server_docker-yourls/handlers/main.yml +++ b/roles/server_docker-yourls/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: recreate yourls command: - cmd: docker-compose -p yourls up -d --force-recreate - chdir: /home/administrator/docker-compose/yourls/ + cmd: server_docker-compose -p yourls up -d --force-recreate + chdir: /home/administrator/server_docker-compose/yourls/ environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/server_docker-yourls/meta/main.yml b/roles/server_docker-yourls/meta/main.yml index fb4d4f7b..da6fe221 100644 --- a/roles/server_docker-yourls/meta/main.yml +++ b/roles/server_docker-yourls/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-docker-reverse-proxy +- server_native-docker-reverse-proxy diff --git a/roles/server_docker-yourls/tasks/main.yml b/roles/server_docker-yourls/tasks/main.yml index ec9b0907..90ec4c84 100644 --- a/roles/server_docker-yourls/tasks/main.yml +++ b/roles/server_docker-yourls/tasks/main.yml @@ -3,15 +3,15 @@ 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/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx -- name: "create /home/administrator/docker-compose/yourls/" +- name: "create /home/administrator/server_docker-compose/yourls/" file: - path: "/home/administrator/docker-compose/yourls/" + path: "/home/administrator/server_docker-compose/yourls/" state: directory mode: 0755 -- name: add docker-compose.yml - template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/yourls/docker-compose.yml +- name: add server_docker-compose.yml + template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/yourls/server_docker-compose.yml notify: recreate yourls diff --git a/roles/server_native-backups-cleanup/README.md b/roles/server_native-backups-cleanup/README.md index 722bcfc9..bd617369 100644 --- a/roles/server_native-backups-cleanup/README.md +++ b/roles/server_native-backups-cleanup/README.md @@ -1,4 +1,4 @@ -# role native-backups-cleanup +# role server_native-backups-cleanup Cleans up old backups diff --git a/roles/server_native-backups-cleanup/meta/main.yml b/roles/server_native-backups-cleanup/meta/main.yml index 651a13b8..046da348 100644 --- a/roles/server_native-backups-cleanup/meta/main.yml +++ b/roles/server_native-backups-cleanup/meta/main.yml @@ -1,3 +1,3 @@ dependencies: - - native-python-pip - - native-systemd-email + - server_native-python-pip + - server_native-systemd-email diff --git a/roles/server_native-btrfs-health-check/meta/main.yml b/roles/server_native-btrfs-health-check/meta/main.yml index 9d9d34e2..40dfc526 100644 --- a/roles/server_native-btrfs-health-check/meta/main.yml +++ b/roles/server_native-btrfs-health-check/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - native-systemd-email + - server_native-systemd-email diff --git a/roles/server_native-certbot-nginx/meta/main.yml b/roles/server_native-certbot-nginx/meta/main.yml index 8b1d8d9a..b6aed93d 100644 --- a/roles/server_native-certbot-nginx/meta/main.yml +++ b/roles/server_native-certbot-nginx/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-nginx -- native-systemd-email +- server_native-nginx +- server_native-systemd-email diff --git a/roles/server_native-disc-space-check/meta/main.yml b/roles/server_native-disc-space-check/meta/main.yml index 9d9d34e2..40dfc526 100644 --- a/roles/server_native-disc-space-check/meta/main.yml +++ b/roles/server_native-disc-space-check/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - native-systemd-email + - server_native-systemd-email diff --git a/roles/server_native-docker-compose-restart-unhealthy/README.md b/roles/server_native-docker-compose-restart-unhealthy/README.md index 8bf0d0fe..84bcfe14 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/README.md +++ b/roles/server_native-docker-compose-restart-unhealthy/README.md @@ -1,2 +1,2 @@ -# native-docker-compose-restart-unhealthy -docker-compose restart for containers which are unhealty or excited \ No newline at end of file +# server_native-docker-compose-restart-unhealthy +server_docker-compose restart for containers which are unhealty or excited \ No newline at end of file diff --git a/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py b/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py index 7e0dee99..b691dc53 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py +++ b/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py @@ -1,6 +1,6 @@ #!/bin/python # -# restart docker-compose configurations who have exited or unhealthy containers +# restart server_docker-compose configurations who have exited or unhealthy containers # import subprocess import time @@ -30,7 +30,7 @@ waiting_time=600 backup_running=True while backup_running: try: - bash("systemctl is-active --quiet docker-volume-backup.service") + bash("systemctl is-active --quiet server_docker-volume-backup.service") print("backup is running.") print("trying again in " + str(waiting_time) + " seconds.") time.sleep(waiting_time) @@ -49,6 +49,6 @@ for failed_container in failed_containers: filtered_failed_docker_compose_repositories=list(dict.fromkeys(unfiltered_failed_docker_compose_repositories)) for filtered_failed_docker_compose_repository in filtered_failed_docker_compose_repositories: print("restarting unhealthy container: " + filtered_failed_docker_compose_repository) - print_bash('cd /home/administrator/docker-compose/' + filtered_failed_docker_compose_repository + '/ && docker-compose restart') + print_bash('cd /home/administrator/server_docker-compose/' + filtered_failed_docker_compose_repository + '/ && server_docker-compose restart') print("finished restart procedure.") \ No newline at end of file diff --git a/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml b/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml index d16bba4c..f753c4c0 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml +++ b/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml @@ -1,12 +1,12 @@ -- name: "reload docker-compose-restart-unhealthy.service" +- name: "reload server_docker-compose-restart-unhealthy.service" systemd: - name: docker-compose-restart-unhealthy.service + name: server_docker-compose-restart-unhealthy.service state: reloaded enabled: yes daemon_reload: yes -- name: "restart docker-compose-restart-unhealthy.timer" +- name: "restart server_docker-compose-restart-unhealthy.timer" systemd: - name: docker-compose-restart-unhealthy.timer + name: server_docker-compose-restart-unhealthy.timer state: restarted enabled: yes daemon_reload: yes diff --git a/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml b/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml index b3d9e773..9e117d6d 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml +++ b/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml @@ -4,19 +4,19 @@ state: directory mode: 0755 -- name: create docker-compose-restart-unhealthy.py +- name: create server_docker-compose-restart-unhealthy.py copy: - src: docker-compose-restart-unhealthy.py - dest: "{{docker_docker_compose_restart_unhealthy}}docker-compose-restart-unhealthy.py" + src: server_docker-compose-restart-unhealthy.py + dest: "{{docker_docker_compose_restart_unhealthy}}server_docker-compose-restart-unhealthy.py" -- name: create docker-compose-restart-unhealthy.service +- name: create server_docker-compose-restart-unhealthy.service template: - src: docker-compose-restart-unhealthy.service.j2 - dest: /etc/systemd/system/docker-compose-restart-unhealthy.service - notify: reload docker-compose-restart-unhealthy.service + src: server_docker-compose-restart-unhealthy.service.j2 + dest: /etc/systemd/system/server_docker-compose-restart-unhealthy.service + notify: reload server_docker-compose-restart-unhealthy.service -- name: create docker-compose-restart-unhealthy.timer +- name: create server_docker-compose-restart-unhealthy.timer template: - src: docker-compose-restart-unhealthy.timer.j2 - dest: "/etc/systemd/system/docker-compose-restart-unhealthy.timer" - notify: restart docker-compose-restart-unhealthy.timer \ No newline at end of file + src: server_docker-compose-restart-unhealthy.timer.j2 + dest: "/etc/systemd/system/server_docker-compose-restart-unhealthy.timer" + notify: restart server_docker-compose-restart-unhealthy.timer \ No newline at end of file diff --git a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 index f56c2faf..467320be 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 +++ b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 @@ -4,4 +4,4 @@ OnFailure=systemd-email@%n.service [Service] Type=oneshot -ExecStart=/bin/python {{docker_docker_compose_restart_unhealthy}}docker-compose-restart-unhealthy.py +ExecStart=/bin/python {{docker_docker_compose_restart_unhealthy}}server_docker-compose-restart-unhealthy.py diff --git a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 index 83c6da5d..b33db00e 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 +++ b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 @@ -1,5 +1,5 @@ [Unit] -Description=starts docker-compose-restart-unhealthy.service +Description=starts server_docker-compose-restart-unhealthy.service [Timer] OnCalendar={{on_calendar_docker_compose_restart_unhealthy}} diff --git a/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml b/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml index c1a26e1f..a9d22676 100644 --- a/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml +++ b/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml @@ -1 +1 @@ -docker_docker_compose_restart_unhealthy: "/home/administrator/scripts/docker-compose-restart-unhealthy/" \ No newline at end of file +docker_docker_compose_restart_unhealthy: "/home/administrator/scripts/server_docker-compose-restart-unhealthy/" \ No newline at end of file diff --git a/roles/server_native-docker-health-check/handlers/main.yml b/roles/server_native-docker-health-check/handlers/main.yml index cdaa75db..12b9d130 100644 --- a/roles/server_native-docker-health-check/handlers/main.yml +++ b/roles/server_native-docker-health-check/handlers/main.yml @@ -1,12 +1,12 @@ -- name: "reload docker-health-check.service" +- name: "reload server_docker-health-check.service" systemd: - name: docker-health-check.service + name: server_docker-health-check.service state: reloaded enabled: yes daemon_reload: yes -- name: "restart docker-health-check.timer" +- name: "restart server_docker-health-check.timer" systemd: - name: docker-health-check.timer + name: server_docker-health-check.timer state: restarted enabled: yes daemon_reload: yes diff --git a/roles/server_native-docker-health-check/meta/main.yml b/roles/server_native-docker-health-check/meta/main.yml index 9d9d34e2..40dfc526 100644 --- a/roles/server_native-docker-health-check/meta/main.yml +++ b/roles/server_native-docker-health-check/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - native-systemd-email + - server_native-systemd-email diff --git a/roles/server_native-docker-health-check/tasks/main.yml b/roles/server_native-docker-health-check/tasks/main.yml index aeecbd72..5fba92ac 100644 --- a/roles/server_native-docker-health-check/tasks/main.yml +++ b/roles/server_native-docker-health-check/tasks/main.yml @@ -4,17 +4,17 @@ state: directory mode: 0755 -- name: create docker-health-check.sh +- name: create server_docker-health-check.sh copy: - src: docker-health-check.sh - dest: "{{docker_health_check_folder}}docker-health-check.sh" + src: server_docker-health-check.sh + dest: "{{docker_health_check_folder}}server_docker-health-check.sh" -- name: create docker-health-check.service - template: src=docker-health-check.service.j2 dest=/etc/systemd/system/docker-health-check.service - notify: reload docker-health-check.service +- name: create server_docker-health-check.service + template: src=server_docker-health-check.service.j2 dest=/etc/systemd/system/server_docker-health-check.service + notify: reload server_docker-health-check.service -- name: create docker-health-check.timer +- name: create server_docker-health-check.timer template: - src: docker-health-check.timer.j2 - dest: "/etc/systemd/system/docker-health-check.timer" - notify: restart docker-health-check.timer + src: server_docker-health-check.timer.j2 + dest: "/etc/systemd/system/server_docker-health-check.timer" + notify: restart server_docker-health-check.timer diff --git a/roles/server_native-docker-health-check/templates/docker-health-check.service.j2 b/roles/server_native-docker-health-check/templates/docker-health-check.service.j2 index 0e921b32..45827470 100644 --- a/roles/server_native-docker-health-check/templates/docker-health-check.service.j2 +++ b/roles/server_native-docker-health-check/templates/docker-health-check.service.j2 @@ -4,4 +4,4 @@ OnFailure=systemd-email@%n.service [Service] Type=oneshot -ExecStart=/bin/bash {{docker_health_check_folder}}docker-health-check.sh +ExecStart=/bin/bash {{docker_health_check_folder}}server_docker-health-check.sh diff --git a/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2 b/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2 index 5f38e35e..200b5375 100644 --- a/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2 +++ b/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2 @@ -1,5 +1,5 @@ [Unit] -Description=starts docker-health-check.service +Description=starts server_docker-health-check.service [Timer] OnCalendar={{on_calendar_docker_health_check}} diff --git a/roles/server_native-docker-health-check/vars/main.yml b/roles/server_native-docker-health-check/vars/main.yml index 935fb810..eda8b6d1 100644 --- a/roles/server_native-docker-health-check/vars/main.yml +++ b/roles/server_native-docker-health-check/vars/main.yml @@ -1 +1 @@ -docker_health_check_folder: "/home/administrator/scripts/docker-health-check/" \ No newline at end of file +docker_health_check_folder: "/home/administrator/scripts/server_docker-health-check/" \ No newline at end of file diff --git a/roles/server_native-docker-reverse-proxy/README.md b/roles/server_native-docker-reverse-proxy/README.md index e9df5f0b..df31e4d8 100644 --- a/roles/server_native-docker-reverse-proxy/README.md +++ b/roles/server_native-docker-reverse-proxy/README.md @@ -1,4 +1,4 @@ -# role native-docker-reverse-proxy +# role server_native-docker-reverse-proxy Uses nginx as an [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy) for local docker applications. @@ -16,4 +16,4 @@ curl -I {{address}} - https://askubuntu.com/questions/1103626/should-i-enable-client-max-body-size-proxy-request-buffering-and-proxy-bufferin - https://serverfault.com/questions/692577/whats-the-difference-between-proxy-buffer-and-proxy-cache-module-in-nginx-confi - https://github.com/sissbruecker/linkding/issues/88 -- https://www.bogotobogo.com/DevOps/Docker/Docker-Compose-Nginx-Reverse-Proxy-Multiple-Containers.php +- https://www.bogotobogo.com/DevOps/Docker/server_docker-Compose-Nginx-Reverse-Proxy-Multiple-Containers.php diff --git a/roles/server_native-docker-reverse-proxy/meta/main.yml b/roles/server_native-docker-reverse-proxy/meta/main.yml index d33a1cab..2fdc54a2 100644 --- a/roles/server_native-docker-reverse-proxy/meta/main.yml +++ b/roles/server_native-docker-reverse-proxy/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-docker -- native-https-server +- server_native-docker +- server_native-https-server diff --git a/roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 b/roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 index 6482acf1..5da2084a 100644 --- a/roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 +++ b/roles/server_native-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/server_native-letsencrypt/templates/ssl_header.j2' %} {% include 'proxy_pass.conf.j2' %} diff --git a/roles/server_native-docker-volume-backup/handlers/main.yml b/roles/server_native-docker-volume-backup/handlers/main.yml index 1cb7373e..e02d1084 100644 --- a/roles/server_native-docker-volume-backup/handlers/main.yml +++ b/roles/server_native-docker-volume-backup/handlers/main.yml @@ -1,12 +1,12 @@ -- name: "reload docker-volume-backup service" +- name: "reload server_docker-volume-backup service" systemd: - name: docker-volume-backup.service + name: server_docker-volume-backup.service state: reloaded enabled: yes daemon_reload: yes -- name: "restart docker-volume-backup timer" +- name: "restart server_docker-volume-backup timer" systemd: - name: docker-volume-backup.timer + name: server_docker-volume-backup.timer state: restarted enabled: yes daemon_reload: yes diff --git a/roles/server_native-docker-volume-backup/meta/main.yml b/roles/server_native-docker-volume-backup/meta/main.yml index c0151232..345a9ba5 100644 --- a/roles/server_native-docker-volume-backup/meta/main.yml +++ b/roles/server_native-docker-volume-backup/meta/main.yml @@ -1,4 +1,4 @@ dependencies: - - native-git - - native-primary-backup - - native-systemd-email + - server_native-git + - server_native-primary-backup + - server_native-systemd-email diff --git a/roles/server_native-docker-volume-backup/tasks/main.yml b/roles/server_native-docker-volume-backup/tasks/main.yml index d63ae3e2..8bfee35d 100644 --- a/roles/server_native-docker-volume-backup/tasks/main.yml +++ b/roles/server_native-docker-volume-backup/tasks/main.yml @@ -2,21 +2,21 @@ pip: name: pandas -- name: pull docker-volume-backup.git +- name: pull server_docker-volume-backup.git git: - repo: "https://github.com/kevinveenbirkenbach/docker-volume-backup.git" + repo: "https://github.com/kevinveenbirkenbach/server_docker-volume-backup.git" dest: "{{docker_volume_backup_folder}}" update: yes -- name: configure docker-volume-backup.service +- name: configure server_docker-volume-backup.service template: - src: docker-volume-backup.service.j2 - dest: /etc/systemd/system/docker-volume-backup.service - notify: reload docker-volume-backup service + src: server_docker-volume-backup.service.j2 + dest: /etc/systemd/system/server_docker-volume-backup.service + notify: reload server_docker-volume-backup service -- name: configure docker-volume-backup.timer.tpl - template: src=docker-volume-backup.timer.j2 dest=/etc/systemd/system/docker-volume-backup.timer - notify: restart docker-volume-backup timer +- name: configure server_docker-volume-backup.timer.tpl + template: src=server_docker-volume-backup.timer.j2 dest=/etc/systemd/system/server_docker-volume-backup.timer + notify: restart server_docker-volume-backup timer - name: create {{docker_volume_backup_folder}}databases.csv copy: diff --git a/roles/server_native-docker-volume-backup/templates/docker-volume-backup.service.j2 b/roles/server_native-docker-volume-backup/templates/docker-volume-backup.service.j2 index 5f73093e..7b9ccdad 100644 --- a/roles/server_native-docker-volume-backup/templates/docker-volume-backup.service.j2 +++ b/roles/server_native-docker-volume-backup/templates/docker-volume-backup.service.j2 @@ -4,4 +4,4 @@ OnFailure=systemd-email@%n.service [Service] Type=oneshot -ExecStart=/usr/bin/python {{docker_volume_backup_folder}}docker-volume-backup.py \ No newline at end of file +ExecStart=/usr/bin/python {{docker_volume_backup_folder}}server_docker-volume-backup.py \ No newline at end of file diff --git a/roles/server_native-docker-volume-backup/vars/main.yml b/roles/server_native-docker-volume-backup/vars/main.yml index d73c2dea..af091388 100644 --- a/roles/server_native-docker-volume-backup/vars/main.yml +++ b/roles/server_native-docker-volume-backup/vars/main.yml @@ -1 +1 @@ -docker_volume_backup_folder: "/home/administrator/scripts/docker-volume-backup/" \ No newline at end of file +docker_volume_backup_folder: "/home/administrator/scripts/server_docker-volume-backup/" \ No newline at end of file diff --git a/roles/server_native-docker/Readme.md b/roles/server_native-docker/Readme.md index 332c10b2..672cc686 100644 --- a/roles/server_native-docker/Readme.md +++ b/roles/server_native-docker/Readme.md @@ -1,4 +1,4 @@ -# role native-docker +# role server_native-docker ## maintanance @@ -16,4 +16,4 @@ - https://forums.docker.com/t/mysql-slow-performance-in-docker/37179/21 ## see -- https://stackoverflow.com/questions/37599128/docker-how-do-you-disable-auto-restart-on-a-container +- https://stackoverflow.com/questions/37599128/server_docker-how-do-you-disable-auto-restart-on-a-container diff --git a/roles/server_native-docker/meta/main.yml b/roles/server_native-docker/meta/main.yml index baa65ef5..f21023ce 100644 --- a/roles/server_native-docker/meta/main.yml +++ b/roles/server_native-docker/meta/main.yml @@ -1,5 +1,5 @@ dependencies: - - native-docker-volume-backup - - native-user-administrator - - native-docker-health-check - - native-docker-compose-restart-unhealthy + - server_native-docker-volume-backup + - server_native-user-administrator + - server_native-docker-health-check + - server_native-docker-compose-restart-unhealthy diff --git a/roles/server_native-docker/tasks/main.yml b/roles/server_native-docker/tasks/main.yml index 80b5f1a5..18e2d552 100644 --- a/roles/server_native-docker/tasks/main.yml +++ b/roles/server_native-docker/tasks/main.yml @@ -1,13 +1,13 @@ --- - name: docker & docker compose install pacman: - name: ['docker','docker-compose'] + name: ['docker','server_docker-compose'] state: present notify: docker restart -- name: "create /home/administrator/docker-compose/" +- name: "create /home/administrator/server_docker-compose/" file: - path: "/home/administrator/docker-compose" + path: "/home/administrator/server_docker-compose" state: directory mode: 0700 owner: administrator diff --git a/roles/server_native-free-disc-space/meta/main.yml b/roles/server_native-free-disc-space/meta/main.yml index 9d9d34e2..40dfc526 100644 --- a/roles/server_native-free-disc-space/meta/main.yml +++ b/roles/server_native-free-disc-space/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - native-systemd-email + - server_native-systemd-email diff --git a/roles/server_native-homepage/meta/main.yml b/roles/server_native-homepage/meta/main.yml index de989663..5abfdf71 100644 --- a/roles/server_native-homepage/meta/main.yml +++ b/roles/server_native-homepage/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-https-server -- native-git +- server_native-https-server +- server_native-git diff --git a/roles/server_native-homepage/templates/homepage.nginx.conf.j2 b/roles/server_native-homepage/templates/homepage.nginx.conf.j2 index ee9fa97c..f5f6ad6c 100644 --- a/roles/server_native-homepage/templates/homepage.nginx.conf.j2 +++ b/roles/server_native-homepage/templates/homepage.nginx.conf.j2 @@ -3,7 +3,7 @@ server { server_name {{domain}}; - {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} charset utf-8; diff --git a/roles/server_native-https-redirect/meta/main.yml b/roles/server_native-https-redirect/meta/main.yml index 5f4b1fe4..9a436d26 100644 --- a/roles/server_native-https-redirect/meta/main.yml +++ b/roles/server_native-https-redirect/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-https-server +- server_native-https-server diff --git a/roles/server_native-https-redirect/templates/redirect.domain.nginx.conf.j2 b/roles/server_native-https-redirect/templates/redirect.domain.nginx.conf.j2 index 45a234d7..6a6e502a 100644 --- a/roles/server_native-https-redirect/templates/redirect.domain.nginx.conf.j2 +++ b/roles/server_native-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/server_native-letsencrypt/templates/ssl_header.j2' %} return 301 https://{{target_domain}}$request_uri; } diff --git a/roles/server_native-https-server/meta/main.yml b/roles/server_native-https-server/meta/main.yml index 5a1624c3..ce86e704 100644 --- a/roles/server_native-https-server/meta/main.yml +++ b/roles/server_native-https-server/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-nginx -- native-letsencrypt +- server_native-nginx +- server_native-letsencrypt diff --git a/roles/server_native-journalctl-health-check/meta/main.yml b/roles/server_native-journalctl-health-check/meta/main.yml index 9d9d34e2..40dfc526 100644 --- a/roles/server_native-journalctl-health-check/meta/main.yml +++ b/roles/server_native-journalctl-health-check/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - native-systemd-email + - server_native-systemd-email diff --git a/roles/server_native-journalctl/README.md b/roles/server_native-journalctl/README.md index cd9cdfcb..9d5cd0a5 100644 --- a/roles/server_native-journalctl/README.md +++ b/roles/server_native-journalctl/README.md @@ -1,4 +1,4 @@ -# role native-journalctl +# role server_native-journalctl # live monitoring diff --git a/roles/server_native-journalctl/meta/main.yml b/roles/server_native-journalctl/meta/main.yml index 75444eba..8dfbb13d 100644 --- a/roles/server_native-journalctl/meta/main.yml +++ b/roles/server_native-journalctl/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - native-journalctl-health-check + - server_native-journalctl-health-check diff --git a/roles/server_native-letsencrypt/meta/main.yml b/roles/server_native-letsencrypt/meta/main.yml index a2823175..19cf0490 100644 --- a/roles/server_native-letsencrypt/meta/main.yml +++ b/roles/server_native-letsencrypt/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-certbot-nginx +- server_native-certbot-nginx diff --git a/roles/server_native-nginx/readme.md b/roles/server_native-nginx/readme.md index 9a5d5b6c..07a47aa1 100644 --- a/roles/server_native-nginx/readme.md +++ b/roles/server_native-nginx/readme.md @@ -1,4 +1,4 @@ -# role native-nginx +# role server_native-nginx ## debug ```bash @@ -11,4 +11,4 @@ journalctl -f -u nginx - https://www.nginx.com/blog/performance-tuning-tips-tricks/ - https://medium.com/pixelpoint/best-practices-for-cache-control-settings-for-your-website-ff262b38c5a2 - https://www.nginx.com/blog/nginx-caching-guide/ -- https://meta.discourse.org/t/using-nginx-as-proxy-server-is-very-slow-but-it-is-very-fast-if-using-nginx-in-docker-why/168972 +- https://meta.discourse.org/t/using-nginx-as-proxy-server-is-very-slow-but-it-is-very-fast-if-using-nginx-in-server_docker-why/168972 diff --git a/roles/server_native-postfix/meta/main.yml b/roles/server_native-postfix/meta/main.yml index cd801777..c1ded5b5 100644 --- a/roles/server_native-postfix/meta/main.yml +++ b/roles/server_native-postfix/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-user-administrator +- server_native-user-administrator diff --git a/roles/server_native-primary-backup/README.md b/roles/server_native-primary-backup/README.md index 0caf853e..7f4a545f 100644 --- a/roles/server_native-primary-backup/README.md +++ b/roles/server_native-primary-backup/README.md @@ -1,4 +1,4 @@ -# role native-primary-backup-host +# role server_native-primary-backup-host ## todo - add full system backup diff --git a/roles/server_native-primary-backup/meta/main.yml b/roles/server_native-primary-backup/meta/main.yml index 8ac518b9..f01c7b1b 100644 --- a/roles/server_native-primary-backup/meta/main.yml +++ b/roles/server_native-primary-backup/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-user-backup -- native-backups-cleanup +- server_native-user-backup +- server_native-backups-cleanup diff --git a/roles/server_native-pull-primary-backups/README.md b/roles/server_native-pull-primary-backups/README.md index 767287ca..a6f19fba 100644 --- a/roles/server_native-pull-primary-backups/README.md +++ b/roles/server_native-pull-primary-backups/README.md @@ -1,4 +1,4 @@ -# role native-pull-primary-backups +# role server_native-pull-primary-backups ## goal This script allows to pull backups from a remote server. diff --git a/roles/server_native-pull-primary-backups/meta/main.yml b/roles/server_native-pull-primary-backups/meta/main.yml index ebe7e3cf..f9a3a4f7 100644 --- a/roles/server_native-pull-primary-backups/meta/main.yml +++ b/roles/server_native-pull-primary-backups/meta/main.yml @@ -1,4 +1,4 @@ dependencies: - - native-git - - native-systemd-email - - native-backups-cleanup + - server_native-git + - server_native-systemd-email + - server_native-backups-cleanup diff --git a/roles/server_native-sshd/meta/main.yml b/roles/server_native-sshd/meta/main.yml index cd801777..c1ded5b5 100644 --- a/roles/server_native-sshd/meta/main.yml +++ b/roles/server_native-sshd/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-user-administrator +- server_native-user-administrator diff --git a/roles/server_native-sshd/readme.md b/roles/server_native-sshd/readme.md index e30d795d..1a9f9d7a 100644 --- a/roles/server_native-sshd/readme.md +++ b/roles/server_native-sshd/readme.md @@ -1,7 +1,7 @@ -# role native-sshd +# role server_native-sshd ## dependencies This role depends on that a well configured user administrator exist. -For this reason this role depends on the role native-user-administrator. +For this reason this role depends on the role server_native-user-administrator. A wrong configuration of this role can lead to an lockout of the system which just will be reversal via chroot. ## PAM diff --git a/roles/server_native-systemd-email/readme.md b/roles/server_native-systemd-email/readme.md index cf896b6c..ea1c19b0 100644 --- a/roles/server_native-systemd-email/readme.md +++ b/roles/server_native-systemd-email/readme.md @@ -1,4 +1,4 @@ -# native-systemd-mail +# server_native-systemd-mail # see - https://wiki.archlinux.org/index.php/Systemd/Timers#MAILTO diff --git a/roles/server_native-user-administrator/meta/main.yml b/roles/server_native-user-administrator/meta/main.yml index fb092791..fe8d11f1 100644 --- a/roles/server_native-user-administrator/meta/main.yml +++ b/roles/server_native-user-administrator/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-sudo +- server_native-sudo diff --git a/roles/server_native-user-backup/meta/main.yml b/roles/server_native-user-backup/meta/main.yml index 94856f23..be441c6b 100644 --- a/roles/server_native-user-backup/meta/main.yml +++ b/roles/server_native-user-backup/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-sshd +- server_native-sshd diff --git a/roles/server_native-user-backup/readme.md b/roles/server_native-user-backup/readme.md index b651c8ab..f0d4213f 100644 --- a/roles/server_native-user-backup/readme.md +++ b/roles/server_native-user-backup/readme.md @@ -1,4 +1,4 @@ -# role native-user-backup +# role server_native-user-backup User for backups ## todo diff --git a/roles/server_native-user-backup/templates/ssh-wrapper.sh.j2 b/roles/server_native-user-backup/templates/ssh-wrapper.sh.j2 index 2eb92b9d..d20e2577 100644 --- a/roles/server_native-user-backup/templates/ssh-wrapper.sh.j2 +++ b/roles/server_native-user-backup/templates/ssh-wrapper.sh.j2 @@ -10,8 +10,8 @@ fi get_hashed_machine_id="sha256sum /etc/machine-id"; get_backup_types="find /Backups/{{hashed_machine_id.stdout}}/ -maxdepth 1 -type d -execdir basename {} ;"; -# @todo This configuration is not scalable yet. If other backup services then docker-volume-backup are integrated, this logic needs to be optimized -get_static_last_version_dir="readlink -f /Backups/{{hashed_machine_id.stdout}}/docker-volume-backup/latest" +# @todo This configuration is not scalable yet. If other backup services then server_docker-volume-backup are integrated, this logic needs to be optimized +get_static_last_version_dir="readlink -f /Backups/{{hashed_machine_id.stdout}}/server_docker-volume-backup/latest" rsync_command="sudo rsync --server --sender -blogDtpre.iLsfxCIvu . $($get_static_last_version_dir)/" # filter commands diff --git a/roles/server_native-wireguard-behind-firewall/meta/main.yml b/roles/server_native-wireguard-behind-firewall/meta/main.yml index a40e71bb..e59f3444 100644 --- a/roles/server_native-wireguard-behind-firewall/meta/main.yml +++ b/roles/server_native-wireguard-behind-firewall/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-wireguard +- server_native-wireguard diff --git a/roles/server_native-wireguard-behind-firewall/readme.md b/roles/server_native-wireguard-behind-firewall/readme.md index 538ad998..78bb5cf9 100644 --- a/roles/server_native-wireguard-behind-firewall/readme.md +++ b/roles/server_native-wireguard-behind-firewall/readme.md @@ -1,4 +1,4 @@ -# native-wireguard-behind-nat +# server_native-wireguard-behind-nat # see - https://gist.github.com/insdavm/b1034635ab23b8839bf957aa406b5e39 diff --git a/roles/server_system-security/meta/main.yml b/roles/server_system-security/meta/main.yml index 34b93177..3741c80c 100644 --- a/roles/server_system-security/meta/main.yml +++ b/roles/server_system-security/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- native-user-alarm -- native-sshd +- server_native-user-alarm +- server_native-sshd