diff --git a/common/docker_dockerstats/tasks/main.yml b/common/docker_dockerstats/tasks/main.yml index 185470023d9e194e345d7af7d6ac2396927b947b..ca80d30eafaf3ce3a432768dd8c7bab7c50805ae 100644 --- a/common/docker_dockerstats/tasks/main.yml +++ b/common/docker_dockerstats/tasks/main.yml @@ -1,7 +1,6 @@ --- - -- name: create folder struct for {{ servicename }} +- name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" state: "directory" @@ -15,9 +14,16 @@ dest: "{{ basedir }}/{{ item }}" with_items: - docker-compose.yml + register: config_files + +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed -- name: start {{ servicename }} docker +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present diff --git a/common/docker_watchtower/tasks/main.yml b/common/docker_watchtower/tasks/main.yml index b7d417b93b7c6b28e4e8a9c083a183f27aae0e6c..508dd4008e47c714cbe68df24a0e0bf24e7c4019 100644 --- a/common/docker_watchtower/tasks/main.yml +++ b/common/docker_watchtower/tasks/main.yml @@ -19,10 +19,17 @@ dest: "{{ basedir }}/{{ item }}" with_items: - docker-compose.yml + register: config_files + + +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + - - name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present - build: always diff --git a/intern/docker_fridgeserver/tasks/main.yml b/intern/docker_fridgeserver/tasks/main.yml index df0aa807054586cb486fe0dcede43d48cea45796..a7540ac15663280e0e665e8cbcaf4bb34749f74e 100644 --- a/intern/docker_fridgeserver/tasks/main.yml +++ b/intern/docker_fridgeserver/tasks/main.yml @@ -1,4 +1,5 @@ --- + - name: "create folder struct for {{ servicename }}" ansible.builtin.file: path: "{{ item }}" @@ -16,8 +17,15 @@ mode: '0755' with_items: - docker-compose.yml + register: config_files -- name: start {{ servicename }} +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: - state: present project_src: "{{ basedir }}" + state: present diff --git a/intern/docker_grafana/tasks/main.yml b/intern/docker_grafana/tasks/main.yml index a964ae54cb723a5f32a41cbb641d080924a11ea6..17beed7307a17e0c299b130fbe133aca64e14b21 100644 --- a/intern/docker_grafana/tasks/main.yml +++ b/intern/docker_grafana/tasks/main.yml @@ -5,7 +5,7 @@ - { path: "{{ basedir }}/grafana_admin_pass", length: 12 } - { path: "/srv/mqtt/influxdb_token", length: -1 } -- name: create folder struct for grafana +- name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" state: "directory" @@ -27,8 +27,15 @@ - provisioning/dashboards/dashboards.yml - provisioning/dashboards/pixelflut/breakwater.json - provisioning/datasources/datasources.yml + register: config_files -- name: start grafana docker +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present diff --git a/intern/docker_heimdall/tasks/main.yml b/intern/docker_heimdall/tasks/main.yml index d34c8ab5464a1020f7a5c5f684868de2ce83d64e..cdb104fbb237283401f13c67960415aaf457849f 100644 --- a/intern/docker_heimdall/tasks/main.yml +++ b/intern/docker_heimdall/tasks/main.yml @@ -1,5 +1,6 @@ --- -- name: create folder struct for {{ servicename }} + +- name: "create folder struct for {{ servicename }}" ansible.builtin.file: path: "{{ item }}" state: "directory" @@ -7,15 +8,22 @@ with_items: - "{{ basedir }}/config" -- name: copy config files for {{ servicename }} +- name: "copy config files for {{ servicename }}" ansible.builtin.template: src: "{{ item }}" dest: "{{ basedir }}/{{ item }}" mode: '0755' with_items: - docker-compose.yml + register: config_files -- name: start {{ servicename }} +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: - state: present project_src: "{{ basedir }}" + state: present diff --git a/intern/docker_mqtt/tasks/main.yml b/intern/docker_mqtt/tasks/main.yml index 910e17290ed6f1d136edf764385354611b6ec7d2..d34fec1e32c90e2091ff65f519e09a10180590ec 100644 --- a/intern/docker_mqtt/tasks/main.yml +++ b/intern/docker_mqtt/tasks/main.yml @@ -24,6 +24,13 @@ - mosquitto.conf - telegraf_binary.conf - telegraf_float.conf + register: config_files + +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed - name: "start {{ servicename }} docker" community.docker.docker_compose_v2: diff --git a/intern/docker_nodered/tasks/main.yml b/intern/docker_nodered/tasks/main.yml index 3a249f0e1df0916278711098fd805cef5fc04c57..8c10b068617add9fef9acc9573c45ce58ac1a240 100644 --- a/intern/docker_nodered/tasks/main.yml +++ b/intern/docker_nodered/tasks/main.yml @@ -1,4 +1,5 @@ --- + - name: "create folder struct for {{ servicename }}" ansible.builtin.file: path: "{{ item }}" @@ -16,8 +17,15 @@ mode: '0755' with_items: - "docker-compose.yml" + register: config_files -- name: "start {{ servicename }} with docker-compose" +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: - state: present project_src: "{{ basedir }}" + state: present diff --git a/intern/docker_omada/tasks/main.yml b/intern/docker_omada/tasks/main.yml index 81cd8b99be8296c74167111ded8b1e24a0159d4c..e68fe7e7d34d249f688bc02b80a064fb246e25bc 100644 --- a/intern/docker_omada/tasks/main.yml +++ b/intern/docker_omada/tasks/main.yml @@ -22,6 +22,13 @@ dest: "{{ basedir }}/{{ item }}" with_items: - docker-compose.yml + register: config_files + +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed - name: "start {{ servicename }} docker" community.docker.docker_compose_v2: diff --git a/intern/docker_tasmoadmin/tasks/main.yml b/intern/docker_tasmoadmin/tasks/main.yml index 3a249f0e1df0916278711098fd805cef5fc04c57..cfa4205a6a88c909fca87c2d7cbee08b4f6e8891 100644 --- a/intern/docker_tasmoadmin/tasks/main.yml +++ b/intern/docker_tasmoadmin/tasks/main.yml @@ -1,4 +1,5 @@ --- + - name: "create folder struct for {{ servicename }}" ansible.builtin.file: path: "{{ item }}" @@ -9,6 +10,7 @@ with_items: - "{{ basedir }}/data/" + - name: "copy config files file for {{ servicename }}" ansible.builtin.template: src: "{{ item }}" @@ -16,8 +18,17 @@ mode: '0755' with_items: - "docker-compose.yml" + register: config_files + -- name: "start {{ servicename }} with docker-compose" +- name: "stop {{ servicename }} docker" community.docker.docker_compose_v2: - state: present project_src: "{{ basedir }}" + state: absent + when: config_files.changed + + +- name: "start {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: present diff --git a/remote/docker_homeassistant/tasks/main.yml b/remote/docker_homeassistant/tasks/main.yml index df24774fced1cd2f9455a43b19a1c74c287eb220..55bbdf40923b32c4236b30ffd515c10cb385ef82 100644 --- a/remote/docker_homeassistant/tasks/main.yml +++ b/remote/docker_homeassistant/tasks/main.yml @@ -6,6 +6,7 @@ - { path: "{{ basedir }}/influxdb_password", length: 12 } - { path: "{{ basedir }}/influxdb_token", length: 32 } + - name: "create folder struct for {{ basedir }}" file: path: "{{ item }}" diff --git a/testserver/docker_dockerstats/tasks/main.yml b/testserver/docker_dockerstats/tasks/main.yml index 673605687d98f958504626d9aa673af1a70d1e21..0a9ba2d98485fa292643e875acb98d92e2a93515 100644 --- a/testserver/docker_dockerstats/tasks/main.yml +++ b/testserver/docker_dockerstats/tasks/main.yml @@ -1,4 +1,5 @@ --- + - name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" @@ -16,11 +17,13 @@ - docker-compose.yml register: config + - name: "stop {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: absent + - name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" diff --git a/testserver/docker_gitea/tasks/main.yml b/testserver/docker_gitea/tasks/main.yml index 236f1dc6adb8da2e1fe3be1cf11cccb18eb6f3db..db32673cc8d1bc3e52d5d36c92de5106bcdd0e51 100644 --- a/testserver/docker_gitea/tasks/main.yml +++ b/testserver/docker_gitea/tasks/main.yml @@ -6,7 +6,7 @@ - { path: "{{ basedir }}/secrets/mysql_user_pw", length: 12 } - { path: "{{ basedir }}/secrets/gitea_admin_pass", length: 12 } -- name: create folder struct for gitea +- name: "create folder struct for {{ servicename }}" file: path: "{{item}}" state: "directory" @@ -23,8 +23,15 @@ dest: "{{ basedir }}/{{item}}" with_items: - "docker-compose.yml" + register: config_files -- name: start gitea docker +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present diff --git a/testserver/docker_gitlab/tasks/main.yml b/testserver/docker_gitlab/tasks/main.yml index 0f143cd3a8bf93de0e02858271fbec9041ff3131..5238a9bcbf988dbd3bf225093909ad6ea3db457a 100644 --- a/testserver/docker_gitlab/tasks/main.yml +++ b/testserver/docker_gitlab/tasks/main.yml @@ -6,9 +6,8 @@ - { path: /srv/gitlab/oidc_client_secret, length: 32 } - { path: /srv/gitlab/runner_registration_token, length: -1 } -# Benötigte Verzeichnisstrukturen erstellen -- name: create folder structur for gitlab +- name: "create folder structur for {{ servicename }}" file: path: "{{ item }}" state: directory @@ -21,7 +20,6 @@ - "/srv/gitlab/log" - "/srv/gitlab/runner" -# Konfigurationsdateien erstellen - name: Konfig-Datei Gitlab template: @@ -30,16 +28,17 @@ with_items: - "conf/gitlab.rb" - "docker-compose.yml" - register: configs + register: config_files -- name: stop gitlab docker +- name: "stop {{ servicename }} docker" community.docker.docker_compose_v2: - project_src: /srv/gitlab/ + project_src: "{{ basedir }}" state: absent - when: configs.changed + when: config_files.changed -- name: start gitlab docker + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: - project_src: /srv/gitlab/ - state: present + project_src: "{{ basedir }}" + state: present \ No newline at end of file diff --git a/testserver/docker_grafana/tasks/main.yml b/testserver/docker_grafana/tasks/main.yml index 7254d033ab83ca58976c0346d016b56b6a56b388..a80626fbcce4df4f6d726d7542bc805310fc0b2a 100644 --- a/testserver/docker_grafana/tasks/main.yml +++ b/testserver/docker_grafana/tasks/main.yml @@ -6,7 +6,7 @@ - { path: "{{ basedir }}/secrets/oauth_client_secret", length: 32 } # - { path: "/srv/mqtt/influxdb_token", length: -1 } -- name: create folder struct for grafana +- name: "create folder struct for {{ servicename }}" ansible.builtin.file: path: "{{ item }}" state: "directory" @@ -27,8 +27,15 @@ with_items: - docker-compose.yml - grafana.ini + register: config_files -- name: start grafana docker +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present diff --git a/testserver/docker_nextcloud/tasks/main.yml b/testserver/docker_nextcloud/tasks/main.yml index 57528eaf71af042a9ac2aabbb74a544eb8fb8f5b..b70c077e061182cc6352068bdcded25ec1697b16 100644 --- a/testserver/docker_nextcloud/tasks/main.yml +++ b/testserver/docker_nextcloud/tasks/main.yml @@ -8,7 +8,7 @@ - { path: "{{ basedir }}/secrets/mysql_user_pass", length: 12 } -- name: create folder struct for nextcloud +- name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" state: "directory" @@ -31,6 +31,7 @@ - "docker-compose.yml" - "memory-limit.ini" + - name: Nextcloud Konfig-Dateien erstellen template: src: "{{ item }}" @@ -38,6 +39,8 @@ with_items: - "custom.config.php" - "oidc.config.php" + register: config_files + - name: Script Helper erstellen template: @@ -47,7 +50,15 @@ with_items: - "occ.sh" -- name: start nextcloud docker + +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present diff --git a/testserver/docker_vpnserver/tasks/main.yml b/testserver/docker_vpnserver/tasks/main.yml index 21147c81c7ecf13df78b4d7a73aa1949456b7f34..f63bad1d95de54f20737af62fa788de9c27df977 100644 --- a/testserver/docker_vpnserver/tasks/main.yml +++ b/testserver/docker_vpnserver/tasks/main.yml @@ -7,7 +7,7 @@ - { path: "{{ basedir }}/secrets/wg_private_key", length: -1 } # 'wg genkey' -- name: create folder struct for vpnserver +- name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" state: "directory" diff --git a/testserver/docker_wordpress/tasks/main.yml b/testserver/docker_wordpress/tasks/main.yml index 46107a11a4cd50f760f46ecc4e411acba709d288..6c0fe80f269132c1a6a8d01e8140bf874b3725f1 100644 --- a/testserver/docker_wordpress/tasks/main.yml +++ b/testserver/docker_wordpress/tasks/main.yml @@ -8,7 +8,7 @@ - { path: "{{ basedir }}/wordpress_admin_pass", length: 24 } - { path: "{{ basedir }}/wordpress_client_secret", length: 32 } -- name: create folder struct for wordpress +- name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" state: "directory" @@ -32,8 +32,15 @@ - docker-compose.yml - config/uploads.ini - data/wp-content/plugins/wz-status/wz-status.php + register: config_files -- name: start wordpress docker +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present diff --git a/verwaltung/docker_gitea/tasks/main.yml b/verwaltung/docker_gitea/tasks/main.yml index 780d091904ca60070506a546a3723c85bfe174f4..fb2eb4dfaea183fafdef6e01fe2612d8d6b12055 100644 --- a/verwaltung/docker_gitea/tasks/main.yml +++ b/verwaltung/docker_gitea/tasks/main.yml @@ -5,7 +5,7 @@ - { path: /srv/gitea/mysql_root_pw, length: 24 } - { path: /srv/gitea/mysql_user_pw, length: 12 } -- name: create folder struct for gitea +- name: "create folder struct for {{ servicename }}" file: path: "{{item}}" state: "directory" @@ -21,9 +21,16 @@ dest: "/srv/gitea/{{item}}" with_items: - "docker-compose.yml" + register: config_files -- name: start gitea docker +- name: "stop {{ servicename }} docker" community.docker.docker_compose_v2: - project_src: /srv/gitea/ + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" state: present diff --git a/verwaltung/docker_jameica/tasks/main.yml b/verwaltung/docker_jameica/tasks/main.yml index f8056c7b3224cb36f7b8c352259f0683f019af4a..c8a119000e0e555381c9d8502ab4375fb4d18c74 100644 --- a/verwaltung/docker_jameica/tasks/main.yml +++ b/verwaltung/docker_jameica/tasks/main.yml @@ -3,7 +3,7 @@ with_items: - { path: /srv/ldap/secret/ldap_readonly_pass, length: -1 } -- name: create folder struct for jameica +- name: "create folder struct for {{ servicename }}" file: path: "{{item}}" state: "directory" @@ -21,9 +21,17 @@ - "jameica.conf" - "jameica.sh" - "nginx.conf" + register: config_files -- name: start jameica docker +- name: "stop {{ servicename }} docker" community.docker.docker_compose_v2: - project_src: /srv/jameica-vnc/ + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + + +- name: "start {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" state: present diff --git a/verwaltung/docker_nextcloud/tasks/main.yml b/verwaltung/docker_nextcloud/tasks/main.yml index 5b51f6a926919850d0eb033529c6f11d0a5026a5..0d8f70c67c95420db3c9b9fb5f472e980352ab6f 100644 --- a/verwaltung/docker_nextcloud/tasks/main.yml +++ b/verwaltung/docker_nextcloud/tasks/main.yml @@ -7,7 +7,7 @@ - { path: /srv/nextcloud/mysql_user_pass, length: 12 } -- name: create folder struct for nextcloud +- name: "create folder struct for {{ servicename }}" file: path: "{{ item }}" state: "directory" @@ -27,11 +27,19 @@ with_items: - "docker-compose.yml" - "memory-limit.ini" + register: config_files -- name: start nextcloud docker +- name: "stop {{ servicename }} docker" community.docker.docker_compose_v2: - project_src: /srv/nextcloud/ + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + + +- name: "start {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" state: present diff --git a/webserver/docker_matterbridge/tasks/main.yml b/webserver/docker_matterbridge/tasks/main.yml index b22fb98f95540f4b91e9daf91533fc2ea273b91f..d37039e00f3768ac4cc726bc1acda9b34f6e61ef 100644 --- a/webserver/docker_matterbridge/tasks/main.yml +++ b/webserver/docker_matterbridge/tasks/main.yml @@ -48,9 +48,17 @@ template: src: "docker-compose.yml" dest: "/srv/matterbridge/docker-compose.yml" - -- name: start matterbridge docker + register: config_files + +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: - project_src: /srv/matterbridge/ + project_src: "{{ basedir }}" state: present diff --git a/webserver/docker_uffd/tasks/main.yml b/webserver/docker_uffd/tasks/main.yml index 747d458cc14b719c19c2d6a4487b52752ffca501..06dd2d693eced645f0fa2dc4ead76164a6b7a05b 100644 --- a/webserver/docker_uffd/tasks/main.yml +++ b/webserver/docker_uffd/tasks/main.yml @@ -37,4 +37,5 @@ - name: start {{servicename}} docker community.docker.docker_compose_v2: project_src: "{{ basedir }}" - state: present \ No newline at end of file + state: present + build: always diff --git a/webserver/docker_wordpress/tasks/main.yml b/webserver/docker_wordpress/tasks/main.yml index 2a26b487dccd371bcf016cb68aa73336835f38c6..a17e798150817f3528f93385e9188c102edf9f5f 100644 --- a/webserver/docker_wordpress/tasks/main.yml +++ b/webserver/docker_wordpress/tasks/main.yml @@ -30,8 +30,15 @@ - docker-compose.yml - config/uploads.ini - data/wp-content/plugins/wz-status/wz-status.php + register: config_files -- name: start wordpress docker +- name: "stop {{ servicename }} docker" + community.docker.docker_compose_v2: + project_src: "{{ basedir }}" + state: absent + when: config_files.changed + +- name: "start {{ servicename }} docker" community.docker.docker_compose_v2: project_src: "{{ basedir }}" state: present