From ad24ff74f2fb176f05d322e78a23a9bf496dcc3d Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 24 Sep 2021 11:50:31 +0200 Subject: [PATCH 1/2] gitea secrets aren't necessarily strings fixes errors like fatal: [gitea]: FAILED! => {"msg": "The conditional check 'gitea_secret_key | length == 0' failed. The error was: Unexpected templating type error occurred on ({% if gitea_secret_key | length == 0 %} True {% else %} False {% endif %}): object of type 'AnsibleVaultEncryptedUnicode' has no len() when using an encrypted string in vault for secrets --- tasks/gitea_secrets.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/gitea_secrets.yml b/tasks/gitea_secrets.yml index 51303ae..916e466 100644 --- a/tasks/gitea_secrets.yml +++ b/tasks/gitea_secrets.yml @@ -4,35 +4,35 @@ ansible.builtin.shell: 'umask 077; /usr/local/bin/gitea generate secret SECRET_KEY > /etc/gitea/gitea_secret_key' args: creates: '/etc/gitea/gitea_secret_key' - when: gitea_secret_key | length == 0 + when: gitea_secret_key | string | length == 0 - name: read gitea SECRET_KEY from file become: true ansible.builtin.slurp: src: '/etc/gitea/gitea_secret_key' register: remote_secret_key - when: gitea_secret_key | length == 0 + when: gitea_secret_key | string | length == 0 - name: set fact gitea_secret_key ansible.builtin.set_fact: gitea_secret_key: "{{ remote_secret_key['content'] | b64decode }}" - when: gitea_secret_key | length == 0 + when: gitea_secret_key | string | length == 0 - name: generate gitea INTERNAL_TOKEN if not provided become: true ansible.builtin.shell: 'umask 077; /usr/local/bin/gitea generate secret INTERNAL_TOKEN > /etc/gitea/gitea_internal_token' args: creates: '/etc/gitea/gitea_internal_token' - when: gitea_internal_token | length == 0 + when: gitea_internal_token | string | length == 0 - name: read gitea INTERNAL_TOKEN from file become: true ansible.builtin.slurp: src: '/etc/gitea/gitea_internal_token' register: remote_internal_token - when: gitea_internal_token | length == 0 + when: gitea_internal_token | string | length == 0 - name: set fact gitea_internal_token ansible.builtin.set_fact: gitea_internal_token: "{{ remote_internal_token['content'] | b64decode }}" - when: gitea_internal_token | length == 0 + when: gitea_internal_token | string | length == 0 From 722c7e1ddddad018c4fe165f07d6f4c113908312 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 24 Sep 2021 11:52:30 +0200 Subject: [PATCH 2/2] Update main.yml --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index 0eb2cdf..dda0a4e 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -56,5 +56,5 @@ transfer_custom_footer: - 'files/gitea_footer/extra_links_footer.tmpl' - 'files/extra_links_footer.tmpl' -playbook_version_number: 27 # should be int +playbook_version_number: 28 # should be int playbook_version_path: 'do1jlr.gitea.version'