Skip to content

Commit

Permalink
More FQCNs and linting
Browse files Browse the repository at this point in the history
  • Loading branch information
davestephens committed Apr 18, 2023
1 parent 588576f commit a015186
Show file tree
Hide file tree
Showing 32 changed files with 55 additions and 52 deletions.
3 changes: 2 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ skip_list:
- risky-file-permissions
- role-name
- name[missing]
- key-order[task]
- name[template]

exclude_paths:
- roles/bertvv.samba
- roles/geerlingguy.docker
- roles/geerlingguy.docker_arm
- roles/geerlingguy.nfs

3 changes: 2 additions & 1 deletion nas.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
- hosts: all
- name: Ansible-NAS
hosts: all

roles:
###
Expand Down
31 changes: 16 additions & 15 deletions permission_data.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
---
- hosts: all
- name: Permission Data
hosts: all
tasks:
- name: Warning!
debug:
msg: "This playbook will repermission ALL existing data in the shares defined in group_vars/all.yml to be owned by the ansible-nas user and group. If this is not what you want, exit now."
- name: Warning!
ansible.builtin.debug:
msg: "This playbook will repermission ALL existing data in the shares defined in group_vars/all.yml to be owned by the ansible-nas user and group. If this is not what you want, exit now."

- name: 20s to change your mind...
pause:
seconds: 20
- name: 20s to change your mind...
ansible.builtin.pause:
seconds: 20

- name: "Permission share data"
file:
path: "{{ item.path }}"
owner: ansible-nas
group: ansible-nas
mode: "u=rwX,g=rwX,o=rX"
recurse: true
loop: "{{ samba_shares }}"
- name: "Permission share data"
ansible.builtin.file:
path: "{{ item.path }}"
owner: ansible-nas
group: ansible-nas
mode: "u=rwX,g=rwX,o=rX"
recurse: true
loop: "{{ samba_shares }}"
2 changes: 1 addition & 1 deletion roles/airsonic/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
airsonic_enabled: false
2 changes: 1 addition & 1 deletion roles/bazarr/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
bazarr_enabled: false
2 changes: 1 addition & 1 deletion roles/bitwarden/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
bitwarden_enabled: false
2 changes: 1 addition & 1 deletion roles/booksonic/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
booksonic_enabled: false
2 changes: 1 addition & 1 deletion roles/calibre/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
calibre_enabled: false
2 changes: 1 addition & 1 deletion roles/cloudcmd/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
cloudcmd_enabled: false
2 changes: 1 addition & 1 deletion roles/cloudflare_ddns/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
cloudflare_ddns_enabled: false
2 changes: 1 addition & 1 deletion roles/code-server/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
code_server_enabled: false
2 changes: 1 addition & 1 deletion roles/couchpotato/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
couchpotato_enabled: false
2 changes: 1 addition & 1 deletion roles/dashy/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
dashy_enabled: false
2 changes: 1 addition & 1 deletion roles/deluge/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
deluge_enabled: false
2 changes: 1 addition & 1 deletion roles/dokuwiki/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
dokuwiki_enabled: false
2 changes: 1 addition & 1 deletion roles/drone-ci/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
drone_ci_enabled: false
2 changes: 1 addition & 1 deletion roles/drone-ci/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
memory: "{{ drone_ci_agent_memory }}"

- name: Add webhook allowed hosts to Gitea
blockinfile:
ansible.builtin.blockinfile:
path: "{{ gitea_data_directory }}/gitea/gitea/conf/app.ini"
block: |
[webhook]
Expand Down
2 changes: 1 addition & 1 deletion roles/duplicacy/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
duplicacy_enabled: false
2 changes: 1 addition & 1 deletion roles/emby/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
emby_enabled: false
2 changes: 1 addition & 1 deletion roles/esphome/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
esphome_enabled: false
2 changes: 1 addition & 1 deletion roles/firefly/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
firefly_enabled: false
2 changes: 1 addition & 1 deletion roles/firefly/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
memory: "{{ firefly_mysql_memory }}"

- name: Wait for MySQL to init
pause:
ansible.builtin.pause:
seconds: 30

- name: Create Firefly III container
Expand Down
2 changes: 1 addition & 1 deletion roles/heimdall/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
heimdall_enabled: false
2 changes: 1 addition & 1 deletion roles/hello_world/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
hello_world_enabled: false
2 changes: 1 addition & 1 deletion roles/komga/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
komga_enabled: false
2 changes: 1 addition & 1 deletion roles/krusader/molecule/default/side_effect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
vars:
krusader_enabled: false
2 changes: 1 addition & 1 deletion roles/minecraft-bedrock-server/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ minecraft_bedrock_server_container_name: minecraft-bedrock-server
minecraft_bedrock_server_name: "Ansible-NAS Minecraft Server"
minecraft_bedrock_server_game_mode: "creative"
minecraft_bedrock_server_difficulty: "normal"
minecraft_bedrock_server_online_mode: "false"
minecraft_bedrock_server_online_mode: "false"
8 changes: 4 additions & 4 deletions roles/minecraft-bedrock-server/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- name: Create Minecraft Bedrock Server Directories
file:
ansible.builtin.file:
path: "{{ item }}"
state: directory
with_items:
Expand All @@ -9,7 +9,7 @@
- name: Start Minecraft Bedrock Server
block:
- name: Minecraft Bedrock Server Docker Container
docker_container:
community.docker.docker_container:
name: "{{ minecraft_bedrock_server_container_name }}"
image: itzg/minecraft-bedrock-server
pull: true
Expand All @@ -29,7 +29,7 @@
- name: Stop Minecraft Bedrock Server
block:
- name: Stop Minecraft Bedrock Server
docker_container:
community.docker.docker_container:
name: "{{ minecraft_bedrock_server_container_name }}"
state: absent
when: minecraft_bedrock_server_enabled is false
when: minecraft_bedrock_server_enabled is false
2 changes: 1 addition & 1 deletion roles/nomad/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- name: Restart Nomad
systemd:
ansible.builtin.systemd:
state: restarted
name: "{{ nomad_service_name }}"
listen: "restart nomad"
2 changes: 1 addition & 1 deletion roles/nomad/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- name: Stop Nomad
block:
- name: Check if Nomad is installed
stat:
ansible.builtin.stat:
path: /usr/bin/nomad
register: nomad_install

Expand Down
8 changes: 4 additions & 4 deletions roles/stats/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- import_tasks: prometheus.yml
- import_tasks: telegraf.yml
- import_tasks: exporters.yml
- import_tasks: grafana.yml
- ansible.builtin.import_tasks: prometheus.yml
- ansible.builtin.import_tasks: telegraf.yml
- ansible.builtin.import_tasks: exporters.yml
- ansible.builtin.import_tasks: grafana.yml
2 changes: 1 addition & 1 deletion tests/molecule/resources/playbooks/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
become: true
tasks:
- name: "Include {{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }} role"
include_role:
ansible.builtin.include_role:
name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"

0 comments on commit a015186

Please sign in to comment.