merge master into controller-job-status

.github/workflows/saltbox.yml

@@ -99,6 +99,12 @@ jobs:
       - name: Symlink cloned repository to /srv/git/saltbox
         run: sudo ln -s $GITHUB_WORKSPACE /srv/git/saltbox
 
+      - name: Install saltbox.fact
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/ansible_facts.d
+          curl -fsSL https://github.com/saltyorg/ansible-facts/releases/latest/download/saltbox-facts -o $GITHUB_WORKSPACE/ansible_facts.d/saltbox.fact
+          chmod +x $GITHUB_WORKSPACE/ansible_facts.d/saltbox.fact
+
       - name: Chown /srv/git
         run: sudo chown -R runner:runner /srv/git
 

.gitignore

@@ -6,6 +6,7 @@
 
 ### Ansible ###
 /backup.lock
+/ansible_facts.d/saltbox.fact
 
 # Vars
 /inventories/host_vars/*

defaults/accounts.yml.default

@@ -6,9 +6,6 @@ cloudflare:
 dockerhub:
   token:
   user:
-plex:
-  pass:
-  user:
 user:
   domain: testsaltbox.ml
   email: [email protected]

filter_plugins/plex_filters.py

@@ -0,0 +1,26 @@
+from ansible.errors import AnsibleFilterError
+import os
+import configparser
+
+class FilterModule(object):
+    def filters(self):
+        return {
+            'check_plex_ini': self.check_plex_ini
+        }
+
+    def check_plex_ini(self, file_path, plex_name):
+        if not os.path.exists(file_path):
+            return {'exists': False, 'identifier': '', 'token': ''}
+
+        config = configparser.ConfigParser()
+        config.read(file_path)
+
+        if plex_name not in config.sections():
+            return {'exists': True, 'identifier': '', 'token': ''}
+
+        section = config[plex_name]
+        return {
+            'exists': True,
+            'identifier': section.get('client_identifier', ''),
+            'token': section.get('token', '')
+        }

inventories/group_vars/all.yml

@@ -43,15 +43,9 @@ cloudflare_is_enabled: "{{ (cloudflare is defined) and
 
 cloudflare_records_enabled: "{{ cloudflare_is_enabled }}"
 
-plex_account_is_enabled: "{{ (plex is defined) and
-                             (plex is not none) and
-                             (plex | trim | length > 0) and
-                             (plex.user is defined) and
-                             (plex.user is not none) and
-                             (plex.user | trim | length > 0) and
-                             (plex.pass is defined) and
-                             (plex.pass is not none) and
-                             (plex.pass | trim | length > 0) }}"
+plex_account_lookup: "{{ '/opt/saltbox/plex.ini' | check_plex_ini(plex_instances[0]) }}"
+
+plex_account_is_enabled: "{{ plex_account_lookup.exists and plex_account_lookup.identifier | length > 0 and plex_account_lookup.token | length > 0 }}"
 
 ################################
 # Role Conditionals
@@ -119,45 +113,34 @@ downloads_custom_path: "{{ false
 # User
 ################################
 
-uid: "{{ ansible_local.user[user.name].uid }}"
-
-gid: "{{ ansible_local.user[user.name].gid }}"
-
-vgid: "{{ ansible_local.group.video.gid }}"
-
-rgid: "{{ ansible_local.group.render.gid }}"
-
-dockergid: "{{ ansible_local.group.docker.gid }}"
+uid: "{{ ansible_local.saltbox.users[user.name].uid }}"
+gid: "{{ ansible_local.saltbox.users[user.name].gid }}"
+vgid: "{{ ansible_local.saltbox.groups.video.gid }}"
+rgid: "{{ ansible_local.saltbox.groups.render.gid }}"
+dockergid: "{{ ansible_local.saltbox.groups.docker.gid }}"
 
 ################################
 # Timezone
 ################################
 
 tz: "{{ system.timezone
      if system is defined and system.timezone is defined and 'auto' not in system.timezone | lower
-     else ansible_local.timezone.timezone
-          if ansible_local is defined and ansible_local.timezone is defined and ansible_local.timezone.timezone is defined and ansible_local.timezone.timezone | trim | length > 0
+     else ansible_local.saltbox.timezone.timezone
+          if ansible_local is defined and ansible_local.saltbox.timezone is defined and ansible_local.saltbox.timezone.timezone is defined and ansible_local.saltbox.timezone.timezone | trim | length > 0
           else 'Etc/UTC' }}"
 
 ################################
 # Network
 ################################
 
 ip_address_host: "0.0.0.0"
-
 ip_address_localhost: "127.0.0.1"
-
-ip_address_public: "{{ ansible_local.network.ip.public_ip }}"
-
-ip_address_public_is_valid: "{{ false if ansible_local.network.ip.failed_ipv4 else true }}"
-
-ip_address_public_error: "{{ ansible_local.network.ip.error_ipv4 }}"
-
-ipv6_address_public: "{{ ansible_local.network.ip.public_ipv6 }}"
-
-ipv6_address_public_is_valid: "{{ false if ansible_local.network.ip.failed_ipv6 else true }}"
-
-ipv6_address_public_error: "{{ ansible_local.network.ip.error_ipv6 }}"
+ip_address_public: "{{ ansible_local.saltbox.ip.public_ip }}"
+ip_address_public_is_valid: "{{ false if ansible_local.saltbox.ip.failed_ipv4 else true }}"
+ip_address_public_error: "{{ ansible_local.saltbox.ip.error_ipv4 }}"
+ipv6_address_public: "{{ ansible_local.saltbox.ip.public_ipv6 }}"
+ipv6_address_public_is_valid: "{{ false if ansible_local.saltbox.ip.failed_ipv6 else true }}"
+ipv6_address_public_error: "{{ ansible_local.saltbox.ip.error_ipv6 }}"
 
 ################################
 # Theme