From 4a4f3db890f69fcb9b05f1617f9150e05ede18a8 Mon Sep 17 00:00:00 2001 From: Jeffrey van Pelt Date: Mon, 20 Mar 2023 17:31:27 +0100 Subject: [PATCH 1/2] Update all tasks that download stuff to not become, this fixes some environments with http_proxies --- tasks/install_forgejo.yml | 2 ++ tasks/install_gitea.yml | 2 ++ tasks/set_forgejo_version.yml | 3 +++ tasks/set_gitea_version.yml | 1 + 4 files changed, 8 insertions(+) diff --git a/tasks/install_forgejo.yml b/tasks/install_forgejo.yml index 5d94e86..bd62280 100644 --- a/tasks/install_forgejo.yml +++ b/tasks/install_forgejo.yml @@ -31,6 +31,7 @@ checksum: "sha256:{{ gitea_forgejo_checksum }}" mode: 0640 register: _download_archive + become: false until: _download_archive is succeeded retries: 5 delay: 2 @@ -41,6 +42,7 @@ dest: "/tmp/{{ gitea_filename }}.asc" mode: 0640 register: _download_asc + become: false until: _download_asc is succeeded retries: 5 delay: 2 diff --git a/tasks/install_gitea.yml b/tasks/install_gitea.yml index 2f4405c..cd2ed72 100644 --- a/tasks/install_gitea.yml +++ b/tasks/install_gitea.yml @@ -31,6 +31,7 @@ checksum: "sha256:{{ gitea_dl_url }}.xz.sha256" mode: 0640 register: _download_archive + become: false until: _download_archive is succeeded retries: 5 delay: 2 @@ -41,6 +42,7 @@ dest: "/tmp/{{ gitea_filename }}.xz.asc" mode: 0640 register: _download_asc + become: false until: _download_asc is succeeded retries: 5 delay: 2 diff --git a/tasks/set_forgejo_version.yml b/tasks/set_forgejo_version.yml index e607df4..f44218f 100644 --- a/tasks/set_forgejo_version.yml +++ b/tasks/set_forgejo_version.yml @@ -15,6 +15,7 @@ url: 'https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?limit=1' return_content: true register: gitea_forgejo_remote_metadata + become: false when: not ansible_check_mode - name: "Fail if running in check mode without versions set." @@ -44,6 +45,7 @@ url: 'https://codeberg.org/api/v1/repos/forgejo/forgejo/releases/tags/v{{ gitea_version_target }}' return_content: true register: gitea_forgejo_remote_tags_metadata + become: false when: not ansible_check_mode - name: "Generate forgejo download url" @@ -61,6 +63,7 @@ url: "{{ gitea_forgejo_checksum_url | first }}" return_content: true register: _gitea_forgejo_dl_checksum + become: false when: not ansible_check_mode - name: Set forjeo checksum diff --git a/tasks/set_gitea_version.yml b/tasks/set_gitea_version.yml index b964ea9..c01a674 100644 --- a/tasks/set_gitea_version.yml +++ b/tasks/set_gitea_version.yml @@ -15,6 +15,7 @@ url: https://api.github.com/repos/go-gitea/gitea/releases/latest return_content: true register: gitea_remote_metadata + become: false when: not ansible_check_mode - name: "Fail if running in check mode without versions set." From 1ecf6d21daafcc8f3e56ce718eb151360f5d69fc Mon Sep 17 00:00:00 2001 From: Jeffrey van Pelt Date: Mon, 20 Mar 2023 17:35:48 +0100 Subject: [PATCH 2/2] Also change gpg key tasks --- tasks/install_forgejo.yml | 1 + tasks/install_gitea.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/tasks/install_forgejo.yml b/tasks/install_forgejo.yml index bd62280..bc3935e 100644 --- a/tasks/install_forgejo.yml +++ b/tasks/install_forgejo.yml @@ -61,6 +61,7 @@ - name: Import forgejo gpg key ansible.builtin.command: "gpg --keyserver {{ gitea_gpg_server }} --recv {{ gitea_forgejo_gpg_key }}" register: _gitea_import_key + become: false changed_when: '"imported: 1" in _gitea_import_key.stderr' when: '_gitea_gpg_key_status.rc != 0 or "expired" in _gitea_gpg_key_status.stdout' diff --git a/tasks/install_gitea.yml b/tasks/install_gitea.yml index cd2ed72..bf166e8 100644 --- a/tasks/install_gitea.yml +++ b/tasks/install_gitea.yml @@ -61,6 +61,7 @@ - name: Import gitea gpg key ansible.builtin.command: "gpg --keyserver {{ gitea_gpg_server }} --recv {{ gitea_gpg_key }}" register: _gitea_import_key + become: false changed_when: '"imported: 1" in _gitea_import_key.stderr' when: '_gitea_gpg_key_status.rc != 0 or "expired" in _gitea_gpg_key_status.stdout'