Skip to content

Commit

Permalink
ansible: underscore tag purge
Browse files Browse the repository at this point in the history
  • Loading branch information
saltydk committed Jul 23, 2023
1 parent 6f69a2b commit 571dfc1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/saltbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- id: set-matrix
run: echo "matrix={\"roles\":[$(awk '/# Core/{flag=1;next}/# Apps End/{flag=0}flag' saltbox.yml | awk '!/#/' | awk -F'[][]' '{print $2}' | tr '\n' ',' | sed 's/,*$//' | awk -F',' '{ for( i=1; i<=NF; i++ ) print $i }' | awk '{ gsub(/ /,""); print }'| sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' | sed "s/.\(roles\|common\|hetzner\|kernel\|motd\|mounts\|nvidia\|preinstall\|rclone\|scripts\|shell\|system\|traefik\|traefik_reset_certs\|user\|cloudflare\|plex-db\|arr-db\).,//g")]}" >> $GITHUB_OUTPUT
run: echo "matrix={\"roles\":[$(awk '/# Core/{flag=1;next}/# Apps End/{flag=0}flag' saltbox.yml | awk '!/#/' | awk -F'[][]' '{print $2}' | tr '\n' ',' | sed 's/,*$//' | awk -F',' '{ for( i=1; i<=NF; i++ ) print $i }' | awk '{ gsub(/ /,""); print }'| sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' | sed "s/.\(roles\|common\|hetzner\|kernel\|motd\|mounts\|nvidia\|preinstall\|rclone\|scripts\|shell\|system\|traefik\|traefik-reset-certs\|user\|cloudflare\|plex-db\|arr-db\).,//g")]}" >> $GITHUB_OUTPUT

install:
name: '${{ matrix.roles }}'
Expand Down
12 changes: 6 additions & 6 deletions roles/hetzner_nfs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
- "../../defaults/hetzner_nfs.yml.default"

- name: Server Tasks
when: ('hetzner_nfs_server' in ansible_run_tags) or ('hetzner_nfs_server_uninstall' in ansible_run_tags)
when: ('hetzner-nfs-server' in ansible_run_tags) or ('hetzner-nfs-server-uninstall' in ansible_run_tags)
block:
- name: "Hetzner NFS Server Tasks"
ansible.builtin.include_tasks: "hetzner_nfs_server.yml"
when: ('hetzner_nfs_server' in ansible_run_tags)
when: ('hetzner-nfs-server' in ansible_run_tags)

- name: "Hetzner NFS Server Uninstall Tasks"
ansible.builtin.include_tasks: "hetzner_nfs_server_uninstall.yml"
when: ('hetzner_nfs_server_uninstall' in ansible_run_tags)
when: ('hetzner-nfs-server-uninstall' in ansible_run_tags)

- name: Client Tasks
when: ('hetzner_nfs_client_mount' in ansible_run_tags) or ('hetzner_nfs_client_unmount' in ansible_run_tags)
when: ('hetzner-nfs-client-mount' in ansible_run_tags) or ('hetzner-nfs-client-unmount' in ansible_run_tags)
block:
- name: Fail when invalid hetzner_nfs.mount_client is specified
ansible.builtin.fail:
Expand All @@ -37,11 +37,11 @@

- name: "Hetzner NFS Mount Tasks"
ansible.builtin.include_tasks: "hetzner_nfs_mount.yml"
when: ('hetzner_nfs_client_mount' in ansible_run_tags)
when: ('hetzner-nfs-client-mount' in ansible_run_tags)

- name: "Hetzner NFS UNmount Tasks"
ansible.builtin.include_tasks: "hetzner_nfs_unmount.yml"
when: ('hetzner_nfs_client_unmount' in ansible_run_tags)
when: ('hetzner-nfs-client-unmount' in ansible_run_tags)

- name: "Services Start Tasks"
ansible.builtin.include_tasks: "services_start.yml"
2 changes: 1 addition & 1 deletion roles/traefik/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
ansible.builtin.file:
path: "{{ traefik_paths_location }}/acme.json"
state: absent
when: ('traefik_reset_certs' in ansible_run_tags)
when: ('traefik-reset-certs' in ansible_run_tags)

- name: Create Docker container
ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"
Expand Down
12 changes: 6 additions & 6 deletions saltbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
- ['providers.yml', 'defaults/providers.yml.default']
roles:
- { role: settings, tags: ['settings'] }
- { role: pre_tasks, tags: ['always', 'pre_tasks'] }
- { role: sanity_check, tags: ['sanity_check'] }
- { role: pre_tasks, tags: ['always', 'pre-tasks'] }
- { role: sanity_check, tags: ['sanity-check'] }
- { role: backup, tags: ['backup'] }
- { role: backup2, tags: ['backup2'] }
- { role: restore, tags: ['restore'] }
Expand All @@ -31,7 +31,7 @@
- { role: nvidia, tags: ['core', 'saltbox', 'mediabox', 'nvidia'], when: ['use_nvidia'] }
- { role: scripts, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'scripts'] }
- { role: sandbox, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'sandbox'] }
- { role: traefik, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'traefik', 'traefik_reset_certs'] }
- { role: traefik, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'traefik', 'traefik-reset-certs'] }
- { role: cloudflare, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'cloudflare'], when: ['cloudflare_is_enabled'] }
# Apps Start
- { role: media_server, tags: ['saltbox', 'mediabox', 'media-server'] }
Expand Down Expand Up @@ -73,7 +73,7 @@
- { role: mongodb, tags: ['mongodb'] }
- { role: netdata, tags: ['netdata'] }
- { role: nginx, tags: ['nginx'] }
- { role: node_exporter, tags: ['node_exporter'] }
- { role: node_exporter, tags: ['node-exporter'] }
- { role: nzbget, tags: ['nzbget'] }
- { role: nzbhydra2, tags: ['nzbhydra2'] }
- { role: nzbthrottle, tags: ['nzbthrottle'] }
Expand All @@ -97,8 +97,8 @@
- { role: yyq, tags: ['yyq'] }
# Apps End
- { role: custom, tags: ['custom'] }
- { role: hetzner_nfs, tags: ['hetzner_nfs_server', 'hetzner_nfs_server_uninstall', 'hetzner_nfs_client_mount', 'hetzner_nfs_client_unmount'] }
- { role: plex_auth_token, tags: ['plex_auth_token'] }
- { role: hetzner_nfs, tags: ['hetzner-nfs-server', 'hetzner-nfs-server-uninstall', 'hetzner-nfs-client-mount', 'hetzner-nfs-client-unmount'] }
- { role: plex_auth_token, tags: ['plex-auth-token'] }
- { role: plex_extra_tasks, tags: ['plex-extra-tasks'] }
- { role: sub_zero, tags: ['plex-plugins-sub-zero', 'plex-plugins-sub-zero-reinstall'] }
- { role: webtools, tags: ['plex-plugins-webtools', 'plex-plugins-webtools-reinstall'] }
Expand Down

0 comments on commit 571dfc1

Please sign in to comment.