From a20486bb025ab372473a566e1302382d40341384 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 22 Aug 2023 23:56:56 +0200 Subject: [PATCH] removed server_ --- roles/docker-akaunting/README.md | 6 +++--- roles/docker-akaunting/meta/main.yml | 2 +- roles/docker-akaunting/tasks/main.yml | 2 +- roles/docker-attendize/README.md | 2 +- roles/docker-attendize/meta/main.yml | 2 +- roles/docker-attendize/tasks/main.yml | 4 ++-- roles/docker-bigbluebutton/README.md | 4 ++-- roles/docker-bigbluebutton/meta/main.yml | 2 +- roles/docker-elk/Readme.md | 6 +++--- roles/docker-elk/defaults/main.yml | 2 +- roles/docker-elk/handlers/main.yml | 2 +- roles/docker-elk/meta/main.yml | 2 +- roles/docker-elk/tasks/main.yml | 18 +++++++++--------- .../docker-elk/templates/elasticsearch.yml.j2 | 2 +- roles/docker-funkwhale/meta/main.yml | 2 +- roles/docker-funkwhale/tasks/main.yml | 2 +- roles/docker-funkwhale/templates/env.j2 | 2 +- roles/docker-gitea/README.md | 2 +- roles/docker-gitea/meta/main.yml | 2 +- roles/docker-gitea/tasks/main.yml | 2 +- roles/docker-jenkins/meta/main.yml | 2 +- roles/docker-jenkins/tasks/main.yml | 2 +- roles/docker-joomla/README.md | 2 +- roles/docker-joomla/meta/main.yml | 2 +- roles/docker-joomla/tasks/main.yml | 2 +- roles/docker-mailu/README.md | 2 +- roles/docker-mailu/meta/main.yml | 2 +- roles/docker-mailu/tasks/main.yml | 2 +- roles/docker-mastodon/README.md | 2 +- roles/docker-mastodon/meta/main.yml | 2 +- .../docker-mastodon/templates/mastodon.conf.j2 | 4 ++-- roles/docker-mediawiki/README.md | 2 +- roles/docker-mediawiki/meta/main.yml | 2 +- roles/docker-mediawiki/tasks/main.yml | 2 +- roles/docker-mybb/meta/main.yml | 2 +- roles/docker-mybb/tasks/main.yml | 2 +- roles/docker-nextcloud/README.md | 14 +++++++------- roles/docker-nextcloud/meta/main.yml | 2 +- .../templates/nextcloud.conf.j2 | 4 ++-- roles/docker-peertube/meta/main.yml | 2 +- .../docker-peertube/templates/peertube.conf.j2 | 2 +- roles/docker-pixelfed/README.md | 2 +- roles/docker-pixelfed/meta/main.yml | 2 +- roles/docker-pixelfed/tasks/main.yml | 2 +- roles/docker-roulette-wheel/meta/main.yml | 2 +- roles/docker-roulette-wheel/readme.md | 4 ++-- roles/docker-roulette-wheel/tasks/main.yml | 2 +- roles/docker-wordpress/README.md | 2 +- roles/docker-wordpress/meta/main.yml | 2 +- roles/docker-wordpress/tasks/main.yml | 2 +- roles/docker-yourls/README.md | 2 +- roles/docker-yourls/meta/main.yml | 2 +- roles/docker-yourls/tasks/main.yml | 2 +- roles/native-backups-consumer/README.md | 2 +- roles/native-backups-consumer/meta/main.yml | 2 +- .../native-backups-provider-user/meta/main.yml | 2 +- roles/native-backups-provider-user/readme.md | 2 +- roles/native-backups-provider/README.md | 2 +- roles/native-backups-provider/meta/main.yml | 2 +- roles/native-certbot-nginx/meta/main.yml | 2 +- .../README.md | 2 +- roles/native-docker-health-check/vars/main.yml | 2 +- roles/native-docker-reverse-proxy/README.md | 2 +- .../native-docker-reverse-proxy/meta/main.yml | 4 ++-- .../templates/domain.conf.j2 | 2 +- .../native-docker-volume-backup/meta/main.yml | 4 ++-- roles/native-docker/Readme.md | 4 ++-- roles/native-docker/meta/main.yml | 8 ++++---- roles/native-homepage/meta/main.yml | 4 ++-- .../templates/homepage.nginx.conf.j2 | 2 +- roles/native-https-redirect/meta/main.yml | 2 +- .../templates/redirect.domain.nginx.conf.j2 | 2 +- roles/native-https-server/meta/main.yml | 4 ++-- roles/native-journalctl/README.md | 2 +- roles/native-journalctl/meta/main.yml | 2 +- roles/native-letsencrypt/meta/main.yml | 2 +- roles/native-nginx/readme.md | 4 ++-- roles/native-postfix/meta/main.yml | 2 +- roles/native-sshd/README.md | 4 ++-- roles/native-sshd/meta/main.yml | 2 +- roles/system-security/meta/main.yml | 4 ++-- roles/user-administrator/meta/main.yml | 2 +- 82 files changed, 116 insertions(+), 116 deletions(-) diff --git a/roles/docker-akaunting/README.md b/roles/docker-akaunting/README.md index 2f07ebb9..b1b55393 100644 --- a/roles/docker-akaunting/README.md +++ b/roles/docker-akaunting/README.md @@ -82,9 +82,9 @@ docker-compose -p akaunting up -d --force-recreate # recover all volumes cd {{path_administrator_scripts}}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 +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 ``` diff --git a/roles/docker-akaunting/meta/main.yml b/roles/docker-akaunting/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-akaunting/meta/main.yml +++ b/roles/docker-akaunting/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-akaunting/tasks/main.yml b/roles/docker-akaunting/tasks/main.yml index 8fe5ebe6..bed781f6 100644 --- a/roles/docker-akaunting/tasks/main.yml +++ b/roles/docker-akaunting/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/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/docker-attendize/README.md b/roles/docker-attendize/README.md index d3a58092..3eec25a6 100644 --- a/roles/docker-attendize/README.md +++ b/roles/docker-attendize/README.md @@ -1,4 +1,4 @@ -# Role: server_docker-attendize +# Role: docker-attendize This Ansible role sets up Attendize, an open-source ticket selling and event management platform. diff --git a/roles/docker-attendize/meta/main.yml b/roles/docker-attendize/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-attendize/meta/main.yml +++ b/roles/docker-attendize/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-attendize/tasks/main.yml b/roles/docker-attendize/tasks/main.yml index f364d1a6..8d6320c6 100644 --- a/roles/docker-attendize/tasks/main.yml +++ b/roles/docker-attendize/tasks/main.yml @@ -7,13 +7,13 @@ - name: configure {{domain}}.conf template: - src: roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 + src: roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest: /etc/nginx/conf.d/{{domain}}.conf notify: restart nginx #- name: configure {{ mail_interface_domain }}.conf # template: -# src: roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 +# src: roles/native-docker-reverse-proxy/templates/domain.conf.j2 # dest: /etc/nginx/conf.d/{{ mail_interface_domain }}.conf # vars: # http_port: "{{ mail_interface_http_port }}" diff --git a/roles/docker-bigbluebutton/README.md b/roles/docker-bigbluebutton/README.md index 7b40e309..3bfa7091 100644 --- a/roles/docker-bigbluebutton/README.md +++ b/roles/docker-bigbluebutton/README.md @@ -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-server_docker-und-traefik-installieren/ +- https://goneuland.de/big-blue-button-mit-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/server_docker-network-not-found \ No newline at end of file +- https://stackoverflow.com/questions/53347951/docker-network-not-found \ No newline at end of file diff --git a/roles/docker-bigbluebutton/meta/main.yml b/roles/docker-bigbluebutton/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-bigbluebutton/meta/main.yml +++ b/roles/docker-bigbluebutton/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-elk/Readme.md b/roles/docker-elk/Readme.md index 1f97bfed..03f2618d 100644 --- a/roles/docker-elk/Readme.md +++ b/roles/docker-elk/Readme.md @@ -1,4 +1,4 @@ -# role server_docker-elk +# role 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/server_docker-elk -- https://logz.io/blog/server_docker-logging/ +- https://github.com/kevinveenbirkenbach/docker-elk +- https://logz.io/blog/docker-logging/ diff --git a/roles/docker-elk/defaults/main.yml b/roles/docker-elk/defaults/main.yml index cb705af5..303afa19 100644 --- a/roles/docker-elk/defaults/main.yml +++ b/roles/docker-elk/defaults/main.yml @@ -1,2 +1,2 @@ --- -docker_elk_compose_path: "/srv/github.com/kevinveenbirkenbach/server_docker-elk/" +docker_elk_compose_path: "/srv/github.com/kevinveenbirkenbach/docker-elk/" diff --git a/roles/docker-elk/handlers/main.yml b/roles/docker-elk/handlers/main.yml index 96c781e1..e295b64c 100644 --- a/roles/docker-elk/handlers/main.yml +++ b/roles/docker-elk/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: recreate server_docker-elk +- name: recreate docker-elk command: cmd: docker-compose up -d --force-recreate chdir: "{{docker_elk_compose_path}}" diff --git a/roles/docker-elk/meta/main.yml b/roles/docker-elk/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-elk/meta/main.yml +++ b/roles/docker-elk/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-elk/tasks/main.yml b/roles/docker-elk/tasks/main.yml index ff1ddaf6..f558f484 100644 --- a/roles/docker-elk/tasks/main.yml +++ b/roles/docker-elk/tasks/main.yml @@ -4,7 +4,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: create elasticsearch-sysctl.conf @@ -24,12 +24,12 @@ state: directory mode: 0755 -- name: git pull server_docker-elk +- name: git pull docker-elk git: - repo: "https://github.com/kevinveenbirkenbach/server_docker-elk.git" + repo: "https://github.com/kevinveenbirkenbach/docker-elk.git" dest: "{{docker_elk_compose_path}}" update: yes - notify: recreate server_docker-elk + notify: recreate docker-elk register: git_result ignore_errors: true @@ -40,20 +40,20 @@ - name: copy docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_elk_compose_path}}docker-compose.yml - notify: recreate server_docker-elk + notify: recreate docker-elk - name: copy elasticsearch.yml template: src=elasticsearch.yml.j2 dest={{docker_elk_compose_path}}elasticsearch/config/elasticsearch.yml - notify: recreate server_docker-elk + notify: recreate docker-elk - name: copy kibana.yml template: src=kibana.yml.j2 dest={{docker_elk_compose_path}}kibana/config/kibana.yml - notify: recreate server_docker-elk + notify: recreate docker-elk - name: copy logstash.yml template: src=logstash.yml.j2 dest={{docker_elk_compose_path}}logstash/config/logstash.yml - notify: recreate server_docker-elk + notify: recreate docker-elk - name: copy logstash.conf template: src=logstash.conf.j2 dest={{docker_elk_compose_path}}logstash/pipeline/logstash.conf - notify: recreate server_docker-elk + notify: recreate docker-elk diff --git a/roles/docker-elk/templates/elasticsearch.yml.j2 b/roles/docker-elk/templates/elasticsearch.yml.j2 index f75b3b4c..b06c1d21 100644 --- a/roles/docker-elk/templates/elasticsearch.yml.j2 +++ b/roles/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: "server_docker-cluster" +cluster.name: "docker-cluster" network.host: 0.0.0.0 ## X-Pack settings diff --git a/roles/docker-funkwhale/meta/main.yml b/roles/docker-funkwhale/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-funkwhale/meta/main.yml +++ b/roles/docker-funkwhale/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-funkwhale/tasks/main.yml b/roles/docker-funkwhale/tasks/main.yml index ba35b265..8df826a8 100644 --- a/roles/docker-funkwhale/tasks/main.yml +++ b/roles/docker-funkwhale/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" diff --git a/roles/docker-funkwhale/templates/env.j2 b/roles/docker-funkwhale/templates/env.j2 index 80bb857a..69d06127 100644 --- a/roles/docker-funkwhale/templates/env.j2 +++ b/roles/docker-funkwhale/templates/env.j2 @@ -19,7 +19,7 @@ FUNKWHALE_VERSION={{funkwhale_version}} -# End of server_docker-only configuration +# End of docker-only configuration # General configuration # --------------------- diff --git a/roles/docker-gitea/README.md b/roles/docker-gitea/README.md index f558401f..63856879 100644 --- a/roles/docker-gitea/README.md +++ b/roles/docker-gitea/README.md @@ -1,4 +1,4 @@ -# role server_docker-gitea +# role docker-gitea ## update ```bash diff --git a/roles/docker-gitea/meta/main.yml b/roles/docker-gitea/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-gitea/meta/main.yml +++ b/roles/docker-gitea/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-gitea/tasks/main.yml b/roles/docker-gitea/tasks/main.yml index f7dc603b..1afba247 100644 --- a/roles/docker-gitea/tasks/main.yml +++ b/roles/docker-gitea/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}} https - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{path_docker_compose_folder}}" diff --git a/roles/docker-jenkins/meta/main.yml b/roles/docker-jenkins/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-jenkins/meta/main.yml +++ b/roles/docker-jenkins/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/docker-jenkins/tasks/main.yml index 9e17179d..8d614581 100644 --- a/roles/docker-jenkins/tasks/main.yml +++ b/roles/docker-jenkins/tasks/main.yml @@ -2,7 +2,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/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/docker-joomla/README.md b/roles/docker-joomla/README.md index 4c767d30..2d4ad253 100644 --- a/roles/docker-joomla/README.md +++ b/roles/docker-joomla/README.md @@ -1,4 +1,4 @@ -# role server_docker-joomla +# role 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/docker-joomla/meta/main.yml b/roles/docker-joomla/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-joomla/meta/main.yml +++ b/roles/docker-joomla/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml index d1814f98..fc262c3c 100644 --- a/roles/docker-joomla/tasks/main.yml +++ b/roles/docker-joomla/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{path_docker_compose_folder}}" diff --git a/roles/docker-mailu/README.md b/roles/docker-mailu/README.md index 54d0f8ed..3f22f852 100644 --- a/roles/docker-mailu/README.md +++ b/roles/docker-mailu/README.md @@ -140,6 +140,6 @@ For instructions on updating your Mailu setup, follow the official [Mailu mainte - [Plesk support article on RoundCube connection issue](https://support.plesk.com/hc/en-us/articles/115001264814-Unable-to-log-into-RoundCube-Connection-to-storage-server-failed) - [Gist by marienfressinaud](https://gist.github.com/marienfressinaud/f284a59b18aad395eb0de2d22836ae6b) -For more information about this role, visit the [GitHub repository](https://github.com/kevinveenbirkenbach/computer-playbook/tree/master/roles/server_docker-mailu). +For more information about this role, visit the [GitHub repository](https://github.com/kevinveenbirkenbach/computer-playbook/tree/master/roles/docker-mailu). This README.md was optimized with [Chat-GPT](https://chat.openai.com/share/d1ad5ce7-3aa1-4a14-a959-63393b39374a) \ No newline at end of file diff --git a/roles/docker-mailu/meta/main.yml b/roles/docker-mailu/meta/main.yml index 0b56f345..61a06add 100644 --- a/roles/docker-mailu/meta/main.yml +++ b/roles/docker-mailu/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy - systemd_notifier diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index 79bffc96..73b31049 100644 --- a/roles/docker-mailu/tasks/main.yml +++ b/roles/docker-mailu/tasks/main.yml @@ -6,7 +6,7 @@ - name: configure {{domain}}.conf vars: client_max_body_size: "31M" - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{path_docker_compose_files}}mailu" diff --git a/roles/docker-mastodon/README.md b/roles/docker-mastodon/README.md index ace28ff5..eb524235 100644 --- a/roles/docker-mastodon/README.md +++ b/roles/docker-mastodon/README.md @@ -26,7 +26,7 @@ docker exec -it -u root mastodon-web-1 chown -R 991:991 public ``` ## further information -- https://goneuland.de/mastodon-mit-server_docker-und-traefik-installieren/ +- https://goneuland.de/mastodon-mit-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/docker-mastodon/meta/main.yml b/roles/docker-mastodon/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-mastodon/meta/main.yml +++ b/roles/docker-mastodon/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-mastodon/templates/mastodon.conf.j2 b/roles/docker-mastodon/templates/mastodon.conf.j2 index 3d9f9380..2c043346 100644 --- a/roles/docker-mastodon/templates/mastodon.conf.j2 +++ b/roles/docker-mastodon/templates/mastodon.conf.j2 @@ -6,7 +6,7 @@ map $http_upgrade $connection_upgrade { server { server_name {{domain}}; - {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/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/server_native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} + {% include 'roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} location /api/v1/streaming { proxy_set_header Host $host; diff --git a/roles/docker-mediawiki/README.md b/roles/docker-mediawiki/README.md index c3174c12..9ff8c415 100644 --- a/roles/docker-mediawiki/README.md +++ b/roles/docker-mediawiki/README.md @@ -1,4 +1,4 @@ -# role server_docker-mediawiki +# role docker-mediawiki ## Generate LocalSettings.php Login to the container: diff --git a/roles/docker-mediawiki/meta/main.yml b/roles/docker-mediawiki/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-mediawiki/meta/main.yml +++ b/roles/docker-mediawiki/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml index fb0ce70c..0d597ddd 100644 --- a/roles/docker-mediawiki/tasks/main.yml +++ b/roles/docker-mediawiki/tasks/main.yml @@ -2,7 +2,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/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/docker-mybb/meta/main.yml b/roles/docker-mybb/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-mybb/meta/main.yml +++ b/roles/docker-mybb/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-mybb/tasks/main.yml b/roles/docker-mybb/tasks/main.yml index ee80af0a..574a62fa 100644 --- a/roles/docker-mybb/tasks/main.yml +++ b/roles/docker-mybb/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/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/docker-nextcloud/README.md b/roles/docker-nextcloud/README.md index 4074da3c..59045e5a 100644 --- a/roles/docker-nextcloud/README.md +++ b/roles/docker-nextcloud/README.md @@ -1,4 +1,4 @@ -# role server_docker-nextcloud +# role docker-nextcloud ## precondition @@ -58,7 +58,7 @@ cd {{path_docker_compose_files}}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 {{path_administrator_scripts}}docker-volume-backup && -bash ./server_docker-volume-recover.sh "nextcloud_data" "$(sha256sum /etc/machine-id | head -c 64)" +bash ./docker-volume-recover.sh "nextcloud_data" "$(sha256sum /etc/machine-id | head -c 64)" ``` ## database @@ -125,13 +125,13 @@ Until NC24 MariaDB version has to be used. ## further information - https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/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-server_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-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-server_docker-container-and-depends-on -- https://github.com/gdiepen/server_docker-convenience-scripts +- https://unix.stackexchange.com/questions/478855/ansible-docker-container-and-depends-on +- https://github.com/gdiepen/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-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 +- 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 diff --git a/roles/docker-nextcloud/meta/main.yml b/roles/docker-nextcloud/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-nextcloud/meta/main.yml +++ b/roles/docker-nextcloud/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-nextcloud/templates/nextcloud.conf.j2 b/roles/docker-nextcloud/templates/nextcloud.conf.j2 index e791f021..5e02aeac 100644 --- a/roles/docker-nextcloud/templates/nextcloud.conf.j2 +++ b/roles/docker-nextcloud/templates/nextcloud.conf.j2 @@ -2,7 +2,7 @@ server { server_name {{domain}}; - {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/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/server_native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} + {% include 'roles/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/docker-peertube/meta/main.yml b/roles/docker-peertube/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-peertube/meta/main.yml +++ b/roles/docker-peertube/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-peertube/templates/peertube.conf.j2 b/roles/docker-peertube/templates/peertube.conf.j2 index 4f474a64..b1503de8 100644 --- a/roles/docker-peertube/templates/peertube.conf.j2 +++ b/roles/docker-peertube/templates/peertube.conf.j2 @@ -6,7 +6,7 @@ upstream backend { server { server_name {{domain}}; - {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} ## # Application diff --git a/roles/docker-pixelfed/README.md b/roles/docker-pixelfed/README.md index 9150ded1..4fdb18fd 100644 --- a/roles/docker-pixelfed/README.md +++ b/roles/docker-pixelfed/README.md @@ -1,6 +1,6 @@ # Pixelfed Docker Server Role -This README details the steps to manage your Pixelfed instance running in a Docker container. This setup is part of the server_docker-pixelfed role within Kevin Veen-Birkenbach's computer-playbook located at [this GitHub repository](https://github.com/kevinveenbirkenbach/computer-playbook/tree/master/roles/server_docker-pixelfed). +This README details the steps to manage your Pixelfed instance running in a Docker container. This setup is part of the docker-pixelfed role within Kevin Veen-Birkenbach's computer-playbook located at [this GitHub repository](https://github.com/kevinveenbirkenbach/computer-playbook/tree/master/roles/docker-pixelfed). ## Accessing Services diff --git a/roles/docker-pixelfed/meta/main.yml b/roles/docker-pixelfed/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-pixelfed/meta/main.yml +++ b/roles/docker-pixelfed/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-pixelfed/tasks/main.yml b/roles/docker-pixelfed/tasks/main.yml index c6a38940..0fadaba9 100644 --- a/roles/docker-pixelfed/tasks/main.yml +++ b/roles/docker-pixelfed/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" diff --git a/roles/docker-roulette-wheel/meta/main.yml b/roles/docker-roulette-wheel/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-roulette-wheel/meta/main.yml +++ b/roles/docker-roulette-wheel/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-roulette-wheel/readme.md b/roles/docker-roulette-wheel/readme.md index 816ee412..689dff46 100644 --- a/roles/docker-roulette-wheel/readme.md +++ b/roles/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-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://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://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/docker-roulette-wheel/tasks/main.yml b/roles/docker-roulette-wheel/tasks/main.yml index 812d7c1e..8829f948 100644 --- a/roles/docker-roulette-wheel/tasks/main.yml +++ b/roles/docker-roulette-wheel/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create {{docker_compose_path}}" diff --git a/roles/docker-wordpress/README.md b/roles/docker-wordpress/README.md index 6c13b390..e3780150 100644 --- a/roles/docker-wordpress/README.md +++ b/roles/docker-wordpress/README.md @@ -1,4 +1,4 @@ -# role server_docker-wordpress +# role docker-wordpress ## database diff --git a/roles/docker-wordpress/meta/main.yml b/roles/docker-wordpress/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-wordpress/meta/main.yml +++ b/roles/docker-wordpress/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-wordpress/tasks/main.yml b/roles/docker-wordpress/tasks/main.yml index 79f147b6..d19764fe 100644 --- a/roles/docker-wordpress/tasks/main.yml +++ b/roles/docker-wordpress/tasks/main.yml @@ -7,7 +7,7 @@ vars: client_max_body_size: "2M" domain: "{{item}}" - template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ item }}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{ item }}.conf loop: "{{domains}}" notify: restart nginx diff --git a/roles/docker-yourls/README.md b/roles/docker-yourls/README.md index 516976af..586c3b67 100644 --- a/roles/docker-yourls/README.md +++ b/roles/docker-yourls/README.md @@ -1,4 +1,4 @@ -# role server_docker-yourls +# role docker-yourls ## database diff --git a/roles/docker-yourls/meta/main.yml b/roles/docker-yourls/meta/main.yml index da6fe221..fb4d4f7b 100644 --- a/roles/docker-yourls/meta/main.yml +++ b/roles/docker-yourls/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-docker-reverse-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-yourls/tasks/main.yml b/roles/docker-yourls/tasks/main.yml index 53f113db..a46e5848 100644 --- a/roles/docker-yourls/tasks/main.yml +++ b/roles/docker-yourls/tasks/main.yml @@ -4,7 +4,7 @@ - name: configure {{domain}}.conf template: - src: "roles/server_native-docker-reverse-proxy/templates/domain.conf.j2" + src: "roles/native-docker-reverse-proxy/templates/domain.conf.j2" dest: "/etc/nginx/conf.d/{{domain}}.conf" notify: restart nginx diff --git a/roles/native-backups-consumer/README.md b/roles/native-backups-consumer/README.md index 068d7814..c49711bd 100644 --- a/roles/native-backups-consumer/README.md +++ b/roles/native-backups-consumer/README.md @@ -1,4 +1,4 @@ -# role server_native-backups-consumer +# role native-backups-consumer ## goal This script allows to pull backups from a remote server. diff --git a/roles/native-backups-consumer/meta/main.yml b/roles/native-backups-consumer/meta/main.yml index ed487088..c2e590a8 100644 --- a/roles/native-backups-consumer/meta/main.yml +++ b/roles/native-backups-consumer/meta/main.yml @@ -1,4 +1,4 @@ dependencies: - - server_native-git + - native-git - systemd_notifier - independent_backups-cleanup-timer diff --git a/roles/native-backups-provider-user/meta/main.yml b/roles/native-backups-provider-user/meta/main.yml index be441c6b..94856f23 100644 --- a/roles/native-backups-provider-user/meta/main.yml +++ b/roles/native-backups-provider-user/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-sshd +- native-sshd diff --git a/roles/native-backups-provider-user/readme.md b/roles/native-backups-provider-user/readme.md index 8c0cdade..4b5509e9 100644 --- a/roles/native-backups-provider-user/readme.md +++ b/roles/native-backups-provider-user/readme.md @@ -1,4 +1,4 @@ -# role server_native-backups-provider-user +# role native-backups-provider-user User for backups ## todo diff --git a/roles/native-backups-provider/README.md b/roles/native-backups-provider/README.md index 8dfb6c6b..cec89ca4 100644 --- a/roles/native-backups-provider/README.md +++ b/roles/native-backups-provider/README.md @@ -1,4 +1,4 @@ -# role server_native-backups-provider-host +# role native-backups-provider-host ## todo - add full system backup diff --git a/roles/native-backups-provider/meta/main.yml b/roles/native-backups-provider/meta/main.yml index 050d4c94..af5530bf 100644 --- a/roles/native-backups-provider/meta/main.yml +++ b/roles/native-backups-provider/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-backups-provider-user +- native-backups-provider-user - independent_backups-cleanup-timer diff --git a/roles/native-certbot-nginx/meta/main.yml b/roles/native-certbot-nginx/meta/main.yml index 5dc331ef..2fc7d0bb 100644 --- a/roles/native-certbot-nginx/meta/main.yml +++ b/roles/native-certbot-nginx/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-nginx +- native-nginx - systemd_notifier diff --git a/roles/native-docker-compose-restart-unhealthy/README.md b/roles/native-docker-compose-restart-unhealthy/README.md index 63177cb7..8bf0d0fe 100644 --- a/roles/native-docker-compose-restart-unhealthy/README.md +++ b/roles/native-docker-compose-restart-unhealthy/README.md @@ -1,2 +1,2 @@ -# server_native-docker-compose-restart-unhealthy +# native-docker-compose-restart-unhealthy docker-compose restart for containers which are unhealty or excited \ No newline at end of file diff --git a/roles/native-docker-health-check/vars/main.yml b/roles/native-docker-health-check/vars/main.yml index 4cd7774a..c58af09e 100644 --- a/roles/native-docker-health-check/vars/main.yml +++ b/roles/native-docker-health-check/vars/main.yml @@ -1 +1 @@ -docker_health_check_folder: "{{path_administrator_scripts}}server_docker-health-check/" \ No newline at end of file +docker_health_check_folder: "{{path_administrator_scripts}}docker-health-check/" \ No newline at end of file diff --git a/roles/native-docker-reverse-proxy/README.md b/roles/native-docker-reverse-proxy/README.md index 5daaf93f..ce9f74ae 100644 --- a/roles/native-docker-reverse-proxy/README.md +++ b/roles/native-docker-reverse-proxy/README.md @@ -1,4 +1,4 @@ -# role server_native-docker-reverse-proxy +# role native-docker-reverse-proxy Uses nginx as an [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy) for local docker applications. diff --git a/roles/native-docker-reverse-proxy/meta/main.yml b/roles/native-docker-reverse-proxy/meta/main.yml index 2fdc54a2..d33a1cab 100644 --- a/roles/native-docker-reverse-proxy/meta/main.yml +++ b/roles/native-docker-reverse-proxy/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-docker -- server_native-https-server +- native-docker +- native-https-server diff --git a/roles/native-docker-reverse-proxy/templates/domain.conf.j2 b/roles/native-docker-reverse-proxy/templates/domain.conf.j2 index 5da2084a..6482acf1 100644 --- a/roles/native-docker-reverse-proxy/templates/domain.conf.j2 +++ b/roles/native-docker-reverse-proxy/templates/domain.conf.j2 @@ -6,7 +6,7 @@ server client_max_body_size {{ client_max_body_size }}; {% endif %} - {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} {% include 'proxy_pass.conf.j2' %} diff --git a/roles/native-docker-volume-backup/meta/main.yml b/roles/native-docker-volume-backup/meta/main.yml index 5926c6a4..7c8c8c96 100644 --- a/roles/native-docker-volume-backup/meta/main.yml +++ b/roles/native-docker-volume-backup/meta/main.yml @@ -1,4 +1,4 @@ dependencies: - - server_native-git - - server_native-backups-provider + - native-git + - native-backups-provider - systemd_notifier diff --git a/roles/native-docker/Readme.md b/roles/native-docker/Readme.md index 672cc686..332c10b2 100644 --- a/roles/native-docker/Readme.md +++ b/roles/native-docker/Readme.md @@ -1,4 +1,4 @@ -# role server_native-docker +# role 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/server_docker-how-do-you-disable-auto-restart-on-a-container +- https://stackoverflow.com/questions/37599128/docker-how-do-you-disable-auto-restart-on-a-container diff --git a/roles/native-docker/meta/main.yml b/roles/native-docker/meta/main.yml index b260e072..c3028a5e 100644 --- a/roles/native-docker/meta/main.yml +++ b/roles/native-docker/meta/main.yml @@ -1,5 +1,5 @@ dependencies: - - server_native-docker-volume-backup - - server_user-administrator - - server_native-docker-health-check - - server_native-docker-compose-restart-unhealthy + - native-docker-volume-backup + - user-administrator + - native-docker-health-check + - native-docker-compose-restart-unhealthy diff --git a/roles/native-homepage/meta/main.yml b/roles/native-homepage/meta/main.yml index 5abfdf71..de989663 100644 --- a/roles/native-homepage/meta/main.yml +++ b/roles/native-homepage/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-https-server -- server_native-git +- native-https-server +- native-git diff --git a/roles/native-homepage/templates/homepage.nginx.conf.j2 b/roles/native-homepage/templates/homepage.nginx.conf.j2 index f5f6ad6c..ee9fa97c 100644 --- a/roles/native-homepage/templates/homepage.nginx.conf.j2 +++ b/roles/native-homepage/templates/homepage.nginx.conf.j2 @@ -3,7 +3,7 @@ server { server_name {{domain}}; - {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} charset utf-8; diff --git a/roles/native-https-redirect/meta/main.yml b/roles/native-https-redirect/meta/main.yml index 9a436d26..5f4b1fe4 100644 --- a/roles/native-https-redirect/meta/main.yml +++ b/roles/native-https-redirect/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-https-server +- native-https-server diff --git a/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 b/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 index 6a6e502a..45a234d7 100644 --- a/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 +++ b/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 @@ -1,5 +1,5 @@ server { server_name {{domain}}; - {% include 'roles/server_native-letsencrypt/templates/ssl_header.j2' %} + {% include 'roles/native-letsencrypt/templates/ssl_header.j2' %} return 301 https://{{target_domain}}$request_uri; } diff --git a/roles/native-https-server/meta/main.yml b/roles/native-https-server/meta/main.yml index ce86e704..5a1624c3 100644 --- a/roles/native-https-server/meta/main.yml +++ b/roles/native-https-server/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-nginx -- server_native-letsencrypt +- native-nginx +- native-letsencrypt diff --git a/roles/native-journalctl/README.md b/roles/native-journalctl/README.md index 9d5cd0a5..cd9cdfcb 100644 --- a/roles/native-journalctl/README.md +++ b/roles/native-journalctl/README.md @@ -1,4 +1,4 @@ -# role server_native-journalctl +# role native-journalctl # live monitoring diff --git a/roles/native-journalctl/meta/main.yml b/roles/native-journalctl/meta/main.yml index 8dfbb13d..75444eba 100644 --- a/roles/native-journalctl/meta/main.yml +++ b/roles/native-journalctl/meta/main.yml @@ -1,2 +1,2 @@ dependencies: - - server_native-journalctl-health-check + - native-journalctl-health-check diff --git a/roles/native-letsencrypt/meta/main.yml b/roles/native-letsencrypt/meta/main.yml index 19cf0490..a2823175 100644 --- a/roles/native-letsencrypt/meta/main.yml +++ b/roles/native-letsencrypt/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_native-certbot-nginx +- native-certbot-nginx diff --git a/roles/native-nginx/readme.md b/roles/native-nginx/readme.md index 07a47aa1..9a5d5b6c 100644 --- a/roles/native-nginx/readme.md +++ b/roles/native-nginx/readme.md @@ -1,4 +1,4 @@ -# role server_native-nginx +# role 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-server_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-docker-why/168972 diff --git a/roles/native-postfix/meta/main.yml b/roles/native-postfix/meta/main.yml index a4412db8..6c02b2c4 100644 --- a/roles/native-postfix/meta/main.yml +++ b/roles/native-postfix/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_user-administrator +- user-administrator diff --git a/roles/native-sshd/README.md b/roles/native-sshd/README.md index 366a069f..2d16c91d 100644 --- a/roles/native-sshd/README.md +++ b/roles/native-sshd/README.md @@ -1,7 +1,7 @@ -# role server_native-sshd +# role native-sshd ## dependencies This role depends on that a well configured user administrator exist. -For this reason this role depends on the role server_user-administrator. +For this reason this role depends on the role 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/native-sshd/meta/main.yml b/roles/native-sshd/meta/main.yml index a4412db8..6c02b2c4 100644 --- a/roles/native-sshd/meta/main.yml +++ b/roles/native-sshd/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- server_user-administrator +- user-administrator diff --git a/roles/system-security/meta/main.yml b/roles/system-security/meta/main.yml index 1f94ebb6..ee954033 100644 --- a/roles/system-security/meta/main.yml +++ b/roles/system-security/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_user-alarm -- server_native-sshd +- user-alarm +- native-sshd diff --git a/roles/user-administrator/meta/main.yml b/roles/user-administrator/meta/main.yml index ec2881b0..cdc1561d 100644 --- a/roles/user-administrator/meta/main.yml +++ b/roles/user-administrator/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- server_native-sudo +- native-sudo - independent_user-administrator