testing

dev/host_vars/bitwarden.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # docker
 docker_users:

dev/host_vars/docker.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # Import my GPG key for git signature verification
 root_gpgkeys:

dev/host_vars/dockerbox.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # Import my GPG key for git signature verification
 root_gpgkeys:

dev/host_vars/gitea.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 users:
   git:

dev/host_vars/hypervisor.yml

@@ -1,8 +1,8 @@
 debian_version: 10.5.0
 
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # libvirt
 libvirt_users: vagrant

dev/host_vars/mediaserver.yml

@@ -1,8 +1,8 @@
 base_domain: local.krislamo.org
 
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 users:
   jellyfin:

dev/host_vars/minecraft.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # minecraft
 # Agree to EULA to start service in Vagrant

dev/host_vars/nginx.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # docker
 docker_users:

dev/host_vars/podman.yml

@@ -2,22 +2,20 @@
 #### base ####
 ##############
 
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 root_gpgkeys:
   - id: 42A3A92C5DA0F3E5F71A3710105B748C1362EB96
 
 scripts:
-  trusted_keys:
-    - id: 42A3A92C5DA0F3E5F71A3710105B748C1362EB96
-  repos:
-    - name: dotfiles
-      url: https://github.com/krislamo/dotfiles
-      version: 999d745710b9db500e82d1a0d0107ac5d623a669
-      scripts:
-        - src: gotify/.local/bin/gotify
-          dest: /usr/local/bin/gotify
+  - name: gotify
+    url: https://github.com/krislamo/dotfiles
+    version: 999d745710b9db500e82d1a0d0107ac5d623a669
+    path: gotify/.local/bin/gotify
+    dest: /usr/local/bin/gotify
+    trusted_keys:
+      - 42A3A92C5DA0F3E5F71A3710105B748C1362EB96
 
 ################
 #### proxy #####

dev/host_vars/proxy.yml

@@ -1,8 +1,8 @@
 base_domain: local.krislamo.org
 
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 users:
   git:

dev/host_vars/rsnapshot.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 #mail:
 #  host: smtp.gmail.com

dev/host_vars/unifi.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # UniFi version
 unifi_version: 6.1.71

dev/host_vars/wordpress.yml

@@ -1,6 +1,6 @@
 # base
-base_allow_reboot: false
-base_manage_network: false
+allow_reboot: false
+manage_network: false
 
 # docker
 docker_users:
@@ -22,6 +22,7 @@ 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 }}`) ||

roles/base/defaults/main.yml

@@ -1,10 +1,10 @@
-base_allow_reboot: true
-base_manage_firewall: true
-base_manage_network: false
-base_network_type: static
-base_locale_default: en_US.UTF-8
+allow_reboot: true
+manage_firewall: true
+manage_network: false
+network_type: static
+locale_default: en_US.UTF-8
 
-base_packages:
+packages:
   - apache2-utils
   - cryptsetup
   - curl
@@ -20,6 +20,3 @@ base_packages:
   - tree
   - vim
   - wget
-
-
-base_scripts: /srv/.scripts

roles/base/handlers/main.yml

@@ -3,7 +3,7 @@
     msg: "Reboot initiated by Ansible"
     connect_timeout: 5
   listen: reboot_host
-  when: base_allow_reboot
+  when: allow_reboot
 
 - name: Reconfigure locales
   ansible.builtin.command: dpkg-reconfigure -f noninteractive locales

roles/base/tasks/main.yml

@@ -9,12 +9,12 @@
 - name: Import Firewall tasks
   ansible.builtin.import_tasks: firewall.yml
   tags: firewall
-  when: base_manage_firewall
+  when: manage_firewall
 
 - name: Import Network tasks
   ansible.builtin.import_tasks: network.yml
   tags: network
-  when: base_manage_network
+  when: manage_network
 
 - name: Import Mail tasks
   ansible.builtin.import_tasks: mail.yml

roles/base/tasks/samba.yml

@@ -43,4 +43,4 @@
     from: "{{ item }}"
     state: enabled
   loop: "{{ samba.firewall }}"
-  when: base_manage_firewall
+  when: manage_firewall

roles/base/tasks/system.yml

@@ -1,6 +1,6 @@
 - name: Install useful software
   ansible.builtin.apt:
-    name: "{{ base_packages }}"
+    name: "{{ packages }}"
     state: present
     update_cache: true
 
@@ -10,8 +10,7 @@
     state: present
 
 - name: Check for existing GPG keys
-  ansible.builtin.command: >-
-    gpg --list-keys {{ item.id }} 2>/dev/null
+  ansible.builtin.command: "gpg --list-keys {{ item.id }} 2>/dev/null"
   register: gpg_check
   loop: "{{ root_gpgkeys }}"
   failed_when: false
@@ -20,8 +19,9 @@
 
 - name: Import GPG keys
   ansible.builtin.command: >-
-    gpg --keyserver {{ item.item.server | default('keys.openpgp.org') }}
-      --recv-key {{ item.item.id }}
+    gpg
+    --keyserver {{ item.item.server | default('keys.openpgp.org') }}
+    --recv-key {{ item.item.id }}
   register: gpg_check_import
   loop: "{{ gpg_check.results }}"
   loop_control:
@@ -40,21 +40,19 @@
     - not item.skipped | default(false)
     - "'imported' not in item.stderr"
 
-- name: Create scripts directories
+- name: Create /opt/scripts directories
   ansible.builtin.file:
     path: "{{ item }}"
     state: directory
-    mode: "700"
-    owner: root
-    group: root
+    mode: "755"
   loop:
-    - "{{ base_scripts }}"
-    - "{{ base_scripts }}/.keys"
+    - /opt/scripts
+    - /opt/scripts/.keys
   when: scripts is defined
 
 - name: Generate OpenSSH deploy keys for script clones
   community.crypto.openssh_keypair:
-    path: "{{ base_scripts }}/.keys/id_ed25519"
+    path: /opt/scripts/.keys/id_ed25519
     type: ed25519
     comment: "{{ ansible_hostname }}-deploy-key"
     mode: "400"
@@ -70,20 +68,13 @@
 - name: Clone external scripts projects
   ansible.builtin.git:
     repo: "{{ item.url }}"
-    dest: "{{ base_scripts }}/{{ item.name }}"
+    dest: "/opt/scripts/{{ item.name }}"
     version: "{{ item.version }}"
     accept_newhostkey: "{{ item.accept_newhostkey | default(false) }}"
-    gpg_allowlist: >-
-      {{ (item.trusted_keys | default(scripts.trusted_keys) | default([]))
-        | map(attribute='id')
-        | list }}
-    verify_commit: >-
-      {{ true if
-        ((item.trusted_keys | default(scripts.trusted_keys)) is defined
-        and (item.trusted_keys | default(scripts.trusted_keys)))
-        else false }}
-    key_file: "{{ base_scripts }}/.keys/id_ed25519"
-  loop: "{{ scripts.repos }}"
+    gpg_allowlist: "{{ item.trusted_keys | default([]) }}"
+    verify_commit: "{{ true if (item.trusted_keys is defined and item.trusted_keys) else false }}"
+    key_file: /opt/scripts/.keys/id_ed25519
+  loop: "{{ scripts }}"
   loop_control:
     label: "{{ item.url }}"
   when: scripts is defined
@@ -91,30 +82,15 @@
 
 - name: Synchronize scripts
   ansible.posix.synchronize:
-    src: "{{ base_scripts }}/{{ item.0.name }}/{{ item.1.src }}"
-    dest: "{{ item.1.dest }}"
+    src: "/opt/scripts/{{ item.name }}/{{ item.path }}"
+    dest: "{{ item.dest }}"
   delegate_to: "{{ inventory_hostname }}"
-  loop: "{{ scripts.repos | default([]) | subelements('scripts') }}"
+  loop: "{{ scripts | default([]) }}"
   loop_control:
-    label: "{{ item.0.name }}: {{ item.1.src }}"
+    label: "{{ item.name }}"
   when: scripts is defined and scripts | length > 0
   tags: scripts
 
-- name: Deploy cron jobs
-  ansible.builtin.cron:
-    name: "{{ item.name }}"
-    job: "{{ item.job }}"
-    user: "{{ item.user | default('root') }}"
-    minute: "{{ item.minute | default('*') }}"
-    hour: "{{ item.hour | default('*') }}"
-    day: "{{ item.day | default('*') }}"
-    month: "{{ item.month | default('*') }}"
-    weekday: "{{ item.weekday | default('*') }}"
-    state: "{{ item.state | default('present') }}"
-    disabled: "{{ item.disabled | default(false) }}"
-  loop: "{{ cron }}"
-  when: cron is defined and cron | length > 0
-
 - name: Install NTPsec
   ansible.builtin.apt:
     name: ntpsec
@@ -127,7 +103,7 @@
 
 - name: Generate locale
   community.general.locale_gen:
-    name: "{{ base_locale_default }}"
+    name: "{{ locale_default }}"
     state: present
   notify: reconfigure_locales
 
@@ -135,7 +111,7 @@
   ansible.builtin.lineinfile:
     path: /etc/default/locale
     regexp: "^LANG="
-    line: "LANG={{ base_locale_default }}"
+    line: "LANG={{ locale_default }}"
 
 - name: Manage root authorized_keys
   ansible.builtin.template:
@@ -143,7 +119,6 @@
     dest: /root/.ssh/authorized_keys
     mode: "400"
   when: authorized_keys is defined
-  tags: users
 
 - name: Create system user groups
   ansible.builtin.group:
@@ -154,7 +129,6 @@
   loop_control:
     label: "{{ item.key }}"
   when: users is defined
-  tags: users
 
 - name: Create system users
   ansible.builtin.user:
@@ -171,12 +145,10 @@
   loop_control:
     label: "{{ item.key }}"
   when: users is defined
-  tags: users
 
 - name: Create Ansible's temporary remote directory for users
   ansible.builtin.file:
-    path: >-
-      {{ item.value.homedir | default('/home/' + item.key) }}/.ansible/tmp
+    path: "{{ item.value.homedir | default('/home/' + item.key) }}/.ansible/tmp"
     state: directory
     mode: "700"
     owner: "{{ item.key }}"
@@ -187,7 +159,6 @@
   when:
     - users is defined
     - item.value.tmp | default(true)
-  tags: users
 
 - name: Set authorized_keys for system users
   ansible.posix.authorized_key:
@@ -198,7 +169,6 @@
   loop_control:
     label: "{{ item.key }}"
   when: users is defined and item.value.key is defined
-  tags: users
 
 - name: Manage filesystem mounts
   ansible.posix.mount: