From ff56e2861db318b0e8a4a73fefd0180b1e78cd88 Mon Sep 17 00:00:00 2001 From: Ansible Servercow Date: Wed, 20 Nov 2024 17:02:31 +0100 Subject: [PATCH] added use-docker-mirror + fixed syslog server func --- .../managed-mailcow/use-docker-mirror.yaml | 35 +++++++++++++++++++ .../managed-mailcow/use-syslog-server.yaml | 6 ++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 playbooks/managed-mailcow/use-docker-mirror.yaml diff --git a/playbooks/managed-mailcow/use-docker-mirror.yaml b/playbooks/managed-mailcow/use-docker-mirror.yaml new file mode 100644 index 0000000..4f0db59 --- /dev/null +++ b/playbooks/managed-mailcow/use-docker-mirror.yaml @@ -0,0 +1,35 @@ +--- +- name: Update Docker Daemon configuration to use Docker Mirror + hosts: all + become: yes + tasks: + - name: Read current Docker daemon.json + ansible.builtin.slurp: + src: /etc/docker/daemon.json + register: current_daemon_json + + - name: Parse current Docker daemon.json + set_fact: + current_daemon_config: "{{ current_daemon_json['content'] | b64decode | from_json }}" + + - name: Check current registry-mirrors setting + set_fact: + registry_mirrors_current: "{{ current_daemon_config['registry-mirrors'] | default('not_set') }}" + + - name: Update Docker daemon.json with registry-mirrors configuration if registry-mirrors not set or not equals + ansible.builtin.copy: + dest: /etc/docker/daemon.json + content: "{{ updated_daemon_json | to_nice_json }}" + vars: + registry_config: { + "registry-mirrors": ["https://dim.servercow.com"] + } + updated_daemon_json: "{{ current_daemon_config | combine(registry_config) }}" + when: registry_mirrors_current != 'https://dim.servercow.com' or log is undefined + register: daemon_update + + - name: Restart Docker to apply changes + ansible.builtin.systemd: + name: docker + state: restarted + when: daemon_update.changed \ No newline at end of file diff --git a/playbooks/managed-mailcow/use-syslog-server.yaml b/playbooks/managed-mailcow/use-syslog-server.yaml index 25d923b..4977e9f 100644 --- a/playbooks/managed-mailcow/use-syslog-server.yaml +++ b/playbooks/managed-mailcow/use-syslog-server.yaml @@ -40,13 +40,13 @@ when: daemon_update.changed - include_role: - name: managed-mailcow + name: roles/managed-mailcow tasks_from: find-mailcow-composedir.yml when: daemon_update.changed - name: Stop mailcow stack import_role: - name: managed-mailcow + name: roles/managed-mailcow tasks_from: stop-mailcow.yml vars: docker_compose_path: "{{ mailcow_dir_result.files[0].path }}" @@ -55,7 +55,7 @@ - name: Start mailcow stack import_role: - name: managed-mailcow + name: roles/managed-mailcow tasks_from: start-mailcow.yml vars: docker_compose_path: "{{ mailcow_dir_result.files[0].path }}"