From d24b0dc839e891956f8f137331dbc3644fd48f96 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 5 Jan 2024 11:08:09 +0100 Subject: [PATCH] Solved bugs and removed debug messages if repository is not reachable --- roles/backup-docker-to-local/tasks/main.yml | 6 ------ roles/cleanup-failed-docker-backups/tasks/main.yml | 6 ------ roles/docker-bigbluebutton/tasks/main.yml | 6 ------ roles/docker-discourse/tasks/main.yml | 13 +------------ roles/docker-discourse/vars/main.yml | 2 +- roles/docker-elk/tasks/main.yml | 6 ------ roles/docker-roulette-wheel/tasks/main.yml | 6 ------ roles/pc-gnome/tasks/main.yml | 6 ------ roles/system-swapfile/tasks/main.yml | 6 ------ tasks/update-repository-with-docker-compose.yml | 13 +------------ 10 files changed, 3 insertions(+), 67 deletions(-) diff --git a/roles/backup-docker-to-local/tasks/main.yml b/roles/backup-docker-to-local/tasks/main.yml index 3ac8acc0..e94bba32 100644 --- a/roles/backup-docker-to-local/tasks/main.yml +++ b/roles/backup-docker-to-local/tasks/main.yml @@ -11,15 +11,9 @@ repo: "https://github.com/kevinveenbirkenbach/backup-docker-to-local.git" dest: "{{backup_docker_to_local_folder}}" update: yes - register: git_result ignore_errors: true when: run_once_backup_docker_to_local is not defined -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result is defined and git_result.failed is defined and run_once_cleanup_failed_docker_backups is not defined - - name: configure backup-docker-to-local-everything.service template: src: backup-docker-to-local-everything.service.j2 diff --git a/roles/cleanup-failed-docker-backups/tasks/main.yml b/roles/cleanup-failed-docker-backups/tasks/main.yml index 5bf297cb..503cb31b 100644 --- a/roles/cleanup-failed-docker-backups/tasks/main.yml +++ b/roles/cleanup-failed-docker-backups/tasks/main.yml @@ -3,15 +3,9 @@ repo: "https://github.com/kevinveenbirkenbach/cleanup-failed-docker-backups.git" dest: "{{backup_docker_to_local_cleanup_folder}}" update: yes - register: git_result ignore_errors: true when: run_once_cleanup_failed_docker_backups is not defined -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result is defined and git_result.failed is defined and run_once_cleanup_failed_docker_backups is not defined - - name: configure cleanup-failed-docker-backups.service template: src: cleanup-failed-docker-backups.service.j2 diff --git a/roles/docker-bigbluebutton/tasks/main.yml b/roles/docker-bigbluebutton/tasks/main.yml index c25d6052..a728d0a7 100644 --- a/roles/docker-bigbluebutton/tasks/main.yml +++ b/roles/docker-bigbluebutton/tasks/main.yml @@ -29,14 +29,8 @@ recursive: yes version: main notify: setup bigbluebutton - register: git_result ignore_errors: true -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: deploy .env template: src=env.j2 dest={{docker_compose_instance_directory}}/.env notify: setup bigbluebutton diff --git a/roles/docker-discourse/tasks/main.yml b/roles/docker-discourse/tasks/main.yml index 43988d9f..8029eaef 100644 --- a/roles/docker-discourse/tasks/main.yml +++ b/roles/docker-discourse/tasks/main.yml @@ -14,17 +14,12 @@ state: directory mode: 0755 -- name: register directory - stat: - path: "{{docker_compose_instance_directory}}" - register: docker_compose_instance_directory_register - - name: checkout repository ansible.builtin.shell: git checkout . become: true args: chdir: "{{docker_compose_instance_directory}}" - when: docker_compose_instance_directory_register.stat.exists + ignore_errors: true - name: pull docker repository git: @@ -33,14 +28,8 @@ update: yes notify: recreate discourse become: true - register: git_result ignore_errors: true -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: set chmod 700 for {{docker_compose_instance_directory}}containers ansible.builtin.file: path: "{{docker_compose_instance_directory}}/containers" diff --git a/roles/docker-discourse/vars/main.yml b/roles/docker-discourse/vars/main.yml index c6d5e00d..c5f9fcd2 100644 --- a/roles/docker-discourse/vars/main.yml +++ b/roles/docker-discourse/vars/main.yml @@ -1,4 +1,4 @@ -docker_compose_project_name: "attendize" +docker_compose_project_name: "discourse" database_password: "{{ baserow_database_password }}" database_version: "{{ baserow_database_version | default(postgres_default_version) }}" database_type: "postgres" \ No newline at end of file diff --git a/roles/docker-elk/tasks/main.yml b/roles/docker-elk/tasks/main.yml index b0ec3fdc..12ead0a1 100644 --- a/roles/docker-elk/tasks/main.yml +++ b/roles/docker-elk/tasks/main.yml @@ -26,14 +26,8 @@ dest: "{{docker_elk_compose_path}}" update: yes notify: recreate docker-elk - register: git_result ignore_errors: true -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: copy docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_elk_compose_path}}docker-compose.yml notify: recreate docker-elk diff --git a/roles/docker-roulette-wheel/tasks/main.yml b/roles/docker-roulette-wheel/tasks/main.yml index 3da303c8..7f9dd97b 100644 --- a/roles/docker-roulette-wheel/tasks/main.yml +++ b/roles/docker-roulette-wheel/tasks/main.yml @@ -15,14 +15,8 @@ update: yes notify: docker compose project setup become: true - register: git_result ignore_errors: true -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: add docker-compose.yml template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml notify: docker compose project setup diff --git a/roles/pc-gnome/tasks/main.yml b/roles/pc-gnome/tasks/main.yml index 426e40a8..f8c22589 100644 --- a/roles/pc-gnome/tasks/main.yml +++ b/roles/pc-gnome/tasks/main.yml @@ -19,15 +19,9 @@ repo: "git@github.com:kevinveenbirkenbach/cli-gnome-extension-manager.git" dest: "$HOME/Repositories/github.com/kevinveenbirkenbach/cli-gnome-extension-manager" update: yes - register: git_result ignore_errors: true become: false -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: Execute CLI GNOME Extension manager script ansible.builtin.shell: bash "/home/{{client_username}}/Repositories/github.com/kevinveenbirkenbach/cli-gnome-extension-manager/gnome-extension-manager.sh" "{{ item[0] }}" "{{ item[1] }}" "{{ item[2] }}" loop: "{{gnome_extensions}}" diff --git a/roles/system-swapfile/tasks/main.yml b/roles/system-swapfile/tasks/main.yml index d27c364e..21d2910a 100644 --- a/roles/system-swapfile/tasks/main.yml +++ b/roles/system-swapfile/tasks/main.yml @@ -3,15 +3,9 @@ repo: "https://github.com/kevinveenbirkenbach/create-linux-swapfile.git" dest: "$HOME/Repositories/github.com/kevinveenbirkenbach/create-linux-swapfile" update: yes - register: git_result ignore_errors: true become: false -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: Execute create swapfile script ansible.builtin.shell: bash "/home/{{client_username}}/Repositories/github.com/kevinveenbirkenbach/create-linux-swapfile/create-linux-swapfile.sh" "{{swapfile_size}}" become: true \ No newline at end of file diff --git a/tasks/update-repository-with-docker-compose.yml b/tasks/update-repository-with-docker-compose.yml index 4287446d..c26b4279 100644 --- a/tasks/update-repository-with-docker-compose.yml +++ b/tasks/update-repository-with-docker-compose.yml @@ -5,17 +5,12 @@ removes: "{{ docker_compose_file_path }}" become: true -- name: register directory - stat: - path: "{{docker_compose_instance_directory}}" - register: docker_compose_instance_directory_register - - name: checkout repository ansible.builtin.shell: git checkout . become: true args: chdir: "{{docker_compose_instance_directory}}" - when: docker_compose_instance_directory_register.stat.exists + ignore_errors: true - name: pull docker repository git: @@ -24,7 +19,6 @@ update: yes notify: docker compose project setup become: true - register: git_result - name: "restore docker-compose.yml from backup" command: > @@ -33,11 +27,6 @@ removes: "{{ docker_compose_backup_path }}" become: true -- name: Warn if repo is not reachable - debug: - msg: "Warning: Repository is not reachable." - when: git_result.failed - - name: "copy docker-compose.yml" template: src: docker-compose.yml.j2