diff --git a/.gitignore b/.gitignore index 722d5e7..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +0,0 @@ -.vscode diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..904d8da --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "search.exclude": { + "/playbooks/roles/": true, + "/playbooks/resources/": true, + }, +} diff --git a/README.md b/README.md index 4e16d2a..68c92b4 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,15 @@ Folgende Geräte und Server werden duch dieses Ansible Repository verwaltet: * Diverse VMs auf dem ThinkCCCluster +* Diverse VMs auf dem Chaosknoten -Die Konfigurationsdateien liegen unter `playbooks/files/configs` bzw. `playbooks/templates/configs` und werden für Hosts jeweils in einer `host_vars`-Datei im Inventory geladen. +Host-spezifische Konfigurationsdateien liegen unter `resources/` und werden für jeweils über eine `host_vars`-Datei im Inventory geladen. ## Galaxy-Collections und -Rollen installieren Für einige Aspekte verwenden wir Rollen aus Ansible Galaxy. Die müssen zunächst installiert werden: -``` + +```bash ansible-galaxy install -r requirements.yml ``` @@ -17,29 +19,29 @@ ansible-galaxy install -r requirements.yml Grundsätzlich sollten Secrets vermieden werden. (Also z.B.: Nutze SSH Keys statt Passwort.) -Da Secrets aber durchaus doch gebraucht werden, werden diese dann in diesem Repo direkt aus dem [password-store](https://gitlab.hamburg.ccc.de/ccchh/password-store) (meist aus einem Sub-Eintrag des `noc/` Ordners) geladen. +Da Secrets aber durchaus doch gebraucht werden, werden diese dann in diesem Repo direkt aus dem [password-store](https://git.hamburg.ccc.de/CCCHH/password-store) (meist aus einem Sub-Eintrag des `noc/` Ordners) geladen. Dies geschieht mit Hilfe des `community.general.passwordstore` lookup Plugins. - ## Playbook nur für einzelne Hosts ausführen Ein paar der Hosts haben den selben Namen, was es etwas schwieriger macht, das Playbook nur für einen der Hosts auszuführen, z. B. `public-reverse-proxy`. Die Kombination aus `--inventory` und `--limit` führt zum Erfolg: -``` + +```bash ansible-playbook playbooks/deploy.yaml --inventory inventories/chaosknoten/hosts.yaml --limit public-reverse-proxy ``` ## Neuen Web-Service hinzufügen -Wir deployen Web-Services hinter dem `public-reverse-proxy`. Der Service-Name `service.hamburg.ccc.de` ist ein CNAME für public-reverse-proxy.hamburg.ccc.de, und die Service-VM ist unter `service-intern.hamburg.ccc.de` mit einer `172.31.17.x`-Adresse erreichbar. +Wir deployen Web-Services auf dem Chaosknoten hinter dem `public-reverse-proxy`. Der Service-Name `service.hamburg.ccc.de` sollte ein CNAME für `public-reverse-proxy.hamburg.ccc.de` und die Service-VM unter `service-intern.hamburg.ccc.de` mit einer `172.31.17.x`-Adresse erreichbar sein. Im Ansible-Repo müssen diese Sachen hinzugefügt werden: * `inventories/chaosknoten/hosts.yaml`: * SSH-Config für die neue VM unter all/children/debian_12/hosts * Einträge für die Rollen, die dieser Host haben soll, min. `certbot_hosts`, `nginx_hosts`, ggf. `docker_compose_hosts` * `inventories/chaosknoten/host_vars/`*host*`.yaml`: config vars für den neuen Host -* `playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf`: Liste der Hostnamen um den neuen Host erweitern, die hinter dem Reverse-Proxy stehen -* `playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf`: Liste der Hostnamen um den neuen Host erweitern, die hinter dem Reverse-Proxy stehen -* `playbooks/files/chaosknoten/configs/cloud/nginx/`*host*`.hamburg.ccc.de.conf`: Server auf dem Service-Host +* `resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf`: Liste der Hostnamen um den neuen Host erweitern, die hinter dem Reverse-Proxy stehen +* `resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf`: Liste der Hostnamen um den neuen Host erweitern, die hinter dem Reverse-Proxy stehen +* `resources/chaosknoten/`*host*`/nginx/`*host*`.hamburg.ccc.de.conf`: Server auf dem Service-Host * Individuelle Config für den Service. Wenn Docker Compose, hier weiterleiten auf den eigentlichen Dienst in Compose. * Cert-Dateinamen anpassen -* `playbooks/templates/chaosknoten/configs/`*host*`/compose.yaml.j2`: Config für Docker Compose (wenn verwendet) +* `resources/chaosknoten/`*host*`/docker_compose/compose.yaml.j2`: Config für Docker Compose (wenn verwendet) diff --git a/ansible.cfg b/ansible.cfg index 7c22aeb..ca06548 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,6 @@ [defaults] inventory = ./inventories/z9/hosts.yaml +pipelining = True [passwordstore_lookup] backend = pass diff --git a/inventories/chaosknoten/host_vars/ccchoir.yaml b/inventories/chaosknoten/host_vars/ccchoir.yaml index cd59ea1..93e49b0 100644 --- a/inventories/chaosknoten/host_vars/ccchoir.yaml +++ b/inventories/chaosknoten/host_vars/ccchoir.yaml @@ -1,4 +1,4 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/ccchoir/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: [ ] certbot__version_spec: "" @@ -12,4 +12,4 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: ccchoir.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/ccchoir/nginx/ccchoir.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml index b0abb25..977aa10 100644 --- a/inventories/chaosknoten/host_vars/cloud.yaml +++ b/inventories/chaosknoten/host_vars/cloud.yaml @@ -3,9 +3,9 @@ nextcloud__postgres_version: 15.8 nextcloud__fqdn: cloud.hamburg.ccc.de nextcloud__data_dir: /data/nextcloud nextcloud__admin_password: "{{ lookup('community.general.passwordstore', 'noc/vm-secrets/chaosknoten/cloud/admin', create=false, missing='error') }}" -nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/cloud/extra_configuration.config.php.j2') }}" +nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}" nextcloud__use_custom_new_user_skeleton: true -nextcloud__custom_new_user_skeleton_directory: "chaosknoten/cloud/new_user_skeleton_directory/" +nextcloud__custom_new_user_skeleton_directory: "resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/" nextcloud__postgres_password: "{{ lookup('community.general.passwordstore', 'noc/vm-secrets/chaosknoten/cloud/DB_PASSWORD', create=false, missing='error') }}" nextcloud__proxy_protocol_reverse_proxy_ip: 172.31.17.140 nextcloud__certbot_acme_account_email_address: le-admin@hamburg.ccc.de diff --git a/inventories/chaosknoten/host_vars/grafana.yaml b/inventories/chaosknoten/host_vars/grafana.yaml index 300bda6..87cd328 100644 --- a/inventories/chaosknoten/host_vars/grafana.yaml +++ b/inventories/chaosknoten/host_vars/grafana.yaml @@ -1,17 +1,17 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/grafana/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/grafana/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: - name: grafana.ini - content: "{{ lookup('ansible.builtin.template', 'templates/chaosknoten/configs/grafana/docker_compose/grafana.ini') }}" + content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/grafana/docker_compose/grafana.ini.j2') }}" - name: grafana-datasource.yml - content: "{{ lookup('ansible.builtin.file', 'files/chaosknoten/configs/grafana/docker_compose/grafana-datasource.yml') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/grafana/docker_compose/grafana-datasource.yml') }}" - name: prometheus.yml - content: "{{ lookup('ansible.builtin.file', 'files/chaosknoten/configs/grafana/docker_compose/prometheus.yml') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/grafana/docker_compose/prometheus.yml') }}" - name: alertmanager.yaml - content: "{{ lookup('ansible.builtin.template', 'templates/chaosknoten/configs/grafana/docker_compose/alertmanager.yaml.j2') }}" + content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/grafana/docker_compose/alertmanager.yaml.j2') }}" - name: prometheus_alerts.rules.yaml - content: "{{ lookup('ansible.builtin.file', 'files/chaosknoten/configs/grafana/docker_compose/prometheus_alerts.rules.yaml') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/grafana/docker_compose/prometheus_alerts.rules.yaml') }}" - name: alertmanager_alert_templates.tmpl - content: "{{ lookup('ansible.builtin.file', 'files/chaosknoten/configs/grafana/docker_compose/alertmanager_alert_templates.tmpl') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/grafana/docker_compose/alertmanager_alert_templates.tmpl') }}" certbot__version_spec: "" certbot__acme_account_email_address: le-admin@hamburg.ccc.de @@ -23,4 +23,4 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: grafana.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/grafana/nginx/grafana.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/keycloak.yaml b/inventories/chaosknoten/host_vars/keycloak.yaml index 944ea80..a8fbc99 100644 --- a/inventories/chaosknoten/host_vars/keycloak.yaml +++ b/inventories/chaosknoten/host_vars/keycloak.yaml @@ -1,4 +1,4 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/keycloak/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: [ ] certbot__version_spec: "" @@ -13,8 +13,8 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: id.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/keycloak/nginx/id.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/keycloak/nginx/id.hamburg.ccc.de.conf') }}" - name: keycloak-admin.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf') }}" - name: invite.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/keycloak/nginx/invite.hamburg.ccc.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/lists.yaml b/inventories/chaosknoten/host_vars/lists.yaml index 8c0269e..b2270a3 100644 --- a/inventories/chaosknoten/host_vars/lists.yaml +++ b/inventories/chaosknoten/host_vars/lists.yaml @@ -1,4 +1,4 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/lists/compose/compose.yaml') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/docker_compose/compose.yaml') }}" docker_compose__configuration_files: [ ] certbot__version_spec: "" @@ -12,6 +12,6 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: lists.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/lists/nginx/lists.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/nginx/lists.hamburg.ccc.de.conf') }}" - name: lists.c3lingo.org - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/lists/nginx/lists.c3lingo.org.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/lists/nginx/lists.c3lingo.org.conf') }}" diff --git a/inventories/chaosknoten/host_vars/mumble.yaml b/inventories/chaosknoten/host_vars/mumble.yaml index eeeeaeb..3f3a06e 100644 --- a/inventories/chaosknoten/host_vars/mumble.yaml +++ b/inventories/chaosknoten/host_vars/mumble.yaml @@ -1,6 +1,3 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/lists/compose/compose.yaml') }}" -docker_compose__configuration_files: [ ] - certbot__version_spec: "" certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz certbot__certificate_domains: @@ -11,4 +8,4 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: mumble.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/mumble/nginx/mumble.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/mumble/nginx/mumble.hamburg.ccc.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/onlyoffice.yaml b/inventories/chaosknoten/host_vars/onlyoffice.yaml index bf43f07..aa39788 100644 --- a/inventories/chaosknoten/host_vars/onlyoffice.yaml +++ b/inventories/chaosknoten/host_vars/onlyoffice.yaml @@ -1,7 +1,7 @@ nginx__version_spec: "" nginx__configurations: - name: onlyoffice.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf') }}" certbot__version_spec: "" certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz @@ -10,5 +10,5 @@ certbot__certificate_domains: certbot__new_cert_commands: - "systemctl reload nginx.service" -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/onlyoffice/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: [ ] diff --git a/inventories/chaosknoten/host_vars/pad.yaml b/inventories/chaosknoten/host_vars/pad.yaml index 01a0d75..6625415 100644 --- a/inventories/chaosknoten/host_vars/pad.yaml +++ b/inventories/chaosknoten/host_vars/pad.yaml @@ -1,4 +1,4 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/pad/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pad/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: [ ] certbot__version_spec: "" @@ -11,4 +11,4 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: pad.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/pad/nginx/pad.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/pretalx.yaml b/inventories/chaosknoten/host_vars/pretalx.yaml index cd98387..f49cc15 100644 --- a/inventories/chaosknoten/host_vars/pretalx.yaml +++ b/inventories/chaosknoten/host_vars/pretalx.yaml @@ -1,4 +1,4 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/pretalx/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: [ ] certbot__version_spec: "" @@ -11,4 +11,4 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: pretalx.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/pretalx/nginx/pretalx.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/pretalx/nginx/pretalx.hamburg.ccc.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/public-reverse-proxy.yaml b/inventories/chaosknoten/host_vars/public-reverse-proxy.yaml index a2ee48a..8e70b77 100644 --- a/inventories/chaosknoten/host_vars/public-reverse-proxy.yaml +++ b/inventories/chaosknoten/host_vars/public-reverse-proxy.yaml @@ -2,7 +2,7 @@ nginx__version_spec: "" nginx__deploy_redirect_conf: false nginx__configurations: - name: acme_challenge - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf') }}" nginx__use_custom_nginx_conf: true nginx__custom_nginx_conf: | - {{ lookup('file', 'chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf') }} + {{ lookup('file', 'resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf') }} diff --git a/inventories/chaosknoten/host_vars/tickets.yaml b/inventories/chaosknoten/host_vars/tickets.yaml index e160a55..7a36bb6 100644 --- a/inventories/chaosknoten/host_vars/tickets.yaml +++ b/inventories/chaosknoten/host_vars/tickets.yaml @@ -1,7 +1,7 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/tickets/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/tickets/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: - name: pretix.cfg - content: "{{ lookup('ansible.builtin.template', 'templates/chaosknoten/configs/tickets/pretix.cfg.j2') }}" + content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2') }}" certbot__version_spec: "" certbot__acme_account_email_address: le-admin@hamburg.ccc.de @@ -13,4 +13,4 @@ certbot__new_cert_commands: nginx__version_spec: "" nginx__configurations: - name: tickets.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/tickets/nginx/tickets.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/tickets/nginx/tickets.hamburg.ccc.de.conf') }}" diff --git a/inventories/chaosknoten/host_vars/wiki.yaml b/inventories/chaosknoten/host_vars/wiki.yaml index 1a3e1c2..3d5fbb9 100644 --- a/inventories/chaosknoten/host_vars/wiki.yaml +++ b/inventories/chaosknoten/host_vars/wiki.yaml @@ -1,9 +1,9 @@ nginx__version_spec: "" nginx__configurations: - name: wiki.ccchh.net - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/wiki/nginx/wiki.ccchh.net.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.ccchh.net.conf') }}" - name: wiki.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf') }}" certbot__version_spec: "" certbot__acme_account_email_address: j+letsencrypt-ccchh@jsts.xyz diff --git a/inventories/chaosknoten/host_vars/zammad.yaml b/inventories/chaosknoten/host_vars/zammad.yaml index 962df32..88ad99c 100644 --- a/inventories/chaosknoten/host_vars/zammad.yaml +++ b/inventories/chaosknoten/host_vars/zammad.yaml @@ -1,4 +1,4 @@ -docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'chaosknoten/configs/zammad/compose.yaml.j2') }}" +docker_compose__compose_file_content: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/zammad/docker_compose/compose.yaml.j2') }}" docker_compose__configuration_files: [ ] certbot__version_spec: "" @@ -9,6 +9,6 @@ certbot__certificate_domains: nginx__version_spec: "" nginx__configurations: - name: zammad.hamburg.ccc.de - content: "{{ lookup('ansible.builtin.file', 'chaosknoten/configs/zammad/nginx/zammad.hamburg.ccc.de.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/zammad/nginx/zammad.hamburg.ccc.de.conf') }}" certbot__new_cert_commands: - "systemctl reload nginx.service" diff --git a/inventories/z9/host_vars/light.yaml b/inventories/z9/host_vars/light.yaml index d476663..0336d22 100644 --- a/inventories/z9/host_vars/light.yaml +++ b/inventories/z9/host_vars/light.yaml @@ -3,57 +3,57 @@ foobazdmx_version: main foobazdmx_repo_url: "https://git.hamburg.ccc.de/CCCHH/foobazdmx.git" ola__configs: - name: ola-artnet - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-artnet.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-artnet.conf') }}" - name: ola-dummy - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-dummy.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-dummy.conf') }}" - name: ola-e131 - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-e131.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-e131.conf') }}" - name: ola-espnet - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-espnet.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-espnet.conf') }}" - name: ola-ftdidmx - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-ftdidmx.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-ftdidmx.conf') }}" - name: ola-gpio - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-gpio.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-gpio.conf') }}" - name: ola-karate - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-karate.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-karate.conf') }}" - name: ola-kinet - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-kinet.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-kinet.conf') }}" - name: ola-milinst - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-milinst.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-milinst.conf') }}" - name: ola-opendmx - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-opendmx.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-opendmx.conf') }}" - name: ola-openpixelcontrol - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-openpixelcontrol.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-openpixelcontrol.conf') }}" - name: ola-osc - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-osc.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-osc.conf') }}" - name: ola-pathport - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-pathport.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-pathport.conf') }}" - name: ola-port - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-port.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-port.conf') }}" - name: ola-renard - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-renard.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-renard.conf') }}" - name: ola-sandnet - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-sandnet.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-sandnet.conf') }}" - name: ola-server - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-server.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-server.conf') }}" - name: ola-shownet - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-shownet.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-shownet.conf') }}" - name: ola-spi - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-spi.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-spi.conf') }}" - name: ola-stageprofi - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-stageprofi.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-stageprofi.conf') }}" - name: ola-uartdmx - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-uartdmx.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-uartdmx.conf') }}" - name: ola-universe - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-universe.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-universe.conf') }}" - name: ola-usbdmx - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-usbdmx.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-usbdmx.conf') }}" - name: ola-usbserial - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/ola/ola-usbserial.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/ola/ola-usbserial.conf') }}" nginx__version_spec: "" nginx__deploy_redirect_conf: false nginx__configurations: - name: light - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/nginx/light.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/nginx/light.conf') }}" - name: http_handler - content: "{{ lookup('ansible.builtin.file', 'z9/configs/light/nginx/http_handler.conf') }}" + content: "{{ lookup('ansible.builtin.file', 'resources/z9/light/nginx/http_handler.conf') }}" diff --git a/playbooks/check.yaml b/playbooks/check.yaml new file mode 100644 index 0000000..63ea631 --- /dev/null +++ b/playbooks/check.yaml @@ -0,0 +1,31 @@ +--- +- name: Host information + hosts: all + tasks: + - name: Print OS distribution and version + ansible.builtin.debug: + msg: "{{ ansible_facts['distribution'] }} {{ ansible_facts['distribution_version'] }} ({{ ansible_facts['distribution_release'] }})" + + - name: Find all .dpkg-* files + ansible.builtin.find: + paths: /etc + file_type: file + recurse: true + use_regex: false + patterns: + - "*.dpkg-*" + become: true + register: check__dpkg_files + + - name: Create variable for list of all .dpkg-* files + ansible.builtin.set_fact: + check__dpkg_files_list: [ ] + + - name: Populate list of all .dpkg-* files + ansible.builtin.set_fact: + check__dpkg_files_list: "{{ check__dpkg_files_list + [item.path] }}" + loop: "{{ check__dpkg_files.files }}" + + - name: Print .dpkg-* files list + ansible.builtin.debug: + var: check__dpkg_files_list diff --git a/playbooks/resources b/playbooks/resources new file mode 120000 index 0000000..35a4f7a --- /dev/null +++ b/playbooks/resources @@ -0,0 +1 @@ +../resources \ No newline at end of file diff --git a/playbooks/roles b/playbooks/roles new file mode 120000 index 0000000..d8c4472 --- /dev/null +++ b/playbooks/roles @@ -0,0 +1 @@ +../roles \ No newline at end of file diff --git a/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2 deleted file mode 100644 index 58886dc..0000000 --- a/playbooks/templates/chaosknoten/configs/engelsystem/compose.yaml.j2 +++ /dev/null @@ -1,55 +0,0 @@ ---- -services: - es_server: - image: es_server - restart: unless-stopped - build: - context: /home/chaos/engelsystem - dockerfile: /home/chaos/engelsystem/docker/Dockerfile - environment: - MYSQL_HOST: es_database - MYSQL_USER: engelsystem - MYSQL_PASSWORD: engelsystem - MYSQL_DATABASE: engelsystem - APP_NAME: CCCamp2023 Alternative Engelsystem - APP_URL: https://aes.ccchh.net - CONTACT_EMAIL: mailto:aes@hamburg.ccc.de - GOODIE_TYPE: none - ENABLE_VOUCHER: false - MAIL_DRIVER: smtp - MAIL_FROM_ADDRESS: aes@send-only-mail.ccchh.net - MAIL_HOST: send-only-mailserver.ccchh.net - MAIL_PORT: 465 - MAIL_ENCRYPTION: tls - MAIL_USERNAME: aes - MAIL_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/chaosknoten/engelsystem/MAIL_PASSWORD", create=false, missing="error") }} - ports: - - "5080:80" - networks: - - database - - internet - depends_on: - - es_database - extra_hosts: - - "send-only-mailserver.ccchh.net:185.161.129.132" - - es_database: - image: mariadb:10.2 - restart: unless-stopped - environment: - MYSQL_DATABASE: engelsystem - MYSQL_USER: engelsystem - MYSQL_PASSWORD: engelsystem - MYSQL_RANDOM_ROOT_PASSWORD: 1 - MYSQL_INITDB_SKIP_TZINFO: "yes" - volumes: - - db:/var/lib/mysql - networks: - - database -volumes: - db: {} - -networks: - database: - internal: true - internet: diff --git a/playbooks/templates/chaosknoten/configs/ccchoir/compose.yaml.j2 b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/ccchoir/compose.yaml.j2 rename to resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf b/resources/chaosknoten/ccchoir/nginx/ccchoir.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf rename to resources/chaosknoten/ccchoir/nginx/ccchoir.de.conf diff --git a/playbooks/templates/chaosknoten/configs/cloud/config.php.j2 b/resources/chaosknoten/cloud/nextcloud/config.php.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/cloud/config.php.j2 rename to resources/chaosknoten/cloud/nextcloud/config.php.j2 diff --git a/playbooks/templates/chaosknoten/configs/cloud/extra_configuration.config.php.j2 b/resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/cloud/extra_configuration.config.php.j2 rename to resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2 diff --git a/playbooks/files/chaosknoten/cloud/new_user_skeleton_directory/Photos/augenohrenkatze.jpg b/resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/Photos/augenohrenkatze.jpg similarity index 100% rename from playbooks/files/chaosknoten/cloud/new_user_skeleton_directory/Photos/augenohrenkatze.jpg rename to resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/Photos/augenohrenkatze.jpg diff --git a/playbooks/files/chaosknoten/cloud/new_user_skeleton_directory/Photos/ccclubhajs.jpg b/resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/Photos/ccclubhajs.jpg similarity index 100% rename from playbooks/files/chaosknoten/cloud/new_user_skeleton_directory/Photos/ccclubhajs.jpg rename to resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/Photos/ccclubhajs.jpg diff --git a/playbooks/files/chaosknoten/cloud/new_user_skeleton_directory/README.md b/resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/README.md similarity index 100% rename from playbooks/files/chaosknoten/cloud/new_user_skeleton_directory/README.md rename to resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/README.md diff --git a/playbooks/templates/chaosknoten/configs/grafana/docker_compose/alertmanager.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/alertmanager.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/grafana/docker_compose/alertmanager.yaml.j2 rename to resources/chaosknoten/grafana/docker_compose/alertmanager.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/alertmanager_alert_templates.tmpl b/resources/chaosknoten/grafana/docker_compose/alertmanager_alert_templates.tmpl similarity index 100% rename from playbooks/files/chaosknoten/configs/grafana/docker_compose/alertmanager_alert_templates.tmpl rename to resources/chaosknoten/grafana/docker_compose/alertmanager_alert_templates.tmpl diff --git a/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 rename to resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/grafana-datasource.yml b/resources/chaosknoten/grafana/docker_compose/grafana-datasource.yml similarity index 100% rename from playbooks/files/chaosknoten/configs/grafana/docker_compose/grafana-datasource.yml rename to resources/chaosknoten/grafana/docker_compose/grafana-datasource.yml diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/grafana.ini.example b/resources/chaosknoten/grafana/docker_compose/grafana.ini.example similarity index 100% rename from playbooks/files/chaosknoten/configs/grafana/docker_compose/grafana.ini.example rename to resources/chaosknoten/grafana/docker_compose/grafana.ini.example diff --git a/playbooks/templates/chaosknoten/configs/grafana/docker_compose/grafana.ini b/resources/chaosknoten/grafana/docker_compose/grafana.ini.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/grafana/docker_compose/grafana.ini rename to resources/chaosknoten/grafana/docker_compose/grafana.ini.j2 diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml b/resources/chaosknoten/grafana/docker_compose/prometheus.yml similarity index 100% rename from playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml rename to resources/chaosknoten/grafana/docker_compose/prometheus.yml diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus_alerts.rules.yaml b/resources/chaosknoten/grafana/docker_compose/prometheus_alerts.rules.yaml similarity index 100% rename from playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus_alerts.rules.yaml rename to resources/chaosknoten/grafana/docker_compose/prometheus_alerts.rules.yaml diff --git a/playbooks/files/chaosknoten/configs/grafana/nginx/grafana.hamburg.ccc.de.conf b/resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/grafana/nginx/grafana.hamburg.ccc.de.conf rename to resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf diff --git a/playbooks/templates/chaosknoten/configs/keycloak/compose.yaml.j2 b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/keycloak/compose.yaml.j2 rename to resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/keycloak/nginx/id.hamburg.ccc.de.conf b/resources/chaosknoten/keycloak/nginx/id.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/keycloak/nginx/id.hamburg.ccc.de.conf rename to resources/chaosknoten/keycloak/nginx/id.hamburg.ccc.de.conf diff --git a/playbooks/files/chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf b/resources/chaosknoten/keycloak/nginx/invite.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf rename to resources/chaosknoten/keycloak/nginx/invite.hamburg.ccc.de.conf diff --git a/playbooks/files/chaosknoten/configs/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf b/resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf rename to resources/chaosknoten/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf diff --git a/playbooks/files/chaosknoten/configs/lists/compose/compose.yaml b/resources/chaosknoten/lists/docker_compose/compose.yaml similarity index 100% rename from playbooks/files/chaosknoten/configs/lists/compose/compose.yaml rename to resources/chaosknoten/lists/docker_compose/compose.yaml diff --git a/playbooks/files/chaosknoten/configs/lists/nginx/lists.c3lingo.org.conf b/resources/chaosknoten/lists/nginx/lists.c3lingo.org.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/lists/nginx/lists.c3lingo.org.conf rename to resources/chaosknoten/lists/nginx/lists.c3lingo.org.conf diff --git a/playbooks/files/chaosknoten/configs/lists/nginx/lists.hamburg.ccc.de.conf b/resources/chaosknoten/lists/nginx/lists.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/lists/nginx/lists.hamburg.ccc.de.conf rename to resources/chaosknoten/lists/nginx/lists.hamburg.ccc.de.conf diff --git a/playbooks/files/chaosknoten/configs/mumble/nginx/mumble.hamburg.ccc.de.conf b/resources/chaosknoten/mumble/nginx/mumble.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/mumble/nginx/mumble.hamburg.ccc.de.conf rename to resources/chaosknoten/mumble/nginx/mumble.hamburg.ccc.de.conf diff --git a/playbooks/templates/chaosknoten/configs/onlyoffice/compose.yaml.j2 b/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/onlyoffice/compose.yaml.j2 rename to resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf b/resources/chaosknoten/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf rename to resources/chaosknoten/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf diff --git a/playbooks/templates/chaosknoten/configs/pad/compose.yaml.j2 b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/pad/compose.yaml.j2 rename to resources/chaosknoten/pad/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/pad/nginx/pad.hamburg.ccc.de.conf b/resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/pad/nginx/pad.hamburg.ccc.de.conf rename to resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf diff --git a/playbooks/templates/chaosknoten/configs/pretalx/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/pretalx/compose.yaml.j2 rename to resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/pretalx/nginx/pretalx.hamburg.ccc.de.conf b/resources/chaosknoten/pretalx/nginx/pretalx.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/pretalx/nginx/pretalx.hamburg.ccc.de.conf rename to resources/chaosknoten/pretalx/nginx/pretalx.hamburg.ccc.de.conf diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf rename to resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf rename to resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf diff --git a/playbooks/templates/chaosknoten/configs/tickets/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/tickets/compose.yaml.j2 rename to resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 diff --git a/playbooks/templates/chaosknoten/configs/tickets/pretix.cfg.j2 b/resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/tickets/pretix.cfg.j2 rename to resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2 diff --git a/playbooks/files/chaosknoten/configs/tickets/nginx/tickets.hamburg.ccc.de.conf b/resources/chaosknoten/tickets/nginx/tickets.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/tickets/nginx/tickets.hamburg.ccc.de.conf rename to resources/chaosknoten/tickets/nginx/tickets.hamburg.ccc.de.conf diff --git a/playbooks/files/chaosknoten/configs/wiki/nginx/wiki.ccchh.net.conf b/resources/chaosknoten/wiki/nginx/wiki.ccchh.net.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/wiki/nginx/wiki.ccchh.net.conf rename to resources/chaosknoten/wiki/nginx/wiki.ccchh.net.conf diff --git a/playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf b/resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf rename to resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf diff --git a/playbooks/templates/chaosknoten/configs/zammad/compose.yaml.j2 b/resources/chaosknoten/zammad/docker_compose/compose.yaml.j2 similarity index 100% rename from playbooks/templates/chaosknoten/configs/zammad/compose.yaml.j2 rename to resources/chaosknoten/zammad/docker_compose/compose.yaml.j2 diff --git a/playbooks/files/chaosknoten/configs/zammad/nginx/zammad.hamburg.ccc.de.conf b/resources/chaosknoten/zammad/nginx/zammad.hamburg.ccc.de.conf similarity index 100% rename from playbooks/files/chaosknoten/configs/zammad/nginx/zammad.hamburg.ccc.de.conf rename to resources/chaosknoten/zammad/nginx/zammad.hamburg.ccc.de.conf diff --git a/playbooks/files/z9/configs/light/nginx/http_handler.conf b/resources/z9/light/nginx/http_handler.conf similarity index 100% rename from playbooks/files/z9/configs/light/nginx/http_handler.conf rename to resources/z9/light/nginx/http_handler.conf diff --git a/playbooks/files/z9/configs/light/nginx/light.conf b/resources/z9/light/nginx/light.conf similarity index 100% rename from playbooks/files/z9/configs/light/nginx/light.conf rename to resources/z9/light/nginx/light.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-artnet.conf b/resources/z9/light/ola/ola-artnet.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-artnet.conf rename to resources/z9/light/ola/ola-artnet.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-dummy.conf b/resources/z9/light/ola/ola-dummy.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-dummy.conf rename to resources/z9/light/ola/ola-dummy.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-e131.conf b/resources/z9/light/ola/ola-e131.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-e131.conf rename to resources/z9/light/ola/ola-e131.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-espnet.conf b/resources/z9/light/ola/ola-espnet.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-espnet.conf rename to resources/z9/light/ola/ola-espnet.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-ftdidmx.conf b/resources/z9/light/ola/ola-ftdidmx.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-ftdidmx.conf rename to resources/z9/light/ola/ola-ftdidmx.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-gpio.conf b/resources/z9/light/ola/ola-gpio.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-gpio.conf rename to resources/z9/light/ola/ola-gpio.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-karate.conf b/resources/z9/light/ola/ola-karate.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-karate.conf rename to resources/z9/light/ola/ola-karate.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-kinet.conf b/resources/z9/light/ola/ola-kinet.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-kinet.conf rename to resources/z9/light/ola/ola-kinet.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-milinst.conf b/resources/z9/light/ola/ola-milinst.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-milinst.conf rename to resources/z9/light/ola/ola-milinst.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-opendmx.conf b/resources/z9/light/ola/ola-opendmx.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-opendmx.conf rename to resources/z9/light/ola/ola-opendmx.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-openpixelcontrol.conf b/resources/z9/light/ola/ola-openpixelcontrol.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-openpixelcontrol.conf rename to resources/z9/light/ola/ola-openpixelcontrol.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-osc.conf b/resources/z9/light/ola/ola-osc.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-osc.conf rename to resources/z9/light/ola/ola-osc.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-pathport.conf b/resources/z9/light/ola/ola-pathport.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-pathport.conf rename to resources/z9/light/ola/ola-pathport.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-port.conf b/resources/z9/light/ola/ola-port.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-port.conf rename to resources/z9/light/ola/ola-port.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-renard.conf b/resources/z9/light/ola/ola-renard.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-renard.conf rename to resources/z9/light/ola/ola-renard.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-sandnet.conf b/resources/z9/light/ola/ola-sandnet.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-sandnet.conf rename to resources/z9/light/ola/ola-sandnet.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-server.conf b/resources/z9/light/ola/ola-server.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-server.conf rename to resources/z9/light/ola/ola-server.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-shownet.conf b/resources/z9/light/ola/ola-shownet.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-shownet.conf rename to resources/z9/light/ola/ola-shownet.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-spi.conf b/resources/z9/light/ola/ola-spi.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-spi.conf rename to resources/z9/light/ola/ola-spi.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-stageprofi.conf b/resources/z9/light/ola/ola-stageprofi.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-stageprofi.conf rename to resources/z9/light/ola/ola-stageprofi.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-uartdmx.conf b/resources/z9/light/ola/ola-uartdmx.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-uartdmx.conf rename to resources/z9/light/ola/ola-uartdmx.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-universe.conf b/resources/z9/light/ola/ola-universe.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-universe.conf rename to resources/z9/light/ola/ola-universe.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-usbdmx.conf b/resources/z9/light/ola/ola-usbdmx.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-usbdmx.conf rename to resources/z9/light/ola/ola-usbdmx.conf diff --git a/playbooks/files/z9/configs/light/ola/ola-usbserial.conf b/resources/z9/light/ola/ola-usbserial.conf similarity index 100% rename from playbooks/files/z9/configs/light/ola/ola-usbserial.conf rename to resources/z9/light/ola/ola-usbserial.conf diff --git a/playbooks/roles/add_apt_repository/meta/argument_specs.yaml b/roles/add_apt_repository/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/add_apt_repository/meta/argument_specs.yaml rename to roles/add_apt_repository/meta/argument_specs.yaml diff --git a/playbooks/roles/add_apt_repository/tasks/main.yaml b/roles/add_apt_repository/tasks/main.yaml similarity index 100% rename from playbooks/roles/add_apt_repository/tasks/main.yaml rename to roles/add_apt_repository/tasks/main.yaml diff --git a/playbooks/roles/apt_update_and_upgrade/README.md b/roles/apt_update_and_upgrade/README.md similarity index 100% rename from playbooks/roles/apt_update_and_upgrade/README.md rename to roles/apt_update_and_upgrade/README.md diff --git a/playbooks/roles/apt_update_and_upgrade/handlers/main.yaml b/roles/apt_update_and_upgrade/handlers/main.yaml similarity index 100% rename from playbooks/roles/apt_update_and_upgrade/handlers/main.yaml rename to roles/apt_update_and_upgrade/handlers/main.yaml diff --git a/playbooks/roles/apt_update_and_upgrade/tasks/main.yaml b/roles/apt_update_and_upgrade/tasks/main.yaml similarity index 100% rename from playbooks/roles/apt_update_and_upgrade/tasks/main.yaml rename to roles/apt_update_and_upgrade/tasks/main.yaml diff --git a/playbooks/roles/certbot/README.md b/roles/certbot/README.md similarity index 100% rename from playbooks/roles/certbot/README.md rename to roles/certbot/README.md diff --git a/playbooks/roles/certbot/defaults/main.yaml b/roles/certbot/defaults/main.yaml similarity index 100% rename from playbooks/roles/certbot/defaults/main.yaml rename to roles/certbot/defaults/main.yaml diff --git a/playbooks/roles/certbot/meta/argument_specs.yaml b/roles/certbot/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/certbot/meta/argument_specs.yaml rename to roles/certbot/meta/argument_specs.yaml diff --git a/playbooks/roles/certbot/meta/main.yaml b/roles/certbot/meta/main.yaml similarity index 100% rename from playbooks/roles/certbot/meta/main.yaml rename to roles/certbot/meta/main.yaml diff --git a/playbooks/roles/certbot/tasks/main.yaml b/roles/certbot/tasks/main.yaml similarity index 100% rename from playbooks/roles/certbot/tasks/main.yaml rename to roles/certbot/tasks/main.yaml diff --git a/playbooks/roles/certbot/tasks/main/cert.yaml b/roles/certbot/tasks/main/cert.yaml similarity index 100% rename from playbooks/roles/certbot/tasks/main/cert.yaml rename to roles/certbot/tasks/main/cert.yaml diff --git a/playbooks/roles/certbot/tasks/main/certs.yaml b/roles/certbot/tasks/main/certs.yaml similarity index 100% rename from playbooks/roles/certbot/tasks/main/certs.yaml rename to roles/certbot/tasks/main/certs.yaml diff --git a/playbooks/roles/certbot/tasks/main/install.yaml b/roles/certbot/tasks/main/install.yaml similarity index 100% rename from playbooks/roles/certbot/tasks/main/install.yaml rename to roles/certbot/tasks/main/install.yaml diff --git a/playbooks/roles/certbot/tasks/main/new_cert_commands.yaml b/roles/certbot/tasks/main/new_cert_commands.yaml similarity index 100% rename from playbooks/roles/certbot/tasks/main/new_cert_commands.yaml rename to roles/certbot/tasks/main/new_cert_commands.yaml diff --git a/playbooks/roles/certbot/templates/renewal_deploy_hook_commands.sh.j2 b/roles/certbot/templates/renewal_deploy_hook_commands.sh.j2 similarity index 100% rename from playbooks/roles/certbot/templates/renewal_deploy_hook_commands.sh.j2 rename to roles/certbot/templates/renewal_deploy_hook_commands.sh.j2 diff --git a/playbooks/roles/deploy_ssh_server_config/README.md b/roles/deploy_ssh_server_config/README.md similarity index 100% rename from playbooks/roles/deploy_ssh_server_config/README.md rename to roles/deploy_ssh_server_config/README.md diff --git a/playbooks/roles/deploy_ssh_server_config/docs/Debian_11_cloud_2023-04-21_default_etc_ssh_sshd_config b/roles/deploy_ssh_server_config/docs/Debian_11_cloud_2023-04-21_default_etc_ssh_sshd_config similarity index 100% rename from playbooks/roles/deploy_ssh_server_config/docs/Debian_11_cloud_2023-04-21_default_etc_ssh_sshd_config rename to roles/deploy_ssh_server_config/docs/Debian_11_cloud_2023-04-21_default_etc_ssh_sshd_config diff --git a/playbooks/roles/deploy_ssh_server_config/docs/Debian_12_cloud_2023-07-25_default_etc_ssh_sshd_config b/roles/deploy_ssh_server_config/docs/Debian_12_cloud_2023-07-25_default_etc_ssh_sshd_config similarity index 100% rename from playbooks/roles/deploy_ssh_server_config/docs/Debian_12_cloud_2023-07-25_default_etc_ssh_sshd_config rename to roles/deploy_ssh_server_config/docs/Debian_12_cloud_2023-07-25_default_etc_ssh_sshd_config diff --git a/playbooks/roles/deploy_ssh_server_config/handlers/main.yaml b/roles/deploy_ssh_server_config/handlers/main.yaml similarity index 100% rename from playbooks/roles/deploy_ssh_server_config/handlers/main.yaml rename to roles/deploy_ssh_server_config/handlers/main.yaml diff --git a/playbooks/roles/deploy_ssh_server_config/tasks/main.yaml b/roles/deploy_ssh_server_config/tasks/main.yaml similarity index 100% rename from playbooks/roles/deploy_ssh_server_config/tasks/main.yaml rename to roles/deploy_ssh_server_config/tasks/main.yaml diff --git a/playbooks/roles/deploy_ssh_server_config/templates/sshd_config.j2 b/roles/deploy_ssh_server_config/templates/sshd_config.j2 similarity index 100% rename from playbooks/roles/deploy_ssh_server_config/templates/sshd_config.j2 rename to roles/deploy_ssh_server_config/templates/sshd_config.j2 diff --git a/playbooks/roles/distribution_check/README.md b/roles/distribution_check/README.md similarity index 100% rename from playbooks/roles/distribution_check/README.md rename to roles/distribution_check/README.md diff --git a/playbooks/roles/distribution_check/meta/argument_specs.yaml b/roles/distribution_check/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/distribution_check/meta/argument_specs.yaml rename to roles/distribution_check/meta/argument_specs.yaml diff --git a/playbooks/roles/distribution_check/tasks/main.yaml b/roles/distribution_check/tasks/main.yaml similarity index 100% rename from playbooks/roles/distribution_check/tasks/main.yaml rename to roles/distribution_check/tasks/main.yaml diff --git a/playbooks/roles/docker/README.md b/roles/docker/README.md similarity index 100% rename from playbooks/roles/docker/README.md rename to roles/docker/README.md diff --git a/playbooks/roles/docker/meta/main.yaml b/roles/docker/meta/main.yaml similarity index 100% rename from playbooks/roles/docker/meta/main.yaml rename to roles/docker/meta/main.yaml diff --git a/playbooks/roles/docker/tasks/main.yaml b/roles/docker/tasks/main.yaml similarity index 100% rename from playbooks/roles/docker/tasks/main.yaml rename to roles/docker/tasks/main.yaml diff --git a/playbooks/roles/docker/tasks/main/01_repo_setup.yaml b/roles/docker/tasks/main/01_repo_setup.yaml similarity index 100% rename from playbooks/roles/docker/tasks/main/01_repo_setup.yaml rename to roles/docker/tasks/main/01_repo_setup.yaml diff --git a/playbooks/roles/docker/tasks/main/02_docker_install.yaml b/roles/docker/tasks/main/02_docker_install.yaml similarity index 100% rename from playbooks/roles/docker/tasks/main/02_docker_install.yaml rename to roles/docker/tasks/main/02_docker_install.yaml diff --git a/playbooks/roles/docker_compose/README.md b/roles/docker_compose/README.md similarity index 100% rename from playbooks/roles/docker_compose/README.md rename to roles/docker_compose/README.md diff --git a/playbooks/roles/docker_compose/defaults/main.yaml b/roles/docker_compose/defaults/main.yaml similarity index 100% rename from playbooks/roles/docker_compose/defaults/main.yaml rename to roles/docker_compose/defaults/main.yaml diff --git a/playbooks/roles/docker_compose/handlers/main.yaml b/roles/docker_compose/handlers/main.yaml similarity index 100% rename from playbooks/roles/docker_compose/handlers/main.yaml rename to roles/docker_compose/handlers/main.yaml diff --git a/playbooks/roles/docker_compose/meta/argument_specs.yaml b/roles/docker_compose/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/docker_compose/meta/argument_specs.yaml rename to roles/docker_compose/meta/argument_specs.yaml diff --git a/playbooks/roles/docker_compose/meta/main.yaml b/roles/docker_compose/meta/main.yaml similarity index 100% rename from playbooks/roles/docker_compose/meta/main.yaml rename to roles/docker_compose/meta/main.yaml diff --git a/playbooks/roles/docker_compose/tasks/main.yaml b/roles/docker_compose/tasks/main.yaml similarity index 100% rename from playbooks/roles/docker_compose/tasks/main.yaml rename to roles/docker_compose/tasks/main.yaml diff --git a/playbooks/roles/dokuwiki/README.md b/roles/dokuwiki/README.md similarity index 100% rename from playbooks/roles/dokuwiki/README.md rename to roles/dokuwiki/README.md diff --git a/playbooks/roles/dokuwiki/defaults/main.yml b/roles/dokuwiki/defaults/main.yml similarity index 100% rename from playbooks/roles/dokuwiki/defaults/main.yml rename to roles/dokuwiki/defaults/main.yml diff --git a/playbooks/roles/dokuwiki/files/mime.local.conf b/roles/dokuwiki/files/mime.local.conf similarity index 100% rename from playbooks/roles/dokuwiki/files/mime.local.conf rename to roles/dokuwiki/files/mime.local.conf diff --git a/playbooks/roles/dokuwiki/handlers/main.yml b/roles/dokuwiki/handlers/main.yml similarity index 100% rename from playbooks/roles/dokuwiki/handlers/main.yml rename to roles/dokuwiki/handlers/main.yml diff --git a/playbooks/roles/dokuwiki/meta/main.yml b/roles/dokuwiki/meta/main.yml similarity index 100% rename from playbooks/roles/dokuwiki/meta/main.yml rename to roles/dokuwiki/meta/main.yml diff --git a/playbooks/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml similarity index 100% rename from playbooks/roles/dokuwiki/tasks/main.yml rename to roles/dokuwiki/tasks/main.yml diff --git a/playbooks/roles/dokuwiki/templates/php-fpm-dokuwiki.conf b/roles/dokuwiki/templates/php-fpm-dokuwiki.conf similarity index 100% rename from playbooks/roles/dokuwiki/templates/php-fpm-dokuwiki.conf rename to roles/dokuwiki/templates/php-fpm-dokuwiki.conf diff --git a/playbooks/roles/foobazdmx/defaults/main.yaml b/roles/foobazdmx/defaults/main.yaml similarity index 100% rename from playbooks/roles/foobazdmx/defaults/main.yaml rename to roles/foobazdmx/defaults/main.yaml diff --git a/playbooks/roles/foobazdmx/handlers/main.yaml b/roles/foobazdmx/handlers/main.yaml similarity index 100% rename from playbooks/roles/foobazdmx/handlers/main.yaml rename to roles/foobazdmx/handlers/main.yaml diff --git a/playbooks/roles/foobazdmx/meta/argument_specs.yaml b/roles/foobazdmx/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/foobazdmx/meta/argument_specs.yaml rename to roles/foobazdmx/meta/argument_specs.yaml diff --git a/playbooks/roles/foobazdmx/meta/main.yaml b/roles/foobazdmx/meta/main.yaml similarity index 100% rename from playbooks/roles/foobazdmx/meta/main.yaml rename to roles/foobazdmx/meta/main.yaml diff --git a/playbooks/roles/foobazdmx/tasks/main.yaml b/roles/foobazdmx/tasks/main.yaml similarity index 100% rename from playbooks/roles/foobazdmx/tasks/main.yaml rename to roles/foobazdmx/tasks/main.yaml diff --git a/playbooks/roles/foobazdmx/templates/foobazdmx-shop.service.j2 b/roles/foobazdmx/templates/foobazdmx-shop.service.j2 similarity index 100% rename from playbooks/roles/foobazdmx/templates/foobazdmx-shop.service.j2 rename to roles/foobazdmx/templates/foobazdmx-shop.service.j2 diff --git a/playbooks/roles/foobazdmx/templates/foobazdmx.service.j2 b/roles/foobazdmx/templates/foobazdmx.service.j2 similarity index 100% rename from playbooks/roles/foobazdmx/templates/foobazdmx.service.j2 rename to roles/foobazdmx/templates/foobazdmx.service.j2 diff --git a/playbooks/roles/infrastructure_authorized_keys/README.md b/roles/infrastructure_authorized_keys/README.md similarity index 100% rename from playbooks/roles/infrastructure_authorized_keys/README.md rename to roles/infrastructure_authorized_keys/README.md diff --git a/playbooks/roles/infrastructure_authorized_keys/tasks/main.yaml b/roles/infrastructure_authorized_keys/tasks/main.yaml similarity index 100% rename from playbooks/roles/infrastructure_authorized_keys/tasks/main.yaml rename to roles/infrastructure_authorized_keys/tasks/main.yaml diff --git a/playbooks/roles/nextcloud/README.md b/roles/nextcloud/README.md similarity index 100% rename from playbooks/roles/nextcloud/README.md rename to roles/nextcloud/README.md diff --git a/playbooks/roles/nextcloud/defaults/main.yaml b/roles/nextcloud/defaults/main.yaml similarity index 100% rename from playbooks/roles/nextcloud/defaults/main.yaml rename to roles/nextcloud/defaults/main.yaml diff --git a/playbooks/roles/nextcloud/files/supervisord.conf b/roles/nextcloud/files/supervisord.conf similarity index 100% rename from playbooks/roles/nextcloud/files/supervisord.conf rename to roles/nextcloud/files/supervisord.conf diff --git a/playbooks/roles/nextcloud/meta/argument_specs.yaml b/roles/nextcloud/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/nextcloud/meta/argument_specs.yaml rename to roles/nextcloud/meta/argument_specs.yaml diff --git a/playbooks/roles/nextcloud/meta/main.yaml b/roles/nextcloud/meta/main.yaml similarity index 100% rename from playbooks/roles/nextcloud/meta/main.yaml rename to roles/nextcloud/meta/main.yaml diff --git a/playbooks/roles/nextcloud/tasks/main.yaml b/roles/nextcloud/tasks/main.yaml similarity index 100% rename from playbooks/roles/nextcloud/tasks/main.yaml rename to roles/nextcloud/tasks/main.yaml diff --git a/playbooks/roles/nextcloud/templates/compose.yaml.j2 b/roles/nextcloud/templates/compose.yaml.j2 similarity index 100% rename from playbooks/roles/nextcloud/templates/compose.yaml.j2 rename to roles/nextcloud/templates/compose.yaml.j2 diff --git a/playbooks/roles/nextcloud/templates/nginx_nextcloud.conf.j2 b/roles/nextcloud/templates/nginx_nextcloud.conf.j2 similarity index 100% rename from playbooks/roles/nextcloud/templates/nginx_nextcloud.conf.j2 rename to roles/nextcloud/templates/nginx_nextcloud.conf.j2 diff --git a/playbooks/roles/nginx/README.md b/roles/nginx/README.md similarity index 100% rename from playbooks/roles/nginx/README.md rename to roles/nginx/README.md diff --git a/playbooks/roles/nginx/defaults/main.yaml b/roles/nginx/defaults/main.yaml similarity index 100% rename from playbooks/roles/nginx/defaults/main.yaml rename to roles/nginx/defaults/main.yaml diff --git a/playbooks/roles/nginx/files/redirect.conf b/roles/nginx/files/redirect.conf similarity index 100% rename from playbooks/roles/nginx/files/redirect.conf rename to roles/nginx/files/redirect.conf diff --git a/playbooks/roles/nginx/files/tls.conf b/roles/nginx/files/tls.conf similarity index 100% rename from playbooks/roles/nginx/files/tls.conf rename to roles/nginx/files/tls.conf diff --git a/playbooks/roles/nginx/handlers/main.yaml b/roles/nginx/handlers/main.yaml similarity index 100% rename from playbooks/roles/nginx/handlers/main.yaml rename to roles/nginx/handlers/main.yaml diff --git a/playbooks/roles/nginx/meta/argument_specs.yaml b/roles/nginx/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/nginx/meta/argument_specs.yaml rename to roles/nginx/meta/argument_specs.yaml diff --git a/playbooks/roles/nginx/meta/main.yaml b/roles/nginx/meta/main.yaml similarity index 100% rename from playbooks/roles/nginx/meta/main.yaml rename to roles/nginx/meta/main.yaml diff --git a/playbooks/roles/nginx/tasks/main.yaml b/roles/nginx/tasks/main.yaml similarity index 100% rename from playbooks/roles/nginx/tasks/main.yaml rename to roles/nginx/tasks/main.yaml diff --git a/playbooks/roles/nginx/tasks/main/config_deploy.yaml b/roles/nginx/tasks/main/config_deploy.yaml similarity index 100% rename from playbooks/roles/nginx/tasks/main/config_deploy.yaml rename to roles/nginx/tasks/main/config_deploy.yaml diff --git a/playbooks/roles/nginx/tasks/main/nginx_install.yaml b/roles/nginx/tasks/main/nginx_install.yaml similarity index 100% rename from playbooks/roles/nginx/tasks/main/nginx_install.yaml rename to roles/nginx/tasks/main/nginx_install.yaml diff --git a/playbooks/roles/nginx/tasks/main/repo_setup.yaml b/roles/nginx/tasks/main/repo_setup.yaml similarity index 100% rename from playbooks/roles/nginx/tasks/main/repo_setup.yaml rename to roles/nginx/tasks/main/repo_setup.yaml diff --git a/playbooks/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml b/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml similarity index 100% rename from playbooks/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml rename to roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml diff --git a/playbooks/roles/ola/handlers/main.yaml b/roles/ola/handlers/main.yaml similarity index 100% rename from playbooks/roles/ola/handlers/main.yaml rename to roles/ola/handlers/main.yaml diff --git a/playbooks/roles/ola/meta/argument_specs.yaml b/roles/ola/meta/argument_specs.yaml similarity index 100% rename from playbooks/roles/ola/meta/argument_specs.yaml rename to roles/ola/meta/argument_specs.yaml diff --git a/playbooks/roles/ola/meta/main.yaml b/roles/ola/meta/main.yaml similarity index 100% rename from playbooks/roles/ola/meta/main.yaml rename to roles/ola/meta/main.yaml diff --git a/playbooks/roles/ola/tasks/main.yaml b/roles/ola/tasks/main.yaml similarity index 100% rename from playbooks/roles/ola/tasks/main.yaml rename to roles/ola/tasks/main.yaml diff --git a/playbooks/roles/ola/templates/ola-ftdidmx.conf.j2 b/roles/ola/templates/ola-ftdidmx.conf.j2 similarity index 100% rename from playbooks/roles/ola/templates/ola-ftdidmx.conf.j2 rename to roles/ola/templates/ola-ftdidmx.conf.j2 diff --git a/playbooks/roles/prometheus_node_exporter/meta/main.yaml b/roles/prometheus_node_exporter/meta/main.yaml similarity index 100% rename from playbooks/roles/prometheus_node_exporter/meta/main.yaml rename to roles/prometheus_node_exporter/meta/main.yaml diff --git a/playbooks/roles/prometheus_node_exporter/tasks/main.yaml b/roles/prometheus_node_exporter/tasks/main.yaml similarity index 100% rename from playbooks/roles/prometheus_node_exporter/tasks/main.yaml rename to roles/prometheus_node_exporter/tasks/main.yaml