From d08d4e0871161aec5c7cb06d435508bbca7088b0 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 17:54:42 +0200 Subject: [PATCH 01/18] ff --- .gitea/workflows/ansible-lint.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index b658a90a..820b705b 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -15,7 +15,6 @@ jobs: - name: run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest - with: - args: ansible-lint --force-color --format pep8 --show-relpath + run: ansible-lint --force-color --format pep8 --show-relpath # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From f18aef58e7d583c096a57760f3dac20cb2c34d4f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 17:56:58 +0200 Subject: [PATCH 02/18] ff --- .gitea/workflows/ansible-lint.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 820b705b..986fa003 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -15,6 +15,7 @@ jobs: - name: run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest - run: ansible-lint --force-color --format pep8 --show-relpath + run: | + ansible-lint --force-color --format pep8 --show-relpath # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From 182d381102a5524e3408f6ff49b970bf878c3dc0 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 17:59:58 +0200 Subject: [PATCH 03/18] dd --- .gitea/workflows/ansible-lint.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 986fa003..41e078f6 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -6,6 +6,8 @@ on: jobs: ansible-lint: + runs-on: ubuntu-latest + steps: - name: Checkout code uses: actions/checkout@v4 @@ -13,9 +15,10 @@ jobs: - name: write vault-pass run: echo ${{ secrets.VAULTPASS }} > ./vault-pass - - name: run ansible-lint + - name: Run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest - run: | - ansible-lint --force-color --format pep8 --show-relpath + with: + args: | + ansible-lint --force-color --format pep8 --show-relpath # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From 85711e72826f151ffa21589396493fb335a39eca Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:00:45 +0200 Subject: [PATCH 04/18] sdf --- .gitea/workflows/ansible-lint.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 41e078f6..32695a1a 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -18,7 +18,6 @@ jobs: - name: Run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest with: - args: | - ansible-lint --force-color --format pep8 --show-relpath + args: ansible-lint --force-color --format pep8 --show-relpath # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From 63219b8d62f9851c5f08276c24d700caa4041d78 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:01:51 +0200 Subject: [PATCH 05/18] dd --- .gitea/workflows/ansible-lint.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 32695a1a..92e74567 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -18,6 +18,8 @@ jobs: - name: Run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest with: - args: ansible-lint --force-color --format pep8 --show-relpath + entrypoint: ["/bin/bash", "-c"] + args: | + ansible-lint --force-color --format pep8 --show-relpath # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From 059865152e76885b3558bf42be754c6d2acf731f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:05:48 +0200 Subject: [PATCH 06/18] dd --- .gitea/workflows/ansible-lint.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 92e74567..6c28147d 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -7,6 +7,7 @@ on: jobs: ansible-lint: runs-on: ubuntu-latest + container: registry.mgrote.net/ansible-devspace:latest steps: - name: Checkout code @@ -16,10 +17,6 @@ jobs: run: echo ${{ secrets.VAULTPASS }} > ./vault-pass - name: Run ansible-lint - uses: docker://registry.mgrote.net/ansible-devspace:latest - with: - entrypoint: ["/bin/bash", "-c"] - args: | - ansible-lint --force-color --format pep8 --show-relpath + run: ansible-lint --force-color --format pep8 --show-relpath # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From edaf7e48c5805ed592da04f27b43ea4ad66e7634 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:07:25 +0200 Subject: [PATCH 07/18] ff --- .gitea/workflows/ansible-lint.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 6c28147d..0258b146 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -5,18 +5,12 @@ on: pull_request: jobs: - ansible-lint: + build: + name: Ansible Lint runs-on: ubuntu-latest - container: registry.mgrote.net/ansible-devspace:latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: write vault-pass - run: echo ${{ secrets.VAULTPASS }} > ./vault-pass - + - uses: actions/checkout@v4 - name: Run ansible-lint - run: ansible-lint --force-color --format pep8 --show-relpath + uses: ansible/ansible-lint@main # VAULTPASS ist als Secrets auf Repo-Ebene angelegt -- 2.43.0 From add4ebe512fed0faf2ac36f310278f922b4496c6 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:13:18 +0200 Subject: [PATCH 08/18] dd --- .gitea/workflows/ansible-lint.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml index 0258b146..6e7c5b86 100644 --- a/.gitea/workflows/ansible-lint.yaml +++ b/.gitea/workflows/ansible-lint.yaml @@ -1,6 +1,7 @@ name: ansible-lint on: - push: + workflow_dispatch: + push: branches: [ master ] pull_request: -- 2.43.0 From 8ae1c0ec9f030b3ec043885258e70d53882d90d0 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:17:59 +0200 Subject: [PATCH 09/18] d --- .gitea/workflows/ansible-lint.yaml | 17 ---------------- .gitea/workflows/ci.yaml | 31 ++++++++++++++++++++++++++++++ .gitea/workflows/gitleaks.yaml | 16 --------------- 3 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 .gitea/workflows/ansible-lint.yaml create mode 100644 .gitea/workflows/ci.yaml delete mode 100644 .gitea/workflows/gitleaks.yaml diff --git a/.gitea/workflows/ansible-lint.yaml b/.gitea/workflows/ansible-lint.yaml deleted file mode 100644 index 6e7c5b86..00000000 --- a/.gitea/workflows/ansible-lint.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: ansible-lint -on: - workflow_dispatch: - push: - branches: [ master ] - pull_request: - -jobs: - build: - name: Ansible Lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Run ansible-lint - uses: ansible/ansible-lint@main - -# VAULTPASS ist als Secrets auf Repo-Ebene angelegt diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml new file mode 100644 index 00000000..944b7904 --- /dev/null +++ b/.gitea/workflows/ci.yaml @@ -0,0 +1,31 @@ +name: ansible-lint +on: + workflow_dispatch: + push: + branches: [ master ] + pull_request: + +jobs: + ansible-lint: + name: Ansible Lint + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Run Gitleaks + uses: docker://zricethezav/gitleaks:v8.18.4 + options: --entrypoint ansible-lint + with: + args: --force-color --format pep8 --show-relpath + + gitleaks: + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Run Gitleaks + uses: docker://zricethezav/gitleaks:v8.18.4 + with: + args: detect --no-git --verbose --source ${{ github.workspace }} + +# VAULTPASS ist als Secrets auf Repo-Ebene angelegt diff --git a/.gitea/workflows/gitleaks.yaml b/.gitea/workflows/gitleaks.yaml deleted file mode 100644 index 9302ab56..00000000 --- a/.gitea/workflows/gitleaks.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: gitleaks -on: - push: - branches: [ master ] - pull_request: - -jobs: - gitleaks: - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Run Gitleaks - uses: docker://zricethezav/gitleaks:v8.18.4 - with: - args: detect --no-git --verbose --source ${{ github.workspace }} -- 2.43.0 From 202e9f6a6b7c994515f6b5839b447a03a8ba9350 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:19:56 +0200 Subject: [PATCH 10/18] dd --- .gitea/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 944b7904..b9e3d06c 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,7 +1,7 @@ name: ansible-lint on: workflow_dispatch: - push: + push: branches: [ master ] pull_request: -- 2.43.0 From 59f61c0b6ac83266559303459b27e471e7f64b9e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:22:26 +0200 Subject: [PATCH 11/18] dd --- .gitea/workflows/ci.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index b9e3d06c..8e8efbc3 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -12,11 +12,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Run Gitleaks + - name: Run ansible-lint uses: docker://zricethezav/gitleaks:v8.18.4 - options: --entrypoint ansible-lint with: - args: --force-color --format pep8 --show-relpath + args: tmux detach-client; ansible-lint--force-color --format pep8 --show-relpath gitleaks: steps: -- 2.43.0 From 3e1d8aa995f807259d5a8ac5cd5e61d8ad947344 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:23:18 +0200 Subject: [PATCH 12/18] dd --- .gitea/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 8e8efbc3..bb537753 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v4 - name: Run ansible-lint - uses: docker://zricethezav/gitleaks:v8.18.4 + uses: docker://registry.mgrote.net/ansible-devspace:latest with: args: tmux detach-client; ansible-lint--force-color --format pep8 --show-relpath -- 2.43.0 From bd01983556fef4caed05a6b9c3007c31ce3335b8 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 18:59:17 +0200 Subject: [PATCH 13/18] dd --- .gitea/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index bb537753..363e9ecc 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -14,8 +14,8 @@ jobs: - name: Run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest - with: - args: tmux detach-client; ansible-lint--force-color --format pep8 --show-relpath + with: # notwendig da ENTRYPOINT auf start-tmux.sh gesetzt ist + args: ansible-lint--force-color --format pep8 --show-relpath gitleaks: steps: -- 2.43.0 From d8bfdd8bb6bbc6b0500c936e4eff3042585670b8 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 19:17:47 +0200 Subject: [PATCH 14/18] ss --- .gitea/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 363e9ecc..fc28adf3 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -14,8 +14,8 @@ jobs: - name: Run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest - with: # notwendig da ENTRYPOINT auf start-tmux.sh gesetzt ist - args: ansible-lint--force-color --format pep8 --show-relpath + with: + args: /home/ansible-dev/.local/bin/ansible-lint --force-color --format pep8 --show-relpath gitleaks: steps: -- 2.43.0 From 7455be1386a868dde5935af032e13945ecad03f9 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 19:26:34 +0200 Subject: [PATCH 15/18] dd --- .gitea/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index fc28adf3..d32c5d4b 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: write vault-pass + run: echo ${{ secrets.VAULTPASS }} > ./vault-pass + - name: Run ansible-lint uses: docker://registry.mgrote.net/ansible-devspace:latest with: -- 2.43.0 From 69365edc6ad0716746d4741776b06ebba6be58f6 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 19:28:05 +0200 Subject: [PATCH 16/18] dd --- .ansible-lint | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index a96bb516..b4c2cf06 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -9,7 +9,6 @@ quiet: true exclude_paths: - .cache/ # implicit unless exclude_paths is defined in config - collections/ - - .gitlab-ci.yml - friedhof/ - playbooks/on-off - playbooks/base @@ -26,5 +25,4 @@ exclude_paths: - roles/ansible-ufw - roles/ansible_role_gitea - roles/ansible-role-postgresql - - .woodpecker/ - .gitea/ -- 2.43.0 From 49074b1db3319567ebb6a36bde90636b3b56f402 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 19:30:08 +0200 Subject: [PATCH 17/18] ff --- roles/mgrote_blocky/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/mgrote_blocky/tasks/main.yml b/roles/mgrote_blocky/tasks/main.yml index c6289335..4be84625 100644 --- a/roles/mgrote_blocky/tasks/main.yml +++ b/roles/mgrote_blocky/tasks/main.yml @@ -5,6 +5,9 @@ name: "{{ blocky_group }}" state: present +- name: test lint + ansible.builtin.shell: echo test + - name: ensure user exists become: true ansible.builtin.user: -- 2.43.0 From a6bcfe04061ff6b7f2eb9c1ca3b42279cbfe5e36 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 13 Sep 2024 19:31:20 +0200 Subject: [PATCH 18/18] dd --- roles/mgrote_blocky/tasks/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/roles/mgrote_blocky/tasks/main.yml b/roles/mgrote_blocky/tasks/main.yml index 4be84625..c6289335 100644 --- a/roles/mgrote_blocky/tasks/main.yml +++ b/roles/mgrote_blocky/tasks/main.yml @@ -5,9 +5,6 @@ name: "{{ blocky_group }}" state: present -- name: test lint - ansible.builtin.shell: echo test - - name: ensure user exists become: true ansible.builtin.user: -- 2.43.0