diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8769e7a..7aba925 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ plan: changes: - terraform.tf - terraform.tfvars - - tasks/main.yml + - jobs/main.yml apply: stage: apply @@ -67,7 +67,7 @@ apply: changes: - terraform.tf - terraform.tfvars - - tasks/main.yml + - jobs/main.yml when: manual ansible-apply: @@ -80,14 +80,14 @@ ansible-apply: script: - apt update && apt install ansible -y - ansible-galaxy install -r $CI_PROJECT_DIR/group_vars/requirements.yml - - ansible-playbook $CI_PROJECT_DIR/tasks/main.yml + - ansible-playbook $CI_PROJECT_DIR/jobs/main.yml needs: - apply only: changes: - terraform.tf - terraform.tfvars - - tasks/main.yml + - jobs/main.yml destroy: stage: destroy @@ -115,7 +115,7 @@ destroy: changes: - terraform.tf - terraform.tfvars - - tasks/main.yml + - jobs/main.yml when: manual ansible-update: @@ -125,7 +125,7 @@ ansible-update: script: - apt update && apt install ansible -y - ansible-galaxy install -r $CI_PROJECT_DIR/group_vars/requirements.yml - - ansible-playbook $CI_PROJECT_DIR/tasks/update.yml + - ansible-playbook $CI_PROJECT_DIR/jobs/update.yml rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: always @@ -137,7 +137,7 @@ ansible-update-dns: script: - apt update && apt install ansible -y - ansible-galaxy install -r $CI_PROJECT_DIR/group_vars/requirements.yml - - ansible-playbook $CI_PROJECT_DIR/tasks/dns.yml + - ansible-playbook $CI_PROJECT_DIR/jobs/dns.yml only: changes: - - tasks/dns.yml \ No newline at end of file + - jobs/dns.yml \ No newline at end of file diff --git a/tasks/dns.yml b/jobs/dns.yml similarity index 82% rename from tasks/dns.yml rename to jobs/dns.yml index d5c4ec8..aa75136 100644 --- a/tasks/dns.yml +++ b/jobs/dns.yml @@ -6,8 +6,6 @@ - {record: 'bitwarden', zone: 'durp.info', proxied: 'yes', state: 'present'} - {record: 'nextcloud', zone: 'durp.info', proxied: 'yes', state: 'present'} - {record: 'grafana', zone: 'durp.info', proxied: 'yes', state: 'present'} - - {record: 'alertmanager', zone: 'durp.info', proxied: 'yes', state: 'absent'} - - {record: 'prometheus', zone: 'durp.info', proxied: 'yes', state: 'absent'} - {record: 'kong', zone: 'durp.info', proxied: 'yes', state: 'present'} - {record: '@', zone: 'durp.info', proxied: 'yes', state: 'present'} - {record: 'whoogle', zone: 'durp.info', proxied: 'yes', state: 'present'} diff --git a/tasks/main.yml b/jobs/main.yml similarity index 100% rename from tasks/main.yml rename to jobs/main.yml diff --git a/tasks/update.yml b/jobs/update.yml similarity index 100% rename from tasks/update.yml rename to jobs/update.yml