Skip to content

Commit

Permalink
Merge pull request #93 from cradle8810/78_ansible-run-for-rui
Browse files Browse the repository at this point in the history
Rui関連のファイルが変更されたら、ansible-playbookを実行してDNS設定を変更する
  • Loading branch information
cradle8810 authored Apr 25, 2024
2 parents 029f33f + d9384d4 commit 6d59651
Show file tree
Hide file tree
Showing 7 changed files with 112 additions and 130 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/duplicate_check.yml

This file was deleted.

107 changes: 107 additions & 0 deletions .github/workflows/jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
---
name: Hayaworld Ansible Jobs
on:
push:
branches:
- '**'
workflow_dispatch:

jobs:
Yamllint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Run YAML Lint
run: yamllint --strict --format github .

AnsibleLint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Run Ansible-lint
uses: ansible/ansible-lint@main

Duplicate_Check:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Add exec flag to dupcheck.sh
run: "chmod +x ./dupcheck.sh"

- name: NXDOMAIN_Duplicate_Check
run: >
"./dupcheck.sh"
"inventories/host_vars/rui/ads_hosts/NXDOMAIN.yml"
Detect_File_Changed:
runs-on: ubuntu-latest
outputs:
rui: ${{ steps.changes.outputs.rui }}
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Check What file were changed
uses: dorny/paths-filter@v3
id: changes
with:
filters: |
rui:
- 'rui.yml'
- 'tasks/rui/dnsmasq.yml'
- 'inventories/host_vars/rui/**'
Dry_Run_ansible:
if: ${{ needs.Detect_File_Changed.outputs.rui == 'true' }}
needs:
- Yamllint
- AnsibleLint
- Duplicate_Check
- Detect_File_Changed
runs-on: self-hosted
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Prepare environments (ansible-galaxy)
run: |
ansible-galaxy install -r requirements.yml
- name: "ansible-playbook -C --tags dnsmasq rui.yml"
run: |
ansible-playbook \
-i inventories \
-C \
--tags dnsmasq \
--ssh-extra-args='-o StrictHostKeyChecking=no' \
--extra-vars "ansible_sudo_pass=${{ secrets.SUDO }}" \
rui.yml
Run_ansible:
# if file for rui changed and master branch
if: "${{ needs.Detect_File_Changed.outputs.rui == 'true' && github.ref == 'refs/heads/master'}}"
needs:
- Dry_Run_ansible
runs-on: self-hosted
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Prepare environments (ansible-galaxy)
run: |
ansible-galaxy install -r requirements.yml
- name: "ansible-playbook --tags dnsmasq rui.yml"
run: |
ansible-playbook \
-i inventories \
--tags dnsmasq \
--ssh-extra-args='-o StrictHostKeyChecking=no' \
--extra-vars "ansible_sudo_pass=${{ secrets.SUDO }}" \
rui.yml
38 changes: 0 additions & 38 deletions .github/workflows/lints.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/shellspec.yml

This file was deleted.

3 changes: 3 additions & 0 deletions inventories/host_vars/rui/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
a:
- a.yml
2 changes: 2 additions & 0 deletions rui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
- name: Setup dnsmask
ansible.builtin.import_tasks:
file: tasks/rui/dnsmasq.yml
tags:
- dnsmasq

- name: Setup journalctl
ansible.builtin.import_tasks:
Expand Down
47 changes: 0 additions & 47 deletions tasks/rui/dnsmasq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@
group: root
mode: '0644'
notify: "Restart dnsmasq"
tags:
- dnsmasq

- name: Show dnsmasq.conf
ansible.builtin.debug:
msg: "{{ lookup('template', './templates/rui/etc/dnsmasq.conf.j2') }}"
tags:
- debug
- dryrun

- name: Add dnsmasq.resolv.txt
ansible.builtin.template:
Expand All @@ -25,15 +16,6 @@
group: root
mode: '0644'
notify: "Restart dnsmasq"
tags:
- dnsmasq

- name: Show dnsmasq.resolv.txt
ansible.builtin.debug:
msg: "{{ lookup('template', './templates/rui/etc/dnsmasq.d/resolv.txt.j2') }}"
tags:
- debug
- dryrun

- name: Add static DHCP config
ansible.builtin.template:
Expand All @@ -43,15 +25,6 @@
group: root
mode: '0644'
notify: "Restart dnsmasq"
tags:
- dnsmasq

- name: Show static DHCP config
ansible.builtin.debug:
msg: "{{ lookup('template', './templates/rui/etc/dnsmasq.d/dhcp_static.conf.j2') }}"
tags:
- debug
- dryrun

- name: Add cname config
ansible.builtin.template:
Expand All @@ -61,15 +34,6 @@
group: root
mode: '0644'
notify: "Restart dnsmasq"
tags:
- dnsmasq

- name: Show cname config
ansible.builtin.debug:
msg: "{{ lookup('template', './templates/rui/etc/dnsmasq.d/cname.conf.j2') }}"
tags:
- debug
- dryrun

- name: Add NXDOMAIN (Ads Block) config
ansible.builtin.template:
Expand All @@ -79,15 +43,6 @@
group: root
mode: '0644'
notify: "Restart dnsmasq"
tags:
- dnsmasq

- name: Show cname config
ansible.builtin.debug:
msg: "{{ lookup('template', './templates/rui/etc/dnsmasq.d/blocklist.conf.j2') }}"
tags:
- debug
- dryrun

- name: Add hosts(5)
ansible.builtin.template:
Expand All @@ -97,5 +52,3 @@
group: root
mode: '0644'
notify: "Restart dnsmasq"
tags:
- dnsmasq

0 comments on commit 6d59651

Please sign in to comment.