From 4766da2ea754ec793e4e89a89db3199cacde3a85 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 13 Dec 2023 15:16:02 +0100 Subject: [PATCH] created default parameters for docker versions in all --- group_vars/all | 11 +++++++++- roles/docker-akaunting/README.md | 2 +- roles/docker-akaunting/tasks/main.yml | 2 +- .../templates/docker-compose.yml.j2 | 22 +++++++++---------- .../templates/docker-compose.yml.j2 | 6 ++--- roles/docker-nextcloud/README.md | 2 +- .../templates/docker-compose.yml.j2 | 4 ++-- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/group_vars/all b/group_vars/all index 502bfdd4..5a2eba16 100644 --- a/group_vars/all +++ b/group_vars/all @@ -61,6 +61,12 @@ domain_roulette: "roulette.{{top_domain}}" domain_attendize: "tickets.{{top_domain}}" domain_yourls: "s.{{top_domain}}" +# Software versions +version_nextcloud: "latest" # Nextcloud can't skipp major version updates. +version_mailu: "2.0" +version_akaunting: "latest" +version_akaunting: "latest" +version_mastodon: "latest" # Routings redirect_domain_mappings: @@ -79,4 +85,7 @@ redirect_domain_mappings: nginx_configuration_directory: "/etc/nginx/conf.d/" nginx_servers_directory: "{{nginx_configuration_directory}}servers/" nginx_maps_directory: "{{nginx_configuration_directory}}maps/" -nginx_upstreams_directory: "{{nginx_configuration_directory}}upstreams/" \ No newline at end of file +nginx_upstreams_directory: "{{nginx_configuration_directory}}upstreams/" + +# Role specific configuration +pixelfed_app_name: "Pictures" diff --git a/roles/docker-akaunting/README.md b/roles/docker-akaunting/README.md index 14fab794..97276d9a 100644 --- a/roles/docker-akaunting/README.md +++ b/roles/docker-akaunting/README.md @@ -82,7 +82,7 @@ Detailed steps for backing up your Akaunting instance, including setting manual Variables are crucial in configuring your Akaunting setup. Ensure you set the following variables correctly in your environment: - `docker_compose_instance_directory`: Set this variable to the path where your Docker Compose files for Akaunting are located. -- `akaunting_db_password`, `akaunting_version`, `akaunting_company_name`, `akaunting_company_email`, `akaunting_setup_admin_email`, and `akaunting_setup_admin_password`: These should be set in your `.env` files as per your requirements. +- `akaunting_db_password`, `version_akaunting`, `akaunting_company_name`, `akaunting_company_email`, `akaunting_setup_admin_email`, and `akaunting_setup_admin_password`: These should be set in your `.env` files as per your requirements. ### Additional Configuration - **SSL Certificate**: The guide includes steps to receive a certificate for your domain. diff --git a/roles/docker-akaunting/tasks/main.yml b/roles/docker-akaunting/tasks/main.yml index 72535180..5e6ecc0a 100644 --- a/roles/docker-akaunting/tasks/main.yml +++ b/roles/docker-akaunting/tasks/main.yml @@ -30,7 +30,7 @@ when: git_result.failed - name: set akaunting version - ansible.builtin.shell: find . -type f -exec sed -i 's/akaunting:latest/akaunting:{{akaunting_version}}/' {} + && find . -type f -exec sed -i 's/version=latest/version={{akaunting_version}}/' {} + + ansible.builtin.shell: find . -type f -exec sed -i 's/akaunting:latest/akaunting:{{version_akaunting}}/' {} + && find . -type f -exec sed -i 's/version=latest/version={{version_akaunting}}/' {} + become: true args: chdir: "{{docker_compose_instance_directory}}" diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2 index 0a8ca66d..825ed684 100644 --- a/roles/docker-mailu/templates/docker-compose.yml.j2 +++ b/roles/docker-mailu/templates/docker-compose.yml.j2 @@ -50,7 +50,7 @@ services: # Core services resolver: - image: ghcr.io/mailu/unbound:{{mailu_version}} + image: ghcr.io/mailu/unbound:{{version_mailu}} env_file: mailu.env restart: always networks: @@ -60,7 +60,7 @@ services: driver: journald front: - image: ghcr.io/mailu/nginx:{{mailu_version}} + image: ghcr.io/mailu/nginx:{{version_mailu}} restart: always env_file: mailu.env logging: @@ -90,7 +90,7 @@ services: - 192.168.203.254 admin: - image: ghcr.io/mailu/admin:{{mailu_version}} + image: ghcr.io/mailu/admin:{{version_mailu}} restart: always env_file: mailu.env volumes: @@ -106,7 +106,7 @@ services: dns: - 192.168.203.254 imap: - image: ghcr.io/mailu/dovecot:{{mailu_version}} + image: ghcr.io/mailu/dovecot:{{version_mailu}} restart: always env_file: mailu.env volumes: @@ -121,7 +121,7 @@ services: driver: journald smtp: - image: ghcr.io/mailu/postfix:{{mailu_version}} + image: ghcr.io/mailu/postfix:{{version_mailu}} restart: always env_file: mailu.env volumes: @@ -136,7 +136,7 @@ services: driver: journald oletools: - image: ghcr.io/mailu/oletools:{{mailu_version}} + image: ghcr.io/mailu/oletools:{{version_mailu}} hostname: oletools restart: always depends_on: @@ -147,7 +147,7 @@ services: - noinet antispam: - image: ghcr.io/mailu/rspamd:{{mailu_version}} + image: ghcr.io/mailu/rspamd:{{version_mailu}} restart: always env_file: mailu.env volumes: @@ -169,7 +169,7 @@ services: # Optional services antivirus: - image: ghcr.io/mailu/clamav:{{mailu_version}} + image: ghcr.io/mailu/clamav:{{version_mailu}} restart: always env_file: mailu.env volumes: @@ -182,7 +182,7 @@ services: driver: journald webdav: - image: ghcr.io/mailu/radicale:{{mailu_version}} + image: ghcr.io/mailu/radicale:{{version_mailu}} restart: always env_file: mailu.env volumes: @@ -197,7 +197,7 @@ services: - 192.168.203.254 fetchmail: - image: ghcr.io/mailu/fetchmail:{{mailu_version}} + image: ghcr.io/mailu/fetchmail:{{version_mailu}} volumes: - "admin_data:/data" restart: always @@ -213,7 +213,7 @@ services: - 192.168.203.254 webmail: - image: ghcr.io/mailu/webmail:{{mailu_version}} + image: ghcr.io/mailu/webmail:{{version_mailu}} restart: always env_file: mailu.env volumes: diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/docker-mastodon/templates/docker-compose.yml.j2 index 1816b5a0..293a67a4 100644 --- a/roles/docker-mastodon/templates/docker-compose.yml.j2 +++ b/roles/docker-mastodon/templates/docker-compose.yml.j2 @@ -26,7 +26,7 @@ services: logging: driver: journald web: - image: tootsuite/mastodon:{{mastodon_version}} + image: tootsuite/mastodon:{{version_mastodon}} restart: always env_file: .env.production command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" @@ -46,7 +46,7 @@ services: logging: driver: journald streaming: - image: tootsuite/mastodon:{{mastodon_version}} + image: tootsuite/mastodon:{{version_mastodon}} restart: always env_file: .env.production command: node ./streaming @@ -64,7 +64,7 @@ services: logging: driver: journald sidekiq: - image: tootsuite/mastodon:{{mastodon_version}} + image: tootsuite/mastodon:{{version_mastodon}} restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/roles/docker-nextcloud/README.md b/roles/docker-nextcloud/README.md index 2bb8edb2..534dcfd2 100644 --- a/roles/docker-nextcloud/README.md +++ b/roles/docker-nextcloud/README.md @@ -21,7 +21,7 @@ To update the nextcloud container execute the following commands on the server: docker-compose down ``` -Afterwards update the ***nextcloud_version*** variable to the next version and run the this repository with this ansible role. +Afterwards update the ***version_nextcloud*** variable to the next version and run the this repository with this ansible role. It is only possible to update from one to the next major version at a time diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2 index f9dc1253..a47cc6f4 100644 --- a/roles/docker-nextcloud/templates/docker-compose.yml.j2 +++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2 @@ -2,7 +2,7 @@ version: '3' services: application: - image: "nextcloud:{{nextcloud_version}}-fpm-alpine" + image: "nextcloud:{{version_nextcloud}}-fpm-alpine" restart: always logging: driver: journald @@ -60,7 +60,7 @@ services: timeout: 3s retries: 30 cron: - image: "nextcloud:{{nextcloud_version}}-fpm-alpine" + image: "nextcloud:{{version_nextcloud}}-fpm-alpine" restart: always logging: driver: journald