From a3f723885d0402960dc9ce08c72056c68ff7c548 Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Wed, 31 Dec 2025 19:11:58 -0500 Subject: [PATCH] Prefix base role variables --- dev/host_vars/bitwarden.yml | 4 ++-- dev/host_vars/docker.yml | 4 ++-- dev/host_vars/dockerbox.yml | 4 ++-- dev/host_vars/gitea.yml | 4 ++-- dev/host_vars/hypervisor.yml | 4 ++-- dev/host_vars/mediaserver.yml | 4 ++-- dev/host_vars/minecraft.yml | 4 ++-- dev/host_vars/nginx.yml | 4 ++-- dev/host_vars/podman.yml | 4 ++-- dev/host_vars/proxy.yml | 4 ++-- dev/host_vars/rsnapshot.yml | 4 ++-- dev/host_vars/unifi.yml | 4 ++-- dev/host_vars/wordpress.yml | 5 ++--- roles/base/defaults/main.yml | 12 ++++++------ roles/base/handlers/main.yml | 2 +- roles/base/tasks/main.yml | 4 ++-- roles/base/tasks/samba.yml | 2 +- roles/base/tasks/system.yml | 6 +++--- 18 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dev/host_vars/bitwarden.yml b/dev/host_vars/bitwarden.yml index 468b3ec..2fcdd98 100644 --- a/dev/host_vars/bitwarden.yml +++ b/dev/host_vars/bitwarden.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # docker docker_users: diff --git a/dev/host_vars/docker.yml b/dev/host_vars/docker.yml index dc2ff79..296c04a 100644 --- a/dev/host_vars/docker.yml +++ b/dev/host_vars/docker.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # Import my GPG key for git signature verification root_gpgkeys: diff --git a/dev/host_vars/dockerbox.yml b/dev/host_vars/dockerbox.yml index e09db03..371f9b8 100644 --- a/dev/host_vars/dockerbox.yml +++ b/dev/host_vars/dockerbox.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # Import my GPG key for git signature verification root_gpgkeys: diff --git a/dev/host_vars/gitea.yml b/dev/host_vars/gitea.yml index ef520f8..071ed52 100644 --- a/dev/host_vars/gitea.yml +++ b/dev/host_vars/gitea.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false users: git: diff --git a/dev/host_vars/hypervisor.yml b/dev/host_vars/hypervisor.yml index 5ecb3aa..b5e14a6 100644 --- a/dev/host_vars/hypervisor.yml +++ b/dev/host_vars/hypervisor.yml @@ -1,8 +1,8 @@ debian_version: 10.5.0 # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # libvirt libvirt_users: vagrant diff --git a/dev/host_vars/mediaserver.yml b/dev/host_vars/mediaserver.yml index f4b6910..b7f55e9 100644 --- a/dev/host_vars/mediaserver.yml +++ b/dev/host_vars/mediaserver.yml @@ -1,8 +1,8 @@ base_domain: local.krislamo.org # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false users: jellyfin: diff --git a/dev/host_vars/minecraft.yml b/dev/host_vars/minecraft.yml index c98119a..47079e8 100644 --- a/dev/host_vars/minecraft.yml +++ b/dev/host_vars/minecraft.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # minecraft # Agree to EULA to start service in Vagrant diff --git a/dev/host_vars/nginx.yml b/dev/host_vars/nginx.yml index 59d2ca1..c7431e0 100644 --- a/dev/host_vars/nginx.yml +++ b/dev/host_vars/nginx.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # docker docker_users: diff --git a/dev/host_vars/podman.yml b/dev/host_vars/podman.yml index c2e7101..d621f35 100644 --- a/dev/host_vars/podman.yml +++ b/dev/host_vars/podman.yml @@ -2,8 +2,8 @@ #### base #### ############## -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false root_gpgkeys: - id: 42A3A92C5DA0F3E5F71A3710105B748C1362EB96 diff --git a/dev/host_vars/proxy.yml b/dev/host_vars/proxy.yml index 2076075..ca5f3ef 100644 --- a/dev/host_vars/proxy.yml +++ b/dev/host_vars/proxy.yml @@ -1,8 +1,8 @@ base_domain: local.krislamo.org # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false users: git: diff --git a/dev/host_vars/rsnapshot.yml b/dev/host_vars/rsnapshot.yml index 89fc4a5..6195679 100644 --- a/dev/host_vars/rsnapshot.yml +++ b/dev/host_vars/rsnapshot.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false #mail: # host: smtp.gmail.com diff --git a/dev/host_vars/unifi.yml b/dev/host_vars/unifi.yml index d54be94..5ac6459 100644 --- a/dev/host_vars/unifi.yml +++ b/dev/host_vars/unifi.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # UniFi version unifi_version: 6.1.71 diff --git a/dev/host_vars/wordpress.yml b/dev/host_vars/wordpress.yml index 8772568..583a5c7 100644 --- a/dev/host_vars/wordpress.yml +++ b/dev/host_vars/wordpress.yml @@ -1,6 +1,6 @@ # base -allow_reboot: false -manage_network: false +base_allow_reboot: false +base_manage_network: false # docker docker_users: @@ -22,7 +22,6 @@ wordpress_multisite: true # database settings wordpress_dbversion: latest wordpress_dbpass: password - # multisite (enable in admin panel then uncomment) #wordpress_rule: "Host(`{{ wordpress_domain }}`) || # Host(`site1.{{ wordpress_domain }}`) || diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml index 8fd4085..65d5970 100644 --- a/roles/base/defaults/main.yml +++ b/roles/base/defaults/main.yml @@ -1,10 +1,10 @@ -allow_reboot: true -manage_firewall: true -manage_network: false -network_type: static -locale_default: en_US.UTF-8 +base_allow_reboot: true +base_manage_firewall: true +base_manage_network: false +base_network_type: static +base_locale_default: en_US.UTF-8 -packages: +base_packages: - apache2-utils - cryptsetup - curl diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml index ebc970a..be244ee 100644 --- a/roles/base/handlers/main.yml +++ b/roles/base/handlers/main.yml @@ -3,7 +3,7 @@ msg: "Reboot initiated by Ansible" connect_timeout: 5 listen: reboot_host - when: allow_reboot + when: base_allow_reboot - name: Reconfigure locales ansible.builtin.command: dpkg-reconfigure -f noninteractive locales diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index b8cf6a2..e2af720 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -9,12 +9,12 @@ - name: Import Firewall tasks ansible.builtin.import_tasks: firewall.yml tags: firewall - when: manage_firewall + when: base_manage_firewall - name: Import Network tasks ansible.builtin.import_tasks: network.yml tags: network - when: manage_network + when: base_manage_network - name: Import Mail tasks ansible.builtin.import_tasks: mail.yml diff --git a/roles/base/tasks/samba.yml b/roles/base/tasks/samba.yml index 66e5f45..95f90a7 100644 --- a/roles/base/tasks/samba.yml +++ b/roles/base/tasks/samba.yml @@ -43,4 +43,4 @@ from: "{{ item }}" state: enabled loop: "{{ samba.firewall }}" - when: manage_firewall + when: base_manage_firewall diff --git a/roles/base/tasks/system.yml b/roles/base/tasks/system.yml index da8bf1d..424c6bd 100644 --- a/roles/base/tasks/system.yml +++ b/roles/base/tasks/system.yml @@ -1,6 +1,6 @@ - name: Install useful software ansible.builtin.apt: - name: "{{ packages }}" + name: "{{ base_packages }}" state: present update_cache: true @@ -127,7 +127,7 @@ - name: Generate locale community.general.locale_gen: - name: "{{ locale_default }}" + name: "{{ base_locale_default }}" state: present notify: reconfigure_locales @@ -135,7 +135,7 @@ ansible.builtin.lineinfile: path: /etc/default/locale regexp: "^LANG=" - line: "LANG={{ locale_default }}" + line: "LANG={{ base_locale_default }}" - name: Manage root authorized_keys ansible.builtin.template: