From 07dbbf055c4480428fe054562a7e2d51f181038a Mon Sep 17 00:00:00 2001 From: June Date: Thu, 5 Dec 2024 22:18:27 +0100 Subject: [PATCH] reorganize (config) files and templates into one "resources" dir This groups the files and templates for each host together and therefore makes it easier to see all the (config) files for a host. Also clean up incorrect, unused docker_compose config for mumble and clean up unused engelsystem configs. --- .../chaosknoten/host_vars/ccchoir.yaml | 4 +- inventories/chaosknoten/host_vars/cloud.yaml | 4 +- .../chaosknoten/host_vars/grafana.yaml | 16 ++--- .../chaosknoten/host_vars/keycloak.yaml | 8 +-- inventories/chaosknoten/host_vars/lists.yaml | 6 +- inventories/chaosknoten/host_vars/mumble.yaml | 5 +- .../chaosknoten/host_vars/onlyoffice.yaml | 4 +- inventories/chaosknoten/host_vars/pad.yaml | 4 +- .../chaosknoten/host_vars/pretalx.yaml | 4 +- .../host_vars/public-reverse-proxy.yaml | 4 +- .../chaosknoten/host_vars/tickets.yaml | 6 +- inventories/chaosknoten/host_vars/wiki.yaml | 4 +- inventories/chaosknoten/host_vars/zammad.yaml | 4 +- inventories/z9/host_vars/light.yaml | 52 ++++++++--------- playbooks/files | 1 - playbooks/resources | 1 + playbooks/templates | 1 - .../ccchoir/docker_compose}/compose.yaml.j2 | 0 .../ccchoir/nginx/ccchoir.de.conf | 0 .../cloud/nextcloud}/config.php.j2 | 0 .../extra_configuration.config.php.j2 | 0 .../Photos/augenohrenkatze.jpg | Bin .../Photos/ccclubhajs.jpg | Bin .../new_user_skeleton_directory/README.md | 0 .../docker_compose/alertmanager.yaml.j2 | 0 .../alertmanager_alert_templates.tmpl | 0 .../grafana/docker_compose}/compose.yaml.j2 | 0 .../docker_compose/grafana-datasource.yml | 0 .../docker_compose/grafana.ini.example | 0 .../grafana/docker_compose/grafana.ini.j2 | 0 .../grafana/docker_compose/prometheus.yml | 0 .../prometheus_alerts.rules.yaml | 0 .../grafana/nginx/grafana.hamburg.ccc.de.conf | 0 .../keycloak/docker_compose}/compose.yaml.j2 | 0 .../keycloak/nginx/id.hamburg.ccc.de.conf | 0 .../keycloak/nginx/invite.hamburg.ccc.de.conf | 0 .../nginx/keycloak-admin.hamburg.ccc.de.conf | 0 .../lists/docker_compose}/compose.yaml | 0 .../lists/nginx/lists.c3lingo.org.conf | 0 .../lists/nginx/lists.hamburg.ccc.de.conf | 0 .../mumble/nginx/mumble.hamburg.ccc.de.conf | 0 .../docker_compose}/compose.yaml.j2 | 0 .../nginx/onlyoffice.hamburg.ccc.de.conf | 0 .../pad/docker_compose}/compose.yaml.j2 | 0 .../pad/nginx/pad.hamburg.ccc.de.conf | 0 .../pretalx/docker_compose}/compose.yaml.j2 | 0 .../pretalx/nginx/pretalx.hamburg.ccc.de.conf | 0 .../nginx/acme_challenge.conf | 0 .../public-reverse-proxy/nginx/nginx.conf | 0 .../tickets/docker_compose}/compose.yaml.j2 | 0 .../tickets/docker_compose}/pretix.cfg.j2 | 0 .../tickets/nginx/tickets.hamburg.ccc.de.conf | 0 .../wiki/nginx/wiki.ccchh.net.conf | 0 .../wiki/nginx/wiki.hamburg.ccc.de.conf | 0 .../zammad/docker_compose}/compose.yaml.j2 | 0 .../zammad/nginx/zammad.hamburg.ccc.de.conf | 0 .../z9}/light/nginx/http_handler.conf | 0 .../z9}/light/nginx/light.conf | 0 .../z9}/light/ola/ola-artnet.conf | 0 .../z9}/light/ola/ola-dummy.conf | 0 .../z9}/light/ola/ola-e131.conf | 0 .../z9}/light/ola/ola-espnet.conf | 0 .../z9}/light/ola/ola-ftdidmx.conf | 0 .../z9}/light/ola/ola-gpio.conf | 0 .../z9}/light/ola/ola-karate.conf | 0 .../z9}/light/ola/ola-kinet.conf | 0 .../z9}/light/ola/ola-milinst.conf | 0 .../z9}/light/ola/ola-opendmx.conf | 0 .../z9}/light/ola/ola-openpixelcontrol.conf | 0 .../z9}/light/ola/ola-osc.conf | 0 .../z9}/light/ola/ola-pathport.conf | 0 .../z9}/light/ola/ola-port.conf | 0 .../z9}/light/ola/ola-renard.conf | 0 .../z9}/light/ola/ola-sandnet.conf | 0 .../z9}/light/ola/ola-server.conf | 0 .../z9}/light/ola/ola-shownet.conf | 0 .../z9}/light/ola/ola-spi.conf | 0 .../z9}/light/ola/ola-stageprofi.conf | 0 .../z9}/light/ola/ola-uartdmx.conf | 0 .../z9}/light/ola/ola-universe.conf | 0 .../z9}/light/ola/ola-usbdmx.conf | 0 .../z9}/light/ola/ola-usbserial.conf | 0 .../configs/engelsystem/compose.yaml.j2 | 55 ------------------ 83 files changed, 62 insertions(+), 121 deletions(-) delete mode 120000 playbooks/files create mode 120000 playbooks/resources delete mode 120000 playbooks/templates rename {templates/chaosknoten/configs/ccchoir => resources/chaosknoten/ccchoir/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/ccchoir/nginx/ccchoir.de.conf (100%) rename {templates/chaosknoten/configs/cloud => resources/chaosknoten/cloud/nextcloud}/config.php.j2 (100%) rename {templates/chaosknoten/configs/cloud => resources/chaosknoten/cloud/nextcloud}/extra_configuration.config.php.j2 (100%) rename {files/chaosknoten/cloud => resources/chaosknoten/cloud/nextcloud}/new_user_skeleton_directory/Photos/augenohrenkatze.jpg (100%) rename {files/chaosknoten/cloud => resources/chaosknoten/cloud/nextcloud}/new_user_skeleton_directory/Photos/ccclubhajs.jpg (100%) rename {files/chaosknoten/cloud => resources/chaosknoten/cloud/nextcloud}/new_user_skeleton_directory/README.md (100%) rename {templates/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/alertmanager.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/alertmanager_alert_templates.tmpl (100%) rename {templates/chaosknoten/configs/grafana => resources/chaosknoten/grafana/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/grafana-datasource.yml (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/grafana.ini.example (100%) rename {templates/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/grafana.ini.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/prometheus.yml (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/grafana/docker_compose/prometheus_alerts.rules.yaml (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/grafana/nginx/grafana.hamburg.ccc.de.conf (100%) rename {templates/chaosknoten/configs/keycloak => resources/chaosknoten/keycloak/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/keycloak/nginx/id.hamburg.ccc.de.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/keycloak/nginx/invite.hamburg.ccc.de.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/keycloak/nginx/keycloak-admin.hamburg.ccc.de.conf (100%) rename {files/chaosknoten/configs/lists/compose => resources/chaosknoten/lists/docker_compose}/compose.yaml (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/lists/nginx/lists.c3lingo.org.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/lists/nginx/lists.hamburg.ccc.de.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/mumble/nginx/mumble.hamburg.ccc.de.conf (100%) rename {templates/chaosknoten/configs/onlyoffice => resources/chaosknoten/onlyoffice/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf (100%) rename {templates/chaosknoten/configs/pad => resources/chaosknoten/pad/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/pad/nginx/pad.hamburg.ccc.de.conf (100%) rename {templates/chaosknoten/configs/pretalx => resources/chaosknoten/pretalx/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/pretalx/nginx/pretalx.hamburg.ccc.de.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/public-reverse-proxy/nginx/acme_challenge.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/public-reverse-proxy/nginx/nginx.conf (100%) rename {templates/chaosknoten/configs/tickets => resources/chaosknoten/tickets/docker_compose}/compose.yaml.j2 (100%) rename {templates/chaosknoten/configs/tickets => resources/chaosknoten/tickets/docker_compose}/pretix.cfg.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/tickets/nginx/tickets.hamburg.ccc.de.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/wiki/nginx/wiki.ccchh.net.conf (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/wiki/nginx/wiki.hamburg.ccc.de.conf (100%) rename {templates/chaosknoten/configs/zammad => resources/chaosknoten/zammad/docker_compose}/compose.yaml.j2 (100%) rename {files/chaosknoten/configs => resources/chaosknoten}/zammad/nginx/zammad.hamburg.ccc.de.conf (100%) rename {files/z9/configs => resources/z9}/light/nginx/http_handler.conf (100%) rename {files/z9/configs => resources/z9}/light/nginx/light.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-artnet.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-dummy.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-e131.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-espnet.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-ftdidmx.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-gpio.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-karate.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-kinet.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-milinst.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-opendmx.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-openpixelcontrol.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-osc.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-pathport.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-port.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-renard.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-sandnet.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-server.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-shownet.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-spi.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-stageprofi.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-uartdmx.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-universe.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-usbdmx.conf (100%) rename {files/z9/configs => resources/z9}/light/ola/ola-usbserial.conf (100%) delete mode 100644 templates/chaosknoten/configs/engelsystem/compose.yaml.j2 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 944be68..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.j2') }}" + 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/files b/playbooks/files deleted file mode 120000 index feb1228..0000000 --- a/playbooks/files +++ /dev/null @@ -1 +0,0 @@ -../files \ No newline at end of file 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/templates b/playbooks/templates deleted file mode 120000 index 564a409..0000000 --- a/playbooks/templates +++ /dev/null @@ -1 +0,0 @@ -../templates \ No newline at end of file diff --git a/templates/chaosknoten/configs/ccchoir/compose.yaml.j2 b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/ccchoir/compose.yaml.j2 rename to resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 diff --git a/files/chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf b/resources/chaosknoten/ccchoir/nginx/ccchoir.de.conf similarity index 100% rename from files/chaosknoten/configs/ccchoir/nginx/ccchoir.de.conf rename to resources/chaosknoten/ccchoir/nginx/ccchoir.de.conf diff --git a/templates/chaosknoten/configs/cloud/config.php.j2 b/resources/chaosknoten/cloud/nextcloud/config.php.j2 similarity index 100% rename from templates/chaosknoten/configs/cloud/config.php.j2 rename to resources/chaosknoten/cloud/nextcloud/config.php.j2 diff --git a/templates/chaosknoten/configs/cloud/extra_configuration.config.php.j2 b/resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2 similarity index 100% rename from templates/chaosknoten/configs/cloud/extra_configuration.config.php.j2 rename to resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2 diff --git a/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 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/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 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/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 files/chaosknoten/cloud/new_user_skeleton_directory/README.md rename to resources/chaosknoten/cloud/nextcloud/new_user_skeleton_directory/README.md diff --git a/templates/chaosknoten/configs/grafana/docker_compose/alertmanager.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/alertmanager.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/grafana/docker_compose/alertmanager.yaml.j2 rename to resources/chaosknoten/grafana/docker_compose/alertmanager.yaml.j2 diff --git a/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 files/chaosknoten/configs/grafana/docker_compose/alertmanager_alert_templates.tmpl rename to resources/chaosknoten/grafana/docker_compose/alertmanager_alert_templates.tmpl diff --git a/templates/chaosknoten/configs/grafana/compose.yaml.j2 b/resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/grafana/compose.yaml.j2 rename to resources/chaosknoten/grafana/docker_compose/compose.yaml.j2 diff --git a/files/chaosknoten/configs/grafana/docker_compose/grafana-datasource.yml b/resources/chaosknoten/grafana/docker_compose/grafana-datasource.yml similarity index 100% rename from files/chaosknoten/configs/grafana/docker_compose/grafana-datasource.yml rename to resources/chaosknoten/grafana/docker_compose/grafana-datasource.yml diff --git a/files/chaosknoten/configs/grafana/docker_compose/grafana.ini.example b/resources/chaosknoten/grafana/docker_compose/grafana.ini.example similarity index 100% rename from files/chaosknoten/configs/grafana/docker_compose/grafana.ini.example rename to resources/chaosknoten/grafana/docker_compose/grafana.ini.example diff --git a/templates/chaosknoten/configs/grafana/docker_compose/grafana.ini.j2 b/resources/chaosknoten/grafana/docker_compose/grafana.ini.j2 similarity index 100% rename from templates/chaosknoten/configs/grafana/docker_compose/grafana.ini.j2 rename to resources/chaosknoten/grafana/docker_compose/grafana.ini.j2 diff --git a/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml b/resources/chaosknoten/grafana/docker_compose/prometheus.yml similarity index 100% rename from files/chaosknoten/configs/grafana/docker_compose/prometheus.yml rename to resources/chaosknoten/grafana/docker_compose/prometheus.yml diff --git a/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 files/chaosknoten/configs/grafana/docker_compose/prometheus_alerts.rules.yaml rename to resources/chaosknoten/grafana/docker_compose/prometheus_alerts.rules.yaml diff --git a/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 files/chaosknoten/configs/grafana/nginx/grafana.hamburg.ccc.de.conf rename to resources/chaosknoten/grafana/nginx/grafana.hamburg.ccc.de.conf diff --git a/templates/chaosknoten/configs/keycloak/compose.yaml.j2 b/resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/keycloak/compose.yaml.j2 rename to resources/chaosknoten/keycloak/docker_compose/compose.yaml.j2 diff --git a/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 files/chaosknoten/configs/keycloak/nginx/id.hamburg.ccc.de.conf rename to resources/chaosknoten/keycloak/nginx/id.hamburg.ccc.de.conf diff --git a/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 files/chaosknoten/configs/keycloak/nginx/invite.hamburg.ccc.de.conf rename to resources/chaosknoten/keycloak/nginx/invite.hamburg.ccc.de.conf diff --git a/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 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/files/chaosknoten/configs/lists/compose/compose.yaml b/resources/chaosknoten/lists/docker_compose/compose.yaml similarity index 100% rename from files/chaosknoten/configs/lists/compose/compose.yaml rename to resources/chaosknoten/lists/docker_compose/compose.yaml diff --git a/files/chaosknoten/configs/lists/nginx/lists.c3lingo.org.conf b/resources/chaosknoten/lists/nginx/lists.c3lingo.org.conf similarity index 100% rename from files/chaosknoten/configs/lists/nginx/lists.c3lingo.org.conf rename to resources/chaosknoten/lists/nginx/lists.c3lingo.org.conf diff --git a/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 files/chaosknoten/configs/lists/nginx/lists.hamburg.ccc.de.conf rename to resources/chaosknoten/lists/nginx/lists.hamburg.ccc.de.conf diff --git a/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 files/chaosknoten/configs/mumble/nginx/mumble.hamburg.ccc.de.conf rename to resources/chaosknoten/mumble/nginx/mumble.hamburg.ccc.de.conf diff --git a/templates/chaosknoten/configs/onlyoffice/compose.yaml.j2 b/resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/onlyoffice/compose.yaml.j2 rename to resources/chaosknoten/onlyoffice/docker_compose/compose.yaml.j2 diff --git a/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 files/chaosknoten/configs/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf rename to resources/chaosknoten/onlyoffice/nginx/onlyoffice.hamburg.ccc.de.conf diff --git a/templates/chaosknoten/configs/pad/compose.yaml.j2 b/resources/chaosknoten/pad/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/pad/compose.yaml.j2 rename to resources/chaosknoten/pad/docker_compose/compose.yaml.j2 diff --git a/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 files/chaosknoten/configs/pad/nginx/pad.hamburg.ccc.de.conf rename to resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf diff --git a/templates/chaosknoten/configs/pretalx/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/pretalx/compose.yaml.j2 rename to resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 diff --git a/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 files/chaosknoten/configs/pretalx/nginx/pretalx.hamburg.ccc.de.conf rename to resources/chaosknoten/pretalx/nginx/pretalx.hamburg.ccc.de.conf diff --git a/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 files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf rename to resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf diff --git a/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf similarity index 100% rename from files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf rename to resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf diff --git a/templates/chaosknoten/configs/tickets/compose.yaml.j2 b/resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/tickets/compose.yaml.j2 rename to resources/chaosknoten/tickets/docker_compose/compose.yaml.j2 diff --git a/templates/chaosknoten/configs/tickets/pretix.cfg.j2 b/resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2 similarity index 100% rename from templates/chaosknoten/configs/tickets/pretix.cfg.j2 rename to resources/chaosknoten/tickets/docker_compose/pretix.cfg.j2 diff --git a/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 files/chaosknoten/configs/tickets/nginx/tickets.hamburg.ccc.de.conf rename to resources/chaosknoten/tickets/nginx/tickets.hamburg.ccc.de.conf diff --git a/files/chaosknoten/configs/wiki/nginx/wiki.ccchh.net.conf b/resources/chaosknoten/wiki/nginx/wiki.ccchh.net.conf similarity index 100% rename from files/chaosknoten/configs/wiki/nginx/wiki.ccchh.net.conf rename to resources/chaosknoten/wiki/nginx/wiki.ccchh.net.conf diff --git a/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 files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf rename to resources/chaosknoten/wiki/nginx/wiki.hamburg.ccc.de.conf diff --git a/templates/chaosknoten/configs/zammad/compose.yaml.j2 b/resources/chaosknoten/zammad/docker_compose/compose.yaml.j2 similarity index 100% rename from templates/chaosknoten/configs/zammad/compose.yaml.j2 rename to resources/chaosknoten/zammad/docker_compose/compose.yaml.j2 diff --git a/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 files/chaosknoten/configs/zammad/nginx/zammad.hamburg.ccc.de.conf rename to resources/chaosknoten/zammad/nginx/zammad.hamburg.ccc.de.conf diff --git a/files/z9/configs/light/nginx/http_handler.conf b/resources/z9/light/nginx/http_handler.conf similarity index 100% rename from files/z9/configs/light/nginx/http_handler.conf rename to resources/z9/light/nginx/http_handler.conf diff --git a/files/z9/configs/light/nginx/light.conf b/resources/z9/light/nginx/light.conf similarity index 100% rename from files/z9/configs/light/nginx/light.conf rename to resources/z9/light/nginx/light.conf diff --git a/files/z9/configs/light/ola/ola-artnet.conf b/resources/z9/light/ola/ola-artnet.conf similarity index 100% rename from files/z9/configs/light/ola/ola-artnet.conf rename to resources/z9/light/ola/ola-artnet.conf diff --git a/files/z9/configs/light/ola/ola-dummy.conf b/resources/z9/light/ola/ola-dummy.conf similarity index 100% rename from files/z9/configs/light/ola/ola-dummy.conf rename to resources/z9/light/ola/ola-dummy.conf diff --git a/files/z9/configs/light/ola/ola-e131.conf b/resources/z9/light/ola/ola-e131.conf similarity index 100% rename from files/z9/configs/light/ola/ola-e131.conf rename to resources/z9/light/ola/ola-e131.conf diff --git a/files/z9/configs/light/ola/ola-espnet.conf b/resources/z9/light/ola/ola-espnet.conf similarity index 100% rename from files/z9/configs/light/ola/ola-espnet.conf rename to resources/z9/light/ola/ola-espnet.conf diff --git a/files/z9/configs/light/ola/ola-ftdidmx.conf b/resources/z9/light/ola/ola-ftdidmx.conf similarity index 100% rename from files/z9/configs/light/ola/ola-ftdidmx.conf rename to resources/z9/light/ola/ola-ftdidmx.conf diff --git a/files/z9/configs/light/ola/ola-gpio.conf b/resources/z9/light/ola/ola-gpio.conf similarity index 100% rename from files/z9/configs/light/ola/ola-gpio.conf rename to resources/z9/light/ola/ola-gpio.conf diff --git a/files/z9/configs/light/ola/ola-karate.conf b/resources/z9/light/ola/ola-karate.conf similarity index 100% rename from files/z9/configs/light/ola/ola-karate.conf rename to resources/z9/light/ola/ola-karate.conf diff --git a/files/z9/configs/light/ola/ola-kinet.conf b/resources/z9/light/ola/ola-kinet.conf similarity index 100% rename from files/z9/configs/light/ola/ola-kinet.conf rename to resources/z9/light/ola/ola-kinet.conf diff --git a/files/z9/configs/light/ola/ola-milinst.conf b/resources/z9/light/ola/ola-milinst.conf similarity index 100% rename from files/z9/configs/light/ola/ola-milinst.conf rename to resources/z9/light/ola/ola-milinst.conf diff --git a/files/z9/configs/light/ola/ola-opendmx.conf b/resources/z9/light/ola/ola-opendmx.conf similarity index 100% rename from files/z9/configs/light/ola/ola-opendmx.conf rename to resources/z9/light/ola/ola-opendmx.conf diff --git a/files/z9/configs/light/ola/ola-openpixelcontrol.conf b/resources/z9/light/ola/ola-openpixelcontrol.conf similarity index 100% rename from files/z9/configs/light/ola/ola-openpixelcontrol.conf rename to resources/z9/light/ola/ola-openpixelcontrol.conf diff --git a/files/z9/configs/light/ola/ola-osc.conf b/resources/z9/light/ola/ola-osc.conf similarity index 100% rename from files/z9/configs/light/ola/ola-osc.conf rename to resources/z9/light/ola/ola-osc.conf diff --git a/files/z9/configs/light/ola/ola-pathport.conf b/resources/z9/light/ola/ola-pathport.conf similarity index 100% rename from files/z9/configs/light/ola/ola-pathport.conf rename to resources/z9/light/ola/ola-pathport.conf diff --git a/files/z9/configs/light/ola/ola-port.conf b/resources/z9/light/ola/ola-port.conf similarity index 100% rename from files/z9/configs/light/ola/ola-port.conf rename to resources/z9/light/ola/ola-port.conf diff --git a/files/z9/configs/light/ola/ola-renard.conf b/resources/z9/light/ola/ola-renard.conf similarity index 100% rename from files/z9/configs/light/ola/ola-renard.conf rename to resources/z9/light/ola/ola-renard.conf diff --git a/files/z9/configs/light/ola/ola-sandnet.conf b/resources/z9/light/ola/ola-sandnet.conf similarity index 100% rename from files/z9/configs/light/ola/ola-sandnet.conf rename to resources/z9/light/ola/ola-sandnet.conf diff --git a/files/z9/configs/light/ola/ola-server.conf b/resources/z9/light/ola/ola-server.conf similarity index 100% rename from files/z9/configs/light/ola/ola-server.conf rename to resources/z9/light/ola/ola-server.conf diff --git a/files/z9/configs/light/ola/ola-shownet.conf b/resources/z9/light/ola/ola-shownet.conf similarity index 100% rename from files/z9/configs/light/ola/ola-shownet.conf rename to resources/z9/light/ola/ola-shownet.conf diff --git a/files/z9/configs/light/ola/ola-spi.conf b/resources/z9/light/ola/ola-spi.conf similarity index 100% rename from files/z9/configs/light/ola/ola-spi.conf rename to resources/z9/light/ola/ola-spi.conf diff --git a/files/z9/configs/light/ola/ola-stageprofi.conf b/resources/z9/light/ola/ola-stageprofi.conf similarity index 100% rename from files/z9/configs/light/ola/ola-stageprofi.conf rename to resources/z9/light/ola/ola-stageprofi.conf diff --git a/files/z9/configs/light/ola/ola-uartdmx.conf b/resources/z9/light/ola/ola-uartdmx.conf similarity index 100% rename from files/z9/configs/light/ola/ola-uartdmx.conf rename to resources/z9/light/ola/ola-uartdmx.conf diff --git a/files/z9/configs/light/ola/ola-universe.conf b/resources/z9/light/ola/ola-universe.conf similarity index 100% rename from files/z9/configs/light/ola/ola-universe.conf rename to resources/z9/light/ola/ola-universe.conf diff --git a/files/z9/configs/light/ola/ola-usbdmx.conf b/resources/z9/light/ola/ola-usbdmx.conf similarity index 100% rename from files/z9/configs/light/ola/ola-usbdmx.conf rename to resources/z9/light/ola/ola-usbdmx.conf diff --git a/files/z9/configs/light/ola/ola-usbserial.conf b/resources/z9/light/ola/ola-usbserial.conf similarity index 100% rename from files/z9/configs/light/ola/ola-usbserial.conf rename to resources/z9/light/ola/ola-usbserial.conf diff --git a/templates/chaosknoten/configs/engelsystem/compose.yaml.j2 b/templates/chaosknoten/configs/engelsystem/compose.yaml.j2 deleted file mode 100644 index 58886dc..0000000 --- a/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: