From a4c974e980eef8238f22689489bf8f2d6016f49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Sat, 7 Sep 2024 02:04:19 +0100 Subject: [PATCH] . --- .gitea/workflows/host.yml | 33 ++++--------------- {ansible_bck => ansible}/core.yml | 0 .../myInfra.dev.homesrv01.core/.gitignore | 0 .../myInfra.dev.homesrv01.core/README.md | 0 .../myInfra.dev.homesrv01.core/meta/main.yml | 0 .../myInfra.dev.homesrv01.core/tasks/main.yml | 0 .../roles/myInfra.dev.homesrv01/.gitignore | 0 .../roles/myInfra.dev.homesrv01/README.md | 0 .../roles/myInfra.dev.homesrv01/meta/main.yml | 0 .../myInfra.dev.homesrv01/tasks/main.yml | 0 .../roles/myInfra.ssh/.gitignore | 0 .../roles/myInfra.ssh/README.md | 0 .../roles/myInfra.ssh/handlers/main.yml | 0 .../roles/myInfra.ssh/meta/main.yml | 0 .../roles/myInfra.ssh/tasks/main.yml | 0 ansible/site.yml | 33 ++++++++++--------- 16 files changed, 24 insertions(+), 42 deletions(-) rename {ansible_bck => ansible}/core.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01.core/.gitignore (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01.core/README.md (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01.core/meta/main.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01.core/tasks/main.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01/.gitignore (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01/README.md (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01/meta/main.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.dev.homesrv01/tasks/main.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.ssh/.gitignore (100%) rename {ansible_bck => ansible}/roles/myInfra.ssh/README.md (100%) rename {ansible_bck => ansible}/roles/myInfra.ssh/handlers/main.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.ssh/meta/main.yml (100%) rename {ansible_bck => ansible}/roles/myInfra.ssh/tasks/main.yml (100%) diff --git a/.gitea/workflows/host.yml b/.gitea/workflows/host.yml index 590b8ab..deff217 100644 --- a/.gitea/workflows/host.yml +++ b/.gitea/workflows/host.yml @@ -1,53 +1,34 @@ name: deploy host on: push: -# paths: -# - "ansible/**" -# - ".gitea/workflows/**host**.yml" + paths: + - "ansible/**" + - ".gitea/workflows/**host**.yml" jobs: Deploy: runs-on: "homesrv-deploy" -# - data -# - /src/*.json steps: - name: Checkout code uses: actions/checkout@v2 - # - name: ls - # run: ls -lah .${GITHUB_WORKSPACE} - # - name: Run Ansible Playbook - # run: | - # docker run --rm --volumes-from ${{ env.JOB_CONTAINER_NAME }} ubuntu:latest ls -lah ${GITHUB_WORKSPACE}; code-server - #- name: setup ssh - # run: echo {{ secrets.HOST_ANSIBLE_REMOTE_USER }} > /ssh-key && chmod 600 /ssh-key - name: setup ssh - run: echo "${{ secrets.HOST_ANSIBLE_PRIVATE_KEY }}" > ${GITHUB_WORKSPACE}/ssh-key && chmod 600 ${GITHUB_WORKSPACE}/ssh-key + run: | + echo "${{ secrets.HOST_ANSIBLE_PRIVATE_KEY }}" > ${GITHUB_WORKSPACE}/ssh-key + && chmod 600 ${GITHUB_WORKSPACE}/ssh-key - name: Run Ansible Playbook run: | docker run --rm \ -e ANSIBLE_PRIVATE_KEY_FILE="${GITHUB_WORKSPACE}/ssh-key" \ -e ANSIBLE_REMOTE_USER="${{ secrets.HOST_ANSIBLE_REMOTE_USER }}" \ - -e ANSIBLE_INVENTORY="homesrv01.dev.lan," \ + -e ANSIBLE_INVENTORY="${{ secrets.HOST_ANSIBLE_INVENTORY }}" \ -e ANSIBLE_PROJECT_PATH=${GITHUB_WORKSPACE}/ansible \ -e ANSIBLE_HOST_KEY_CHECKING=false \ --volumes-from ${{ env.JOB_CONTAINER_NAME }} \ git.limbosolutions.com/kb/ansible:dev \ - # - - # --entrypoint "/bin/bash" \ - - #-c "cd ${GITHUB_WORKSPACE}/ansible; ansible-playbook -i homesrv01.dev.lan, -u admin --private-key ${GITHUB_WORKSPACE}/ssh-key site.yml" - - # -c "echo \"${{ secrets.HOST_ANSIBLE_PRIVATE_KEY }}\" > /ansible-tmp/cert; chmod 600 /ansible-tmp/cert; cd ${GITHUB_WORKSPACE}/ansible; ansible-playbook -i homesrv01.dev.lan, -u admin --private-key /ansible-tmp/cert site.yml " - # \ - # git.limbosolutions.com/kb/ansible-playbook:dev -c "chmod -R a+rwx ${GITHUB_WORKSPACE}/ansible; ls -lah ${GITHUB_WORKSPACE}/ansible; python3 /scripts/run-ansible-playbook.py" - - # --entrypoint "/bin/bash" \ - #git.limbosolutions.com/kb/ansible-playbook:dev -c "ls -lah ${GITHUB_WORKSPACE}" \ No newline at end of file diff --git a/ansible_bck/core.yml b/ansible/core.yml similarity index 100% rename from ansible_bck/core.yml rename to ansible/core.yml diff --git a/ansible_bck/roles/myInfra.dev.homesrv01.core/.gitignore b/ansible/roles/myInfra.dev.homesrv01.core/.gitignore similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01.core/.gitignore rename to ansible/roles/myInfra.dev.homesrv01.core/.gitignore diff --git a/ansible_bck/roles/myInfra.dev.homesrv01.core/README.md b/ansible/roles/myInfra.dev.homesrv01.core/README.md similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01.core/README.md rename to ansible/roles/myInfra.dev.homesrv01.core/README.md diff --git a/ansible_bck/roles/myInfra.dev.homesrv01.core/meta/main.yml b/ansible/roles/myInfra.dev.homesrv01.core/meta/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01.core/meta/main.yml rename to ansible/roles/myInfra.dev.homesrv01.core/meta/main.yml diff --git a/ansible_bck/roles/myInfra.dev.homesrv01.core/tasks/main.yml b/ansible/roles/myInfra.dev.homesrv01.core/tasks/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01.core/tasks/main.yml rename to ansible/roles/myInfra.dev.homesrv01.core/tasks/main.yml diff --git a/ansible_bck/roles/myInfra.dev.homesrv01/.gitignore b/ansible/roles/myInfra.dev.homesrv01/.gitignore similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01/.gitignore rename to ansible/roles/myInfra.dev.homesrv01/.gitignore diff --git a/ansible_bck/roles/myInfra.dev.homesrv01/README.md b/ansible/roles/myInfra.dev.homesrv01/README.md similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01/README.md rename to ansible/roles/myInfra.dev.homesrv01/README.md diff --git a/ansible_bck/roles/myInfra.dev.homesrv01/meta/main.yml b/ansible/roles/myInfra.dev.homesrv01/meta/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01/meta/main.yml rename to ansible/roles/myInfra.dev.homesrv01/meta/main.yml diff --git a/ansible_bck/roles/myInfra.dev.homesrv01/tasks/main.yml b/ansible/roles/myInfra.dev.homesrv01/tasks/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.dev.homesrv01/tasks/main.yml rename to ansible/roles/myInfra.dev.homesrv01/tasks/main.yml diff --git a/ansible_bck/roles/myInfra.ssh/.gitignore b/ansible/roles/myInfra.ssh/.gitignore similarity index 100% rename from ansible_bck/roles/myInfra.ssh/.gitignore rename to ansible/roles/myInfra.ssh/.gitignore diff --git a/ansible_bck/roles/myInfra.ssh/README.md b/ansible/roles/myInfra.ssh/README.md similarity index 100% rename from ansible_bck/roles/myInfra.ssh/README.md rename to ansible/roles/myInfra.ssh/README.md diff --git a/ansible_bck/roles/myInfra.ssh/handlers/main.yml b/ansible/roles/myInfra.ssh/handlers/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.ssh/handlers/main.yml rename to ansible/roles/myInfra.ssh/handlers/main.yml diff --git a/ansible_bck/roles/myInfra.ssh/meta/main.yml b/ansible/roles/myInfra.ssh/meta/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.ssh/meta/main.yml rename to ansible/roles/myInfra.ssh/meta/main.yml diff --git a/ansible_bck/roles/myInfra.ssh/tasks/main.yml b/ansible/roles/myInfra.ssh/tasks/main.yml similarity index 100% rename from ansible_bck/roles/myInfra.ssh/tasks/main.yml rename to ansible/roles/myInfra.ssh/tasks/main.yml diff --git a/ansible/site.yml b/ansible/site.yml index 1883131..9620395 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,20 +1,21 @@ - -- name: Hello from ansible +- name: Homesrv01 playbook hosts: all - - tasks: - - name: Ping my hosts - become: true - ansible.builtin.ping: - - - name: Print message - ansible.builtin.debug: - msg: Hello world + roles: + - myInfra.dev.homesrv01.core -#- name: homesrv01 playbook -# hosts: all -# roles: -# - myInfra.dev.homesrv01.core # - myInfra.ssh -# - myInfra.dev.homesrv01 \ No newline at end of file +# - myInfra.dev.homesrv01 + +#- name: Hello from ansible +# hosts: all +# +# tasks: +# - name: Ping my hosts +# become: true +# ansible.builtin.ping: + +# - name: Print message +# ansible.builtin.debug: +# msg: Hello world +