From 561331b825d5ed876f1f417b5d8758ab54135bbd Mon Sep 17 00:00:00 2001 From: Gabriel Radureau Date: Thu, 7 Aug 2025 15:51:53 +0200 Subject: [PATCH] fixes --- .gitea/workflows/iac.yaml | 1 + .gitea/workflows/postgres.yaml | 1 + ansible/README.md | 4 ++-- ansible/arcodange/factory/playbooks/01_system.yml | 8 ++++---- .../tools/roles/hashicorp_vault/tasks/new_root_token.yml | 2 +- .../arcodange/factory/roles/gitea_token/tasks/main.yml | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/iac.yaml b/.gitea/workflows/iac.yaml index 026a3e4..c61bf6a 100644 --- a/.gitea/workflows/iac.yaml +++ b/.gitea/workflows/iac.yaml @@ -3,6 +3,7 @@ name: Postgres on: #[push,pull_request] + workflow_dispatch: {} push: &tofuPaths paths: - 'iac/*.tf' diff --git a/.gitea/workflows/postgres.yaml b/.gitea/workflows/postgres.yaml index a048685..63b1237 100644 --- a/.gitea/workflows/postgres.yaml +++ b/.gitea/workflows/postgres.yaml @@ -3,6 +3,7 @@ name: Postgres on: #[push,pull_request] + workflow_dispatch: {} push: &postgresTofuPaths paths: - 'postgres/**/*.tf' diff --git a/ansible/README.md b/ansible/README.md index 55b1555..afab16f 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -80,7 +80,7 @@ ansible -i ,localhost -c local localhost -m raw -a "echo hello world {{ inventor #### Install ansible -`uv tool install ansible-core --with dnspython` +`uv tool install ansible-core --with dnspython --with jmespath --with kubernetes` `echo 'export PATH="~/.local/share/uv/tools/ansible-core/bin:$PATH"' >> ~/.zshenv` #### Install this project depedencies @@ -93,5 +93,5 @@ ansible-galaxy collection install --token 11bebd8fd1ad4009f700bdedbeb80b19743ce3 ``` ansible-galaxy collection install ./ansible/arcodange/factory -f - +ansible-playbook -i ansible/arcodange/factory/inventory ansible/arcodange/factory/playbooks/02_setup.yml ``` \ No newline at end of file diff --git a/ansible/arcodange/factory/playbooks/01_system.yml b/ansible/arcodange/factory/playbooks/01_system.yml index 30b9072..8f46c79 100644 --- a/ansible/arcodange/factory/playbooks/01_system.yml +++ b/ansible/arcodange/factory/playbooks/01_system.yml @@ -165,11 +165,11 @@ localIp: ipAllowList: sourceRange: - - "0.0.0.0/0" - # - "192.168.1.0/24" - # - "{{ ipify_public_ip }}/32" + - "192.168.1.0/24" + - "{{ ipify_public_ip }}/32" + # - "0.0.0.0/0" # ipStrategy: - # depth: 2 + # depth: 1 traefik_helm_values: deployment: kind: "Deployment" diff --git a/ansible/arcodange/factory/playbooks/tools/roles/hashicorp_vault/tasks/new_root_token.yml b/ansible/arcodange/factory/playbooks/tools/roles/hashicorp_vault/tasks/new_root_token.yml index 576ca3e..7dd7ec9 100644 --- a/ansible/arcodange/factory/playbooks/tools/roles/hashicorp_vault/tasks/new_root_token.yml +++ b/ansible/arcodange/factory/playbooks/tools/roles/hashicorp_vault/tasks/new_root_token.yml @@ -2,7 +2,7 @@ include_tasks: vault_cmd.yml vars: vault_cmd: '{{ item.cmd }}' - vault_cmd_output_var: '{{ item.save }}' + vault_cmd_output_var: '{{ item.save | default(false) }}' vault_cmd_json_attr: '{{ item.json_attr | default("") }}' vault_cmd_can_fail: '{{ item.can_fail | default(false) }}' diff --git a/ansible/arcodange/factory/roles/gitea_token/tasks/main.yml b/ansible/arcodange/factory/roles/gitea_token/tasks/main.yml index 790187e..d4df65d 100644 --- a/ansible/arcodange/factory/roles/gitea_token/tasks/main.yml +++ b/ansible/arcodange/factory/roles/gitea_token/tasks/main.yml @@ -25,7 +25,7 @@ - name: replace token when: - gitea_token_delete or gitea_api_token_cmd.rc != 0 - - gitea_token_delete or "'access token name has been used already' in gitea_api_token_cmd.stderr" + - gitea_token_delete or ('access token name has been used already' in gitea_api_token_cmd.stderr) - gitea_token_delete or gitea_token_replace - gitea_api_token is defined block: