diff --git a/playbooks/tasks/set-default-facts.yml b/playbooks/tasks/set-default-facts.yml index 30b9980..1951e24 100644 --- a/playbooks/tasks/set-default-facts.yml +++ b/playbooks/tasks/set-default-facts.yml @@ -1,6 +1,6 @@ --- - name: Set common facts ansible.builtin.set_fact: - service_path: "{{ (services_path, role_name | replace('_', '-')) | path_join }}" + service_path: "{{ (services_path, role_name) | path_join }}" docker_force_recreate: "" docker_rebuild: false diff --git a/roles/teamspeak_fallback/files/docker-compose.yml b/roles/teamspeak_fallback/files/docker-compose.yml index 32ff3d2..06a7132 100644 --- a/roles/teamspeak_fallback/files/docker-compose.yml +++ b/roles/teamspeak_fallback/files/docker-compose.yml @@ -16,4 +16,4 @@ services: volumes: data: external: true - name: teamspeak-fallback-data + name: teamspeak_fallback_data diff --git a/roles/webhook/files/teamspeak-fallback-db b/roles/webhook/files/teamspeak-fallback-db index 7a3ad52..65c3745 100755 --- a/roles/webhook/files/teamspeak-fallback-db +++ b/roles/webhook/files/teamspeak-fallback-db @@ -1,4 +1,4 @@ #!/usr/bin/env sh -chown -R "${TEAMSPEAK_USER}:${TEAMSPEAK_GROUP}" /mnt/teamspeak-fallback-data -install -o "${TEAMSPEAK_USER}" -g "${TEAMSPEAK_GROUP}" -m 644 "$WEBHOOK_DATA" "/mnt/teamspeak-fallback-data/ts3server.sqlitedb" +chown -R "${TEAMSPEAK_USER}:${TEAMSPEAK_GROUP}" /mnt/teamspeak_fallback_data +install -o "${TEAMSPEAK_USER}" -g "${TEAMSPEAK_GROUP}" -m 644 "$WEBHOOK_DATA" "/mnt/teamspeak_fallback_data/ts3server.sqlitedb" diff --git a/roles/webhook/vars/main.yml b/roles/webhook/vars/main.yml index 91e05a3..2ed6748 100644 --- a/roles/webhook/vars/main.yml +++ b/roles/webhook/vars/main.yml @@ -35,11 +35,11 @@ webhook_compose: image: ghcr.io/thecatlady/webhook volumes: - ./config:/config:ro - - teamspeak-fallback-data:/mnt/teamspeak-fallback-data + - teamspeak_fallback_data:/mnt/teamspeak_fallback_data file: services: app: command: ["-verbose", "-hooks=/config/hooks.yml"] volumes: - teamspeak-fallback-data: - name: teamspeak-fallback-data + teamspeak_fallback_data: + name: teamspeak_fallback_data diff --git a/services.auto.tfvars b/services.auto.tfvars index d08a005..0166cb9 100644 --- a/services.auto.tfvars +++ b/services.auto.tfvars @@ -348,7 +348,7 @@ services = { } ] backup = [{ - name = "reitanlage-oranienburg_data" + name = "reitanlage_oranienburg_data" type = "docker" }] monitoring = { @@ -445,7 +445,7 @@ services = { target = "ts" }] backup = [{ - name = "teamspeak-fallback-data" + name = "teamspeak_fallback_data" type = "docker" }] auth = false