From aeca480d99465c1456c8bf2b4c59357ff1e35e13 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Thu, 25 Jul 2024 22:41:29 +0200 Subject: [PATCH] d --- ...{ansible-lint.yml.old => ansible-lint.yml} | 5 +-- .woodpecker/ansible-playbook.yml | 23 ---------- requirements.yaml | 42 ------------------- 3 files changed, 1 insertion(+), 69 deletions(-) rename .woodpecker/{ansible-lint.yml.old => ansible-lint.yml} (78%) delete mode 100644 .woodpecker/ansible-playbook.yml delete mode 100644 requirements.yaml diff --git a/.woodpecker/ansible-lint.yml.old b/.woodpecker/ansible-lint.yml similarity index 78% rename from .woodpecker/ansible-lint.yml.old rename to .woodpecker/ansible-lint.yml index 819415ce..aec6c258 100644 --- a/.woodpecker/ansible-lint.yml.old +++ b/.woodpecker/ansible-lint.yml @@ -4,15 +4,12 @@ depends_on: steps: ansible-lint: - image: quay.io/ansible/creator-ee:v24.2.0 + image: registry.mgrote.net/ansible-image:master commands: # Secrets - echo $${SSHKEY} | base64 -d > ./id_ed25519 # woodpecker verschluckt linebreakes, daher mit base64 -w0 "kodiert" - echo $${VAULTPASS} | base64 -d > ./vault-pass.yml # Name des Secrets in Großschreibung - chmod 0400 ./id_ed25519 - # Abhängigkeiten - - pip install pykeepass Jinja2 markupsafe jmespath --user - - ansible-galaxy install -r requirements.yaml # Doing - ansible-lint --version - ansible-lint --force-color --format pep8 diff --git a/.woodpecker/ansible-playbook.yml b/.woodpecker/ansible-playbook.yml deleted file mode 100644 index 5809d2d6..00000000 --- a/.woodpecker/ansible-playbook.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -#depends_on: -# - ansible-lint - -steps: - ansible-playbook: - image: registry.mgrote.net/ansible-image:master - commands: - # Secrets - - echo $${SSHKEY} | base64 -d > ./id_ed25519 # woodpecker verschluckt linebreakes, daher mit base64 -w0 "kodiert" - - echo $${VAULTPASS} | base64 -d > ./vault-pass # Name des Secrets in Großschreibung - - chmod 0400 ./id_ed25519 - # Debug - - ansible localhost -m debug -a "var={{ lookup('viczem.keepass.keepass', 'restic_repository_password', 'password') }}" - # Doing - #- ansible-playbook playbooks/2_all.yml playbooks/3_service/* --limit production - # https://woodpecker-ci.org/docs/usage/secrets#use-secrets-in-commands - secrets: [vaultpass, sshkey] - when: - - event: [push, pull_request_closed] - branch: image # master -... -# zusammenspiel image und homeserver mit gesetzten vars uind pfaden beschreiben diff --git a/requirements.yaml b/requirements.yaml deleted file mode 100644 index 2f68186d..00000000 --- a/requirements.yaml +++ /dev/null @@ -1,42 +0,0 @@ -collections: - - name: community.general - version: "9.2.0" - - name: community.crypto - version: "2.21.1" - - name: ansible.posix - version: "1.5.4" - - name: community.docker - version: "3.11.0" - - name: viczem.keepass - version: "0.7.5" -roles: - - name: ansible-role-bootstrap - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-bootstrap - version: "7.0.2" - - name: ansible-ufw - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-ufw - version: "v4.1.13" - - name: ansible-manage-lvm - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-manage-lvm - version: "v0.2.12" - - name: ansible-role-unattended-upgrades - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-unattended-upgrades - version: "v4.6.0" - - name: ansible-role-pip - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-pip - version: "3.0.3" - - name: ansible-role-nfs - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-nfs - version: "2.0.0" - - name: ansible-role-docker - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-docker - version: "7.1.0" - - name: ansible_role_ctop - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible_role_ctop - version: "1.1.6" - - name: ansible_role_gitea - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible_role_gitea - version: "v3.5.0" - - name: ansible-role-postgresql - src: git+https://git.mgrote.net/ansible-role-mirrors/ansible-role-postgresql - version: "3.5.2"