Update roles (remove inactive and update for-ansible-lint)

playbooks/for-ansible-lint.yml

@@ -9,22 +9,29 @@
     - authentik
     - backup
     - caddy
+    - deploy
     - dmarc_report
     - dokku
     - extra_services
+    - factorio
     - forgejo
     - forgejo_runner
     - gatus
     - healthcheck
     - homebox
     - immich
+    - immich_worker
     - influxdb
     - jellyfin
+    - jitsi
     - lego
     - lgtm_stack
+    - loki
     - mailcowdockerized
     - minecraft_2
+    - minecraft_3
     - minio
+    - node_exporter
     - ntfy
     - postgresql
     - reitanlage_oranienburg
@@ -37,5 +44,6 @@
     - umami
     - vikunja
     - watchtower
+    - webdis
     - wiki_js
     - woodpecker

playbooks/roles/briefing/defaults/main.yml

@@ -1,25 +0,0 @@
----
-briefing_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
-  port: 8080
-
-briefing_env:
-  BRIEFING_ROOM_URL: "https://{{ briefing_svc.domain }}/"
-  BRIEFING_ROOM_PATH: "/"
-  BRIEFING_ROOM_DOMAIN: "{{ briefing_svc.domain }}"
-
-  BRIEFING_STUN_URL: "stun:turn01.brie.fi:5349"
-  BRIEFING_TURN_URL: "turn:turn01.brie.fi:5349"
-
-  BRIEFING_MUTE_VIDEO: 0
-  BRIEFING_MUTE_AUDIO: 1
-  BRIEFING_SHOW_FULLSCREEN: 1
-  BRIEFING_SHOW_INVITATION: 1
-  BRIEFING_SHOW_INVITATION_HINT: 1
-  BRIEFING_SHOW_SETTINGS: 1
-  BRIEFING_SHOW_SHARE: 1
-  BRIEFING_SHOW_CHAT: 0
-
-briefing_compose:
-  watchtower: update
-  image: holtwick/briefing

playbooks/roles/briefing/tasks/main.yml

@@ -1,12 +0,0 @@
----
-- name: Set common facts
-  ansible.builtin.import_tasks: tasks/set-default-facts.yml
-
-- name: Deploy {{ role_name }}
-  vars:
-    svc: "{{ briefing_svc }}"
-    env: "{{ briefing_env }}"
-    compose: "{{ briefing_compose }}"
-  block:
-    - name: Import tasks to deploy common service
-      ansible.builtin.import_tasks: tasks/deploy-common-service.yml

playbooks/roles/deploy/tasks/main.yml

@@ -12,24 +12,24 @@
 
     - name: Set webhook config path
       ansible.builtin.set_fact:
-        config_path: "{{ (service_path, 'config') | path_join }}"
+        deploy_config_path: "{{ (service_path, 'config') | path_join }}"
 
     - name: Create config directory
       ansible.builtin.file:
-        path: "{{ config_path }}"
+        path: "{{ deploy_config_path }}"
         state: directory
         mode: "0755"
 
     - name: Create main config
       ansible.builtin.copy:
-        dest: "{{ (config_path, 'hooks.yml') | path_join }}"
+        dest: "{{ (deploy_config_path, 'hooks.yml') | path_join }}"
         content: '{{ deploy_yml | to_nice_yaml }}'
         mode: "0644"
 
     - name: Copy the deploy-reitanlage_oranienburg script
       ansible.builtin.copy:
         src: deploy-reitanlage_oranienburg
-        dest: "{{ (config_path, 'deploy-reitanlage_oranienburg') | path_join }}"
+        dest: "{{ (deploy_config_path, 'deploy-reitanlage_oranienburg') | path_join }}"
         mode: "0755"
 
     - name: Import start tasks for common service

playbooks/roles/factorio/tasks/main.yml

@@ -13,10 +13,10 @@
 
     - name: Set config path
       ansible.builtin.set_fact:
-        config_path: "{{ (service_path, 'config') | path_join }}"
+        factorio_config_path: "{{ (service_path, 'config') | path_join }}"
     - name: Create config directory
       ansible.builtin.file:
-        path: "{{ config_path }}"
+        path: "{{ factorio_config_path }}"
         state: directory
         mode: "0755"
         owner: "{{ factorio_uid }}"
@@ -24,7 +24,7 @@
       become: true
     - name: Create the server settings
       ansible.builtin.copy:
-        dest: "{{ (config_path, 'server-settings.json') | path_join }}"
+        dest: "{{ (factorio_config_path, 'server-settings.json') | path_join }}"
         content: '{{ factorio_json | to_json }}'
         mode: "0644"
         owner: "{{ factorio_uid }}"