From 214723546a2b864d7b6df2c724d9a01ba1a635db Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Tue, 17 Jun 2025 19:14:28 +0200
Subject: [PATCH] Rename docker-compose.yml to compose.yaml and service.env to
.env
---
inventory/group_vars/all/compose_defaults.yml | 2 +-
playbooks/roles/authentik/vars/main.yml | 2 +-
playbooks/roles/forgejo/tasks/main.yml | 2 +-
playbooks/roles/forgejo_runner/tasks/main.yml | 10 +++++-----
playbooks/roles/healthcheck/tasks/docker.yml | 6 +++---
playbooks/roles/healthcheck/tasks/main.yml | 2 +-
.../{docker-compose.yml.j2 => compose.yaml.j2} | 2 +-
playbooks/roles/immich/vars/main.yml | 4 ++--
playbooks/roles/jitsi/vars/main.yml | 6 +++---
playbooks/roles/lego/files/lego.sh | 2 +-
playbooks/roles/lego/tasks/main.yml | 2 +-
playbooks/roles/synapse/vars/main.yml | 2 +-
playbooks/roles/tandoor/vars/main.yml | 2 +-
playbooks/roles/tinytinyrss/vars/main.yml | 4 ++--
playbooks/roles/woodpecker/vars/main.yml | 2 +-
playbooks/tasks/prepare-common-service.yml | 6 +++---
playbooks/tasks/steps/template-compose.yml | 6 ++++++
playbooks/tasks/steps/template-docker-compose.yml | 6 ------
playbooks/tasks/steps/template-service-env.yml | 4 ++--
.../{docker-compose.yml.j2 => compose.yaml.j2} | 0
20 files changed, 36 insertions(+), 36 deletions(-)
rename playbooks/roles/healthcheck/templates/{docker-compose.yml.j2 => compose.yaml.j2} (95%)
create mode 100644 playbooks/tasks/steps/template-compose.yml
delete mode 100644 playbooks/tasks/steps/template-docker-compose.yml
rename playbooks/templates/{docker-compose.yml.j2 => compose.yaml.j2} (100%)
diff --git a/inventory/group_vars/all/compose_defaults.yml b/inventory/group_vars/all/compose_defaults.yml
index e48a349..c7e7c10 100644
--- a/inventory/group_vars/all/compose_defaults.yml
+++ b/inventory/group_vars/all/compose_defaults.yml
@@ -12,7 +12,7 @@ compose_file_env:
services:
app:
env_file:
- - service.env
+ - .env
compose_file_networks:
services:
diff --git a/playbooks/roles/authentik/vars/main.yml b/playbooks/roles/authentik/vars/main.yml
index 03d4755..626215e 100644
--- a/playbooks/roles/authentik/vars/main.yml
+++ b/playbooks/roles/authentik/vars/main.yml
@@ -49,7 +49,7 @@ authentik_compose:
- /var/run/docker.sock:/var/run/docker.sock
- ./certs:/certs
env_file:
- - service.env
+ - .env
depends_on:
- redis
networks:
diff --git a/playbooks/roles/forgejo/tasks/main.yml b/playbooks/roles/forgejo/tasks/main.yml
index e679711..97ff903 100644
--- a/playbooks/roles/forgejo/tasks/main.yml
+++ b/playbooks/roles/forgejo/tasks/main.yml
@@ -13,7 +13,7 @@
- name: Create the app.ini file
ansible.builtin.copy:
dest: "{{ (service_path, 'app.ini') | path_join }}"
- content: '{{ forgejo_ini | to_ini }}'
+ content: '{{ forgejo_ini | community.general.to_ini }}'
mode: "0644"
notify: Restart service {{ role_name }}
diff --git a/playbooks/roles/forgejo_runner/tasks/main.yml b/playbooks/roles/forgejo_runner/tasks/main.yml
index 23baa58..264f648 100644
--- a/playbooks/roles/forgejo_runner/tasks/main.yml
+++ b/playbooks/roles/forgejo_runner/tasks/main.yml
@@ -9,8 +9,8 @@
block:
- name: Import tasks to create service directory
ansible.builtin.import_tasks: tasks/steps/create-service-directory.yml
- - name: Import tasks to template docker compose file
- ansible.builtin.import_tasks: tasks/steps/template-docker-compose.yml
+ - name: Import tasks to template compose file
+ ansible.builtin.import_tasks: tasks/steps/template-compose.yml
- name: Copy the config
ansible.builtin.copy:
@@ -18,16 +18,16 @@
dest: "{{ (service_path, 'config.yml') | path_join }}"
mode: "0755"
- - name: Check if service.env already exists
+ - name: Check if .env already exists
ansible.builtin.stat:
- path: "{{ (service_path, 'service.env') | path_join }}"
+ path: "{{ (service_path, '.env') | path_join }}"
register: env_file
- name: Import tasks to prompt for the registration token
ansible.builtin.import_tasks: tasks/prompt-registration-token.yml
when: not env_file.stat.exists or force_forgejo_runner_registration | default(False)
- - name: Import tasks create a service.env file
+ - name: Import tasks create a .env file
ansible.builtin.import_tasks: tasks/steps/template-service-env.yml
- name: Import start tasks for common service
ansible.builtin.import_tasks: tasks/start-common-service.yml
diff --git a/playbooks/roles/healthcheck/tasks/docker.yml b/playbooks/roles/healthcheck/tasks/docker.yml
index 28a677d..4044adc 100644
--- a/playbooks/roles/healthcheck/tasks/docker.yml
+++ b/playbooks/roles/healthcheck/tasks/docker.yml
@@ -1,8 +1,8 @@
---
-- name: Template the docker-compose file
+- name: Template the compose file
ansible.builtin.template:
- src: docker-compose.yml.j2
- dest: "{{ (service_path, 'docker-compose.yml') | path_join }}"
+ src: compose.yaml.j2
+ dest: "{{ (service_path, 'compose.yaml') | path_join }}"
mode: "0644"
- name: Copy the Dockerfile
ansible.builtin.copy:
diff --git a/playbooks/roles/healthcheck/tasks/main.yml b/playbooks/roles/healthcheck/tasks/main.yml
index a859b97..f2e2906 100644
--- a/playbooks/roles/healthcheck/tasks/main.yml
+++ b/playbooks/roles/healthcheck/tasks/main.yml
@@ -15,7 +15,7 @@
- name: Import tasks specific to systemd
ansible.builtin.import_tasks: systemd.yml
- - name: Import tasks create a service.env file
+ - name: Import tasks create a .env file
ansible.builtin.import_tasks: tasks/steps/template-service-env.yml
- name: Build service
diff --git a/playbooks/roles/healthcheck/templates/docker-compose.yml.j2 b/playbooks/roles/healthcheck/templates/compose.yaml.j2
similarity index 95%
rename from playbooks/roles/healthcheck/templates/docker-compose.yml.j2
rename to playbooks/roles/healthcheck/templates/compose.yaml.j2
index 0a4e7c6..d91dc20 100644
--- a/playbooks/roles/healthcheck/templates/docker-compose.yml.j2
+++ b/playbooks/roles/healthcheck/templates/compose.yaml.j2
@@ -5,7 +5,7 @@ x-common-elements:
image: "{{ (container_registry.public, 'services/healthcheck') | path_join }}"
restart: never
env_file:
- - service.env
+ - .env
volumes:
- ./data/:/opt
network_mode: host
diff --git a/playbooks/roles/immich/vars/main.yml b/playbooks/roles/immich/vars/main.yml
index b6d6ab5..47f27b1 100644
--- a/playbooks/roles/immich/vars/main.yml
+++ b/playbooks/roles/immich/vars/main.yml
@@ -51,7 +51,7 @@ immich_compose:
volumes:
- model-cache:/cache
env_file:
- - service.env
+ - .env
restart: always
networks:
default:
@@ -67,7 +67,7 @@ immich_compose:
labels:
net.serguzim.logs.collect: true
env_file:
- - service.env
+ - .env
volumes:
- pgdata:/var/lib/postgresql/data
restart: always
diff --git a/playbooks/roles/jitsi/vars/main.yml b/playbooks/roles/jitsi/vars/main.yml
index 07c96e2..47654bf 100644
--- a/playbooks/roles/jitsi/vars/main.yml
+++ b/playbooks/roles/jitsi/vars/main.yml
@@ -33,7 +33,7 @@ jitsi_compose:
image: "jitsi/prosody:{{ jitsi_image_version }}"
restart: always
env_file:
- - service.env
+ - .env
expose:
- '5222'
- '5269'
@@ -48,7 +48,7 @@ jitsi_compose:
image: "jitsi/jicofo:{{ jitsi_image_version }}"
restart: always
env_file:
- - service.env
+ - .env
ports:
- '127.0.0.1:8888:8888'
labels:
@@ -62,7 +62,7 @@ jitsi_compose:
image: "jitsi/jvb:{{ jitsi_image_version }}"
restart: always
env_file:
- - service.env
+ - .env
ports:
- '127.0.0.1:8080:8080'
- '10000:10000/udp'
diff --git a/playbooks/roles/lego/files/lego.sh b/playbooks/roles/lego/files/lego.sh
index bcddfe6..be7d197 100755
--- a/playbooks/roles/lego/files/lego.sh
+++ b/playbooks/roles/lego/files/lego.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env sh
set -a
-. ./service.env
+. ./.env
set +a
domain="$1"
diff --git a/playbooks/roles/lego/tasks/main.yml b/playbooks/roles/lego/tasks/main.yml
index d7abd92..cd2603f 100644
--- a/playbooks/roles/lego/tasks/main.yml
+++ b/playbooks/roles/lego/tasks/main.yml
@@ -29,7 +29,7 @@
dest: "{{ (service_path, 'lego.sh') | path_join }}"
mode: "0755"
- - name: Import tasks create a service.env file
+ - name: Import tasks create a .env file
ansible.builtin.import_tasks: tasks/steps/template-service-env.yml
- name: Run certificate-script for domains
diff --git a/playbooks/roles/synapse/vars/main.yml b/playbooks/roles/synapse/vars/main.yml
index cefe1b0..755dade 100644
--- a/playbooks/roles/synapse/vars/main.yml
+++ b/playbooks/roles/synapse/vars/main.yml
@@ -111,7 +111,7 @@ synapse_compose:
labels:
com.centurylinklabs.watchtower.enable: true
env_file:
- - service.env
+ - .env
networks:
apps:
aliases:
diff --git a/playbooks/roles/tandoor/vars/main.yml b/playbooks/roles/tandoor/vars/main.yml
index 3bd624c..56a199b 100644
--- a/playbooks/roles/tandoor/vars/main.yml
+++ b/playbooks/roles/tandoor/vars/main.yml
@@ -49,7 +49,7 @@ tandoor_compose:
labels:
com.centurylinklabs.watchtower.enable: true
env_file:
- - service.env
+ - .env
volumes:
- staticfiles:/opt/recipes/staticfiles
- nginx_config:/opt/recipes/nginx/conf.d
diff --git a/playbooks/roles/tinytinyrss/vars/main.yml b/playbooks/roles/tinytinyrss/vars/main.yml
index 3a73fd8..d2423a3 100644
--- a/playbooks/roles/tinytinyrss/vars/main.yml
+++ b/playbooks/roles/tinytinyrss/vars/main.yml
@@ -38,7 +38,7 @@ tinytinyrss_compose:
image: cthulhoo/ttrss-fpm-pgsql-static
restart: always
env_file:
- - service.env
+ - .env
volumes:
- app:/var/www/html
networks:
@@ -47,7 +47,7 @@ tinytinyrss_compose:
image: cthulhoo/ttrss-fpm-pgsql-static
restart: always
env_file:
- - service.env
+ - .env
volumes:
- app:/var/www/html
depends_on:
diff --git a/playbooks/roles/woodpecker/vars/main.yml b/playbooks/roles/woodpecker/vars/main.yml
index 7fa61a5..6126a31 100644
--- a/playbooks/roles/woodpecker/vars/main.yml
+++ b/playbooks/roles/woodpecker/vars/main.yml
@@ -43,7 +43,7 @@ woodpecker_compose:
com.centurylinklabs.watchtower.enable: true
command: agent
env_file:
- - service.env
+ - .env
depends_on:
- app
volumes:
diff --git a/playbooks/tasks/prepare-common-service.yml b/playbooks/tasks/prepare-common-service.yml
index 9fbc561..a49dd4d 100644
--- a/playbooks/tasks/prepare-common-service.yml
+++ b/playbooks/tasks/prepare-common-service.yml
@@ -2,11 +2,11 @@
- name: Import tasks to create service directory
ansible.builtin.import_tasks: tasks/steps/create-service-directory.yml
-- name: Import tasks to template docker compose file
- ansible.builtin.import_tasks: tasks/steps/template-docker-compose.yml
+- name: Import tasks to template compose file
+ ansible.builtin.import_tasks: tasks/steps/template-compose.yml
when: compose is defined
-- name: Import tasks to create a service.env file
+- name: Import tasks to create a .env file
ansible.builtin.import_tasks: tasks/steps/template-service-env.yml
when: env is defined
diff --git a/playbooks/tasks/steps/template-compose.yml b/playbooks/tasks/steps/template-compose.yml
new file mode 100644
index 0000000..19c631e
--- /dev/null
+++ b/playbooks/tasks/steps/template-compose.yml
@@ -0,0 +1,6 @@
+---
+- name: Template compose
+ ansible.builtin.template:
+ src: compose.yaml.j2
+ dest: "{{ (service_path, 'compose.yaml') | path_join }}"
+ mode: "0644"
diff --git a/playbooks/tasks/steps/template-docker-compose.yml b/playbooks/tasks/steps/template-docker-compose.yml
deleted file mode 100644
index 33ef724..0000000
--- a/playbooks/tasks/steps/template-docker-compose.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Template docker-compose
- ansible.builtin.template:
- src: docker-compose.yml.j2
- dest: "{{ (service_path, 'docker-compose.yml') | path_join }}"
- mode: "0644"
diff --git a/playbooks/tasks/steps/template-service-env.yml b/playbooks/tasks/steps/template-service-env.yml
index 61c37bb..09dcb8b 100644
--- a/playbooks/tasks/steps/template-service-env.yml
+++ b/playbooks/tasks/steps/template-service-env.yml
@@ -1,6 +1,6 @@
---
-- name: Template service.env file
+- name: Template .env file
ansible.builtin.template:
src: env.j2
- dest: "{{ (service_path, 'service.env') | path_join }}"
+ dest: "{{ (service_path, '.env') | path_join }}"
mode: "0700"
diff --git a/playbooks/templates/docker-compose.yml.j2 b/playbooks/templates/compose.yaml.j2
similarity index 100%
rename from playbooks/templates/docker-compose.yml.j2
rename to playbooks/templates/compose.yaml.j2