Branch Comparison Report

+ #!/usr/bin/env python3+ """+ Saltbox Role Defaults Linter+ Enforces Saltbox formatting rules for role defaults/main.yml files+ + Rules:+ 1. Operator Alignment: | and + operators must align with first character after "{{+    - Standard: All operators align with base position (first char after "{{ )+    - Exception: When 'else' is followed by content on a new line that continues,+      subsequent operators within that else branch align with content after 'else '+    - Context resets when if/else blocks close (marked by )) or )))+ + 2. If/Else Alignment: if and else keywords must align vertically within {{ }} brackets+ """+ + import re+ import sys+ from pathlib import Path+ from typing import List+ + + class LintError:+     """Represents a single linting error"""+ +     def __init__(self, file: str, line: int, message: str):+         self.file = file+         self.line = line+         self.message = message+ +     def to_github_annotation(self) -> str:+         """Format error as GitHub Actions annotation"""+         return f"::error file={self.file},line={self.line}::{self.message}"+ +     def __str__(self) -> str:+         return f"{self.file}:{self.line} - {self.message}"+ + + class DefaultsLinter:+     """Lints a single defaults/main.yml file"""+ +     def __init__(self, file_path: Path):+         self.file_path = file_path+         self.lines = file_path.read_text().splitlines()+         self.errors: List[LintError] = []+ +     def check_operator_alignment(self):+         """+         Rule 1: Check | and + operators align with first character after '{{ '+ +         Standard alignment - all operators at base position:+             sonarr_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='sonarr')+                                          | combine(lookup('role_var', '_docker_envs_custom', role='sonarr')) }}"+                                          ^ Aligns with 'l' in lookup (position after "{{ )+ +         Multiple operators - all at same base position:+             wikijs_role_docker_networks: "{{ docker_networks_common+                                              + lookup('role_var', '_docker_networks_default', role='wikijs')+                                              + lookup('role_var', '_docker_networks_custom', role='wikijs') }}"+                                              ^ All + align with 'd' in docker_networks_common+ +         Exception - else with continuing content creates new context:+             dozzle_role_docker_commands: "{{ lookup('role_var', '_docker_commands_agent', role='dozzle')+                                              + lookup('role_var', '_docker_commands_default', role='dozzle')+                                           if lookup('role_var', '_agent_mode', role='dozzle')+                                           else lookup('role_var', '_docker_commands_default', role='dozzle')+                                                + lookup('role_var', '_docker_commands_custom', role='dozzle') }}"+                                                ^ This + aligns with 'l' in lookup after 'else ', not with base+ +         Inline if/else (no context change):+             traefik_role_docker_labels: "{{ docker_labels_saltbox+                                             | combine((lookup('role_var', '_docker_labels_http', role='traefik')+                                                       if traefik_http+                                                       else lookup('role_var', '_docker_labels_dns', role='traefik')))+                                             | combine(lookup('role_var', '_docker_labels_custom', role='traefik')) }}"+                                             ^ All | remain at base position - inline if/else doesn't change context+         """+         i = 0+         while i < len(self.lines):+             curr_line = self.lines[i]+ +             # Match variable definitions starting multi-line Jinja expressions+             # Pattern: variable_name: "{{ <content>+             match = re.match(r'^([a-z_]+): "{{ (.+)', curr_line)+ +             # Only process if:+             # 1. Line matches pattern+             # 2. Line doesn't end with }} (multi-line expression)+             if match and '}}' not in curr_line:+                 var_name = match.group(1)+ +                 # This is the start of a multi-line expression+                 # Track the expected alignment position for continuation lines+                 expected_alignment = len(curr_line.split('"{{')[0] + '"{{ ')+ +                 # Now check all continuation lines until we hit }}+                 j = i + 1+                 # Track alignment context - changes when we encounter 'else' with content+                 # and resets when if/else blocks close+                 current_alignment = expected_alignment+                 in_else_context = False+ +                 while j < len(self.lines):+                     continuation_line = self.lines[j]+ +                     # Check if this line closes an if/else block (ends with )) or }))+                     # This resets alignment context back to base+                     if in_else_context and re.search(r'\)\)(?:\)|$)', continuation_line.rstrip()):+                         current_alignment = expected_alignment+                         in_else_context = False+ +                     # Check if this line starts with 'else' followed by content that continues+                     # This creates a new alignment context for subsequent operators+                     # Pattern: else followed by lookup/variable (not just closing like '])')+                     # BUT: only if the else block doesn't close on the same line+                     else_match = re.match(r'^(\s+)else (lookup|[a-z_]+)', continuation_line)+                     if else_match:+                         # Check if this line also closes the if/else block (contains )))+                         # If so, don't set a persistent context+                         closes_immediately = re.search(r'\)\)\)', continuation_line)+ +                         if not closes_immediately:+                             # New alignment context: content after 'else '+                             # Only persists if the line doesn't close the block+                             current_alignment = len(else_match.group(1)) + len('else ')+                             in_else_context = True+ +                     # Check if this line has an operator+                     op_match = re.match(r'^(\s+)([|+]) ', continuation_line)+ +                     if op_match:+                         actual_spaces = len(op_match.group(1))+                         operator = op_match.group(2)+ +                         # Use current alignment context (changes after 'else', resets after closing parens)+                         expected_spaces = current_alignment+ +                         if actual_spaces != expected_spaces:+                             diff = actual_spaces - expected_spaces+ +                             self.errors.append(LintError(+                                 file=str(self.file_path),+                                 line=j + 1,  # Convert to 1-indexed+                                 message=f"[operator-alignment] Variable '{var_name}': Operator '{operator}' at column {actual_spaces}, expected {expected_spaces} (off by {diff:+d})"+                             ))+ +                     # Stop if we've reached the end of the Jinja block+                     if '}}' in continuation_line:+                         break+ +                     j += 1+ +                 # Skip ahead past the multi-line block we just processed+                 i = j+ +             i += 1+ +     def check_ifelse_alignment(self):+         """+         Rule 2: Check if/else keywords align within same {{ }} brackets+ +         Example:+             variable: "{{ value+                        if condition+                        else other_value }}"+                        ^ if and else must align vertically+         """+         in_multiline_jinja = False+         jinja_lines = []+         jinja_start_line = 0+ +         for i, line in enumerate(self.lines, 1):+             # Detect start of multi-line Jinja expression+             if '"{{' in line and '}}' not in line:+                 in_multiline_jinja = True+                 jinja_lines = [line]+                 jinja_start_line = i+ +             elif in_multiline_jinja:+                 jinja_lines.append(line)+ +                 # Check if we've reached the end of the Jinja block+                 if '}}' in line:+                     # Find lines containing 'if' and 'else'+                     if_lines = [l for l in jinja_lines if ' if ' in l or l.strip().startswith('if ')]+                     else_lines = [l for l in jinja_lines if ' else ' in l or l.strip().startswith('else ')]+ +                     # Only check if both if and else exist in the same block+                     if if_lines and else_lines:+                         # Find indentation of 'if' and 'else' keywords+                         if_indent = None+                         else_indent = None+ +                         for l in jinja_lines:+                             if ' if ' in l:+                                 # Calculate column position where 'if' appears+                                 if_indent = len(l) - len(l.lstrip())+                             if ' else ' in l or l.strip().startswith('else '):+                                 else_indent = len(l) - len(l.lstrip())+ +                         # Check if if and else align+                         if if_indent is not None and else_indent is not None:+                             if if_indent != else_indent:+                                 diff = else_indent - if_indent+                                 self.errors.append(LintError(+                                     file=str(self.file_path),+                                     line=jinja_start_line,+                                     message=f"[ifelse-alignment] 'if' at column {if_indent} doesn't align with 'else' at column {else_indent} (off by {diff:+d})"+                                 ))+ +                     # Reset state+                     in_multiline_jinja = False+                     jinja_lines = []+ +     def lint(self) -> List[LintError]:+         """Run all lint checks and return list of errors"""+         self.check_operator_alignment()+         self.check_ifelse_alignment()+         return self.errors+ + + def main():+     """Main entry point for the linter"""+     if len(sys.argv) < 2:+         print("Usage: python3 saltbox-defaults-linter.py <roles_directory>")+         print("\nExample:")+         print("  python3 saltbox-defaults-linter.py roles/")+         sys.exit(1)+ +     roles_dir = Path(sys.argv[1])+ +     if not roles_dir.exists():+         print(f"Error: Directory '{roles_dir}' does not exist")+         sys.exit(1)+ +     if not roles_dir.is_dir():+         print(f"Error: '{roles_dir}' is not a directory")+         sys.exit(1)+ +     all_errors = []+     files_checked = 0+ +     # Find and lint all defaults/main.yml files+     for defaults_file in sorted(roles_dir.glob("*/defaults/main.yml")):+         linter = DefaultsLinter(defaults_file)+         errors = linter.lint()+         all_errors.extend(errors)+         files_checked += 1+ +     # Output results+     if all_errors:+         print(f"❌ Found {len(all_errors)} formatting error(s) in {files_checked} file(s):\n")+         for error in all_errors:+             print(error.to_github_annotation())+         print(f"\nTotal: {len(all_errors)} error(s)")+         sys.exit(1)+     else:+         print(f"✅ All {files_checked} role defaults files pass formatting checks")+         sys.exit(0)+ + + if __name__ == "__main__":+     main()

- ##########################################################################- # Title:         Sandbox: alternatrr | Default Variables                 #- # Author(s):     salty                                                   #- # URL:           https://github.com/saltyorg/Sandbox                     #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - alternatrr_instances: ["alternatrr"]- - ################################- # Settings- ################################- - alternatrr_sonarr_instance: "{{ sonarr_name }}"- - ################################- # Paths- ################################- - alternatrr_paths_folder: "{{ alternatrr_name }}"- alternatrr_paths_location: "{{ server_appdata_path }}/{{ alternatrr_paths_folder }}"- alternatrr_paths_folders_list:-   - "{{ alternatrr_paths_location }}"-   - "{{ alternatrr_paths_location }}/app"- - ################################- # Web- ################################- - alternatrr_web_subdomain: "{{ alternatrr_name }}"- alternatrr_web_domain: "{{ user.domain }}"- alternatrr_web_port: "80"- alternatrr_web_url: "{{ 'https://' + (lookup('vars', alternatrr_name + '_web_subdomain', default=alternatrr_web_subdomain) + '.' + lookup('vars', alternatrr_name + '_web_domain', default=alternatrr_web_domain)-                      if (lookup('vars', alternatrr_name + '_web_subdomain', default=alternatrr_web_subdomain) | length > 0)-                      else lookup('vars', alternatrr_name + '_web_domain', default=alternatrr_web_domain)) }}"- - ################################- # DNS- ################################- - alternatrr_dns_record: "{{ lookup('vars', alternatrr_name + '_web_subdomain', default=alternatrr_web_subdomain) }}"- alternatrr_dns_zone: "{{ lookup('vars', alternatrr_name + '_web_domain', default=alternatrr_web_domain) }}"- alternatrr_dns_proxy: "{{ dns.proxied }}"- - ################################- # Traefik- ################################- - alternatrr_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"- alternatrr_traefik_middleware_default: "{{ traefik_default_middleware }}"- alternatrr_traefik_middleware_custom: ""- alternatrr_traefik_certresolver: "{{ traefik_default_certresolver }}"- alternatrr_traefik_enabled: true- - ################################- # Docker- ################################- - # Container- alternatrr_docker_container: "{{ alternatrr_name }}"- - # Image- alternatrr_docker_image_pull: true- alternatrr_docker_image_repo: "theultimatecoder/alternatrr"- alternatrr_docker_image_tag: "latest"- alternatrr_docker_image: "{{ lookup('vars', alternatrr_name + '_docker_image_repo', default=alternatrr_docker_image_repo)-                              + ':' + lookup('vars', alternatrr_name + '_docker_image_tag', default=alternatrr_docker_image_tag) }}"- - # Ports- alternatrr_docker_ports_defaults: []- alternatrr_docker_ports_custom: []- alternatrr_docker_ports: "{{ lookup('vars', alternatrr_name + '_docker_ports_defaults', default=alternatrr_docker_ports_defaults)-                              + lookup('vars', alternatrr_name + '_docker_ports_custom', default=alternatrr_docker_ports_custom) }}"- - # Envs- alternatrr_docker_envs_default:-   ConnectionStrings__DefaultConnection: Data Source=/opt/alternatrr/app/alternatrr.db-   ConnectionStrings__sonarr: Data Source=/opt/sonarr/sonarr.db-   Login__Username: "{{ user.name }}"-   Login__Password: "{{ user.pass }}"- alternatrr_docker_envs_custom: {}- alternatrr_docker_envs: "{{ lookup('vars', alternatrr_name + '_docker_envs_default', default=alternatrr_docker_envs_default)-                             | combine(lookup('vars', alternatrr_name + '_docker_envs_custom', default=alternatrr_docker_envs_custom)) }}"- - # Commands- alternatrr_docker_commands_default: []- alternatrr_docker_commands_custom: []- alternatrr_docker_commands: "{{ lookup('vars', alternatrr_name + '_docker_commands_default', default=alternatrr_docker_commands_default)-                                 + lookup('vars', alternatrr_name + '_docker_commands_custom', default=alternatrr_docker_commands_custom) }}"- - # Volumes- alternatrr_docker_volumes_default:-   - "{{ alternatrr_paths_location }}/app:/opt/alternatrr/app"-   - "{{ server_appdata_path + lookup('vars', alternatrr_name + '_sonarr_instance', default=alternatrr_sonarr_instance) }}:/opt/sonarr"- alternatrr_docker_volumes_custom: []- alternatrr_docker_volumes: "{{ lookup('vars', alternatrr_name + '_docker_volumes_default', default=alternatrr_docker_volumes_default)-                                + lookup('vars', alternatrr_name + '_docker_volumes_custom', default=alternatrr_docker_volumes_custom) }}"- - # Devices- alternatrr_docker_devices_default: []- alternatrr_docker_devices_custom: []- alternatrr_docker_devices: "{{ lookup('vars', alternatrr_name + '_docker_devices_default', default=alternatrr_docker_devices_default)-                                + lookup('vars', alternatrr_name + '_docker_devices_custom', default=alternatrr_docker_devices_custom) }}"- - # Hosts- alternatrr_docker_hosts_default: {}- alternatrr_docker_hosts_custom: {}- alternatrr_docker_hosts: "{{ docker_hosts_common-                              | combine(lookup('vars', alternatrr_name + '_docker_hosts_default', default=alternatrr_docker_hosts_default))-                              | combine(lookup('vars', alternatrr_name + '_docker_hosts_custom', default=alternatrr_docker_hosts_custom)) }}"- - # Labels- alternatrr_docker_labels_default: {}- alternatrr_docker_labels_custom: {}- alternatrr_docker_labels: "{{ docker_labels_common-                               | combine(lookup('vars', alternatrr_name + '_docker_labels_default', default=alternatrr_docker_labels_default))-                               | combine(lookup('vars', alternatrr_name + '_docker_labels_custom', default=alternatrr_docker_labels_custom)) }}"- - # Hostname- alternatrr_docker_hostname: "{{ alternatrr_name }}"- - # Network Mode- alternatrr_docker_network_mode_default: "{{ docker_networks_name_common }}"- alternatrr_docker_network_mode: "{{ lookup('vars', alternatrr_name + '_docker_network_mode_default', default=alternatrr_docker_network_mode_default) }}"- - # Networks- alternatrr_docker_networks_alias: "{{ alternatrr_name }}"- alternatrr_docker_networks_default: []- alternatrr_docker_networks_custom: []- alternatrr_docker_networks: "{{ docker_networks_common-                                 + lookup('vars', alternatrr_name + '_docker_networks_default', default=alternatrr_docker_networks_default)-                                 + lookup('vars', alternatrr_name + '_docker_networks_custom', default=alternatrr_docker_networks_custom) }}"- - # Capabilities- alternatrr_docker_capabilities_default: []- alternatrr_docker_capabilities_custom: []- alternatrr_docker_capabilities: "{{ lookup('vars', alternatrr_name + '_docker_capabilities_default', default=alternatrr_docker_capabilities_default)-                                     + lookup('vars', alternatrr_name + '_docker_capabilities_custom', default=alternatrr_docker_capabilities_custom) }}"- - # Security Opts- alternatrr_docker_security_opts_default: []- alternatrr_docker_security_opts_custom: []- alternatrr_docker_security_opts: "{{ lookup('vars', alternatrr_name + '_docker_security_opts_default', default=alternatrr_docker_security_opts_default)-                                      + lookup('vars', alternatrr_name + '_docker_security_opts_custom', default=alternatrr_docker_security_opts_custom) }}"- - # Restart Policy- alternatrr_docker_restart_policy: unless-stopped- - # State- alternatrr_docker_state: started

- #########################################################################- # Title:            Sandbox: alternatrr                                 #- # Author(s):        TheUltimateC0der, salty                             #- # URL:              https://github.com/saltyorg/Sandbox                 #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Execute Alternatrr roles"-   ansible.builtin.include_tasks: main2.yml-   vars:-     alternatrr_name: "{{ instance }}"-   with_items: "{{ alternatrr_instances }}"-   loop_control:-     loop_var: instance

- #########################################################################- # Title:            Sandbox: alternatrr                                 #- # Author(s):        TheUltimateC0der, salty                             #- # URL:              https://github.com/saltyorg/Sandbox                 #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Set Default Sonarr instance-   ansible.builtin.set_fact:-     sonarr_name: "{{ sonarr_instances[0] }}"-   when: not sonarr_name is defined- - - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"

- ##########################################################################- # Title:            Sandbox: Aria2 + AriaNG webui | Default Variables    #- # Author(s):        JigSawFr                                             #- # URL:              https://github.com/saltyorg/Sandbox                  #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - aria2_ng_name: aria- - ################################- # Paths- ################################- - aria2_ng_paths_folder: "{{ aria2_ng_name }}"- aria2_ng_paths_location: "{{ server_appdata_path }}/{{ aria2_ng_paths_folder }}"- aria2_ng_paths_downloads_location: "{{ downloads_root_path }}/{{ aria2_ng_paths_folder }}"- aria2_ng_paths_folders_list:-   - "{{ aria2_ng_paths_location }}"-   - "{{ aria2_ng_paths_downloads_location }}"- - ################################- # Web- ################################- - aria2_ng_web_subdomain: "{{ aria2_ng_name }}"- aria2_ng_web_domain: "{{ user.domain }}"- aria2_ng_web_port: "8080"- aria2_ng_web_url: "{{ 'https://' + (aria2_ng_web_subdomain + '.' + aria2_ng_web_domain-                    if (aria2_ng_web_subdomain | length > 0)-                    else aria2_ng_web_domain) }}"- - ################################- # DNS- ################################- - aria2_ng_dns_record: "{{ aria2_ng_web_subdomain }}"- aria2_ng_dns_zone: "{{ aria2_ng_web_domain }}"- aria2_ng_dns_proxy: "{{ dns.proxied }}"- - ################################- # Traefik- ################################- - aria2_ng_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"- aria2_ng_traefik_middleware_default: "{{ traefik_default_middleware }}"- aria2_ng_traefik_middleware_custom: ""- aria2_ng_traefik_certresolver: "{{ traefik_default_certresolver }}"- aria2_ng_traefik_enabled: true- # Insecure until we have a way to generate an app token- aria2_ng_traefik_api_enabled: false- aria2_ng_traefik_api_endpoint: "PathPrefix(`/jsonrpc`)"- - ################################- # Docker- ################################- - # Container- aria2_ng_docker_container: "{{ aria2_ng_name }}"- - # Image- aria2_ng_docker_image_pull: true- aria2_ng_docker_image_tag: "latest"- aria2_ng_docker_image: "hurlenko/aria2-ariang:{{ aria2_ng_docker_image_tag }}"- - # Ports- aria2_ng_docker_ports_defaults: []- aria2_ng_docker_ports_custom: []- aria2_ng_docker_ports: "{{ aria2_ng_docker_ports_defaults-                            + aria2_ng_docker_ports_custom }}"- - # Envs- aria2_ng_docker_envs_default:-   TZ: "{{ tz }}"-   PUID: "{{ uid }}"-   PGID: "{{ gid }}"-   # RPC_SECRET: "{{ aria2_ng_secret_key.stdout }}"-   # EMBED_RPC_SECRET: "true"-   ARIA2RPCPORT: "443"- aria2_ng_docker_envs_custom: {}- aria2_ng_docker_envs: "{{ aria2_ng_docker_envs_default-                           | combine(aria2_ng_docker_envs_custom) }}"- - # Commands- aria2_ng_docker_commands_default: []- aria2_ng_docker_commands_custom: []- aria2_ng_docker_commands: "{{ aria2_ng_docker_commands_default-                               + aria2_ng_docker_commands_custom }}"- - # Volumes- aria2_ng_docker_volumes_default:-   - "{{ aria2_ng_paths_location }}:/aria2/conf"-   - "{{ aria2_ng_paths_downloads_location }}:/aria2/data"- aria2_ng_docker_volumes_custom: []- aria2_ng_docker_volumes: "{{ aria2_ng_docker_volumes_default-                              + aria2_ng_docker_volumes_custom }}"- - # Devices- aria2_ng_docker_devices_default: []- aria2_ng_docker_devices_custom: []- aria2_ng_docker_devices: "{{ aria2_ng_docker_devices_default-                              + aria2_ng_docker_devices_custom }}"- - # Hosts- aria2_ng_docker_hosts_default: {}- aria2_ng_docker_hosts_custom: {}- aria2_ng_docker_hosts: "{{ docker_hosts_common-                            | combine(aria2_ng_docker_hosts_default)-                            | combine(aria2_ng_docker_hosts_custom) }}"- - # Labels- aria2_ng_docker_labels_default: {}- aria2_ng_docker_labels_custom: {}- aria2_ng_docker_labels: "{{ docker_labels_common-                             | combine(aria2_ng_docker_labels_default)-                             | combine(aria2_ng_docker_labels_custom) }}"- - # Hostname- aria2_ng_docker_hostname: "{{ aria2_ng_name }}"- - # Networks- aria2_ng_docker_networks_alias: "{{ aria2_ng_name }}"- aria2_ng_docker_networks_default: []- aria2_ng_docker_networks_custom: []- aria2_ng_docker_networks: "{{ docker_networks_common-                               + aria2_ng_docker_networks_default-                               + aria2_ng_docker_networks_custom }}"- - # Capabilities- aria2_ng_docker_capabilities_default: []- aria2_ng_docker_capabilities_custom: []- aria2_ng_docker_capabilities: "{{ aria2_ng_docker_capabilities_default-                                   + aria2_ng_docker_capabilities_custom }}"- - # Security Opts- aria2_ng_docker_security_opts_default: []- aria2_ng_docker_security_opts_custom: []- aria2_ng_docker_security_opts: "{{ aria2_ng_docker_security_opts_default-                                    + aria2_ng_docker_security_opts_custom }}"- - # Restart Policy- aria2_ng_docker_restart_policy: unless-stopped- - # State- aria2_ng_docker_state: started

- #########################################################################- # Title:            Sandbox: Aria2 + AriaNG webui                       #- # Author(s):        JigSawFr                                            #- # URL:              https://github.com/saltyorg/Sandbox                 #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- # Repository: https://github.com/hurlenko/aria2-ariang-docker- ---- - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - # - name: "Generate Secret Key for RPC"- #   ansible.builtin.shell: "openssl rand -hex 20"- #   register: aria2_ng_secret_key- - - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"- - - name: Print Tweaking Info-   ansible.builtin.debug:-     msg: "For custom docker envs, please visit: https://github.com/hurlenko/aria2-ariang-docker"

- #########################################################################- # Title:            Sandbox: comicstreamer                              #- # Author(s):        theotocopulitos, kowalski                           #- # URL:              https://github.com/saltyorg/Sandbox                 #- # Docker Image(s):  kalinon/comicstreamer                               #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- ################################- # Basics- ################################- - comicstreamer_name: comicstreamer- - ################################- # Paths- ################################- - comicstreamer_paths_folder: "{{ comicstreamer_name }}"- comicstreamer_paths_location: "{{ server_appdata_path }}/{{ comicstreamer_paths_folder }}"- comicstreamer_paths_folders_list:-   - "{{ comicstreamer_paths_location }}"-   - "/mnt/local/Media/Comics"- - ################################- # Web- ################################- - comicstreamer_web_subdomain: "{{ comicstreamer_name }}"- comicstreamer_web_domain: "{{ user.domain }}"- comicstreamer_web_port: "32500"- comicstreamer_web_url: "{{ 'https://' + (comicstreamer_web_subdomain + '.' + comicstreamer_web_domain-                         if (comicstreamer_web_subdomain | length > 0)-                         else comicstreamer_web_domain) }}"- - ################################- # DNS- ################################- - comicstreamer_dns_record: "{{ comicstreamer_web_subdomain }}"- comicstreamer_dns_zone: "{{ comicstreamer_web_domain }}"- comicstreamer_dns_proxy: "{{ dns.proxied }}"- - ################################- # Traefik- ################################- - comicstreamer_traefik_sso_middleware: ""- comicstreamer_traefik_middleware_default: "{{ traefik_default_middleware }}"- comicstreamer_traefik_middleware_custom: ""- comicstreamer_traefik_certresolver: "{{ traefik_default_certresolver }}"- comicstreamer_traefik_enabled: true- - ################################- # Docker- ################################- - # Container- comicstreamer_docker_container: "{{ comicstreamer_name }}"- - # Image- comicstreamer_docker_image_pull: true- comicstreamer_docker_image_tag: "latest"- comicstreamer_docker_image: "kalinon/comicstreamer:{{ comicstreamer_docker_image_tag }}"- - # Ports- comicstreamer_docker_ports_defaults: []- comicstreamer_docker_ports_custom: []- comicstreamer_docker_ports: "{{ comicstreamer_docker_ports_defaults-                                 + comicstreamer_docker_ports_custom }}"- - # Envs- comicstreamer_docker_envs_default:- comicstreamer_docker_envs_custom: {}- comicstreamer_docker_envs: "{{ comicstreamer_docker_envs_default-                                | combine(comicstreamer_docker_envs_custom) }}"- - # Commands- comicstreamer_docker_commands_default: []- comicstreamer_docker_commands_custom: []- comicstreamer_docker_commands: "{{ comicstreamer_docker_commands_default-                                    + comicstreamer_docker_commands_custom }}"- - # Volumes- comicstreamer_docker_volumes_default:-   - "{{ comicstreamer_paths_location }}:/config"-   - "/mnt/unionfs/Media/Comics:/comics"- comicstreamer_docker_volumes_custom: []- comicstreamer_docker_volumes: "{{ comicstreamer_docker_volumes_default-                                   + comicstreamer_docker_volumes_custom }}"- - # Devices- comicstreamer_docker_devices_default: []- comicstreamer_docker_devices_custom: []- comicstreamer_docker_devices: "{{ comicstreamer_docker_devices_default-                                   + comicstreamer_docker_devices_custom }}"- - # Hosts- comicstreamer_docker_hosts_default: {}- comicstreamer_docker_hosts_custom: {}- comicstreamer_docker_hosts: "{{ docker_hosts_common-                                 | combine(comicstreamer_docker_hosts_default)-                                 | combine(comicstreamer_docker_hosts_custom) }}"- - # Labels- comicstreamer_docker_labels_default: {}- comicstreamer_docker_labels_custom: {}- comicstreamer_docker_labels: "{{ docker_labels_common-                                  | combine(comicstreamer_docker_labels_default)-                                  | combine(comicstreamer_docker_labels_custom) }}"- - # Hostname- comicstreamer_docker_hostname: "{{ comicstreamer_name }}"- - # Networks- comicstreamer_docker_networks_alias: "{{ comicstreamer_name }}"- comicstreamer_docker_networks_default: []- comicstreamer_docker_networks_custom: []- comicstreamer_docker_networks: "{{ docker_networks_common-                                    + comicstreamer_docker_networks_default-                                    + comicstreamer_docker_networks_custom }}"- - # Capabilities- comicstreamer_docker_capabilities_default: []- comicstreamer_docker_capabilities_custom: []- comicstreamer_docker_capabilities: "{{ comicstreamer_docker_capabilities_default-                                        + comicstreamer_docker_capabilities_custom }}"- - # Security Opts- comicstreamer_docker_security_opts_default: []- comicstreamer_docker_security_opts_custom: []- comicstreamer_docker_security_opts: "{{ comicstreamer_docker_security_opts_default-                                         + comicstreamer_docker_security_opts_custom }}"- - # Restart Policy- comicstreamer_docker_restart_policy: unless-stopped- - # State- comicstreamer_docker_state: started

- #########################################################################- # Title:            Sandbox: comicstreamer                              #- # Author(s):        theotocopulitos, kowalski                           #- # URL:              https://github.com/saltyorg/Sandbox                 #- # Docker Image(s):  kalinon/comicstreamer                               #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"

- ##########################################################################- # Title:            Sandbox: docspell | Default Variables                #- # Author(s):        JigSawFr                                             #- # URL:              https://github.com/saltyorg/Sandbox                  #- # URL:              https://github.com/eikek/docspell                    #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - docspell_name: docspell- - ################################- # Paths- ################################- - docspell_paths_folder: "{{ docspell_name }}"- docspell_paths_location: "{{ server_appdata_path }}/{{ docspell_paths_folder }}/server"- docspell_paths_folders_list:-   - "{{ docspell_paths_location }}"- - ################################- # Web- ################################- - docspell_web_subdomain: "{{ docspell_name }}"- docspell_web_domain: "{{ user.domain }}"- docspell_web_port: "7880"- docspell_web_url: "{{ 'https://' + (docspell_web_subdomain + '.' + docspell_web_domain-                    if (docspell_web_subdomain | length > 0)-                    else docspell_web_domain) }}"- - ################################- # DNS- ################################- - docspell_dns_record: "{{ docspell_web_subdomain }}"- docspell_dns_zone: "{{ docspell_web_domain }}"- docspell_dns_proxy: "{{ dns.proxied }}"- - ################################- # Traefik- ################################- - docspell_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"- docspell_traefik_middleware_default: "{{ traefik_default_middleware }}"- docspell_traefik_middleware_custom: ""- docspell_traefik_certresolver: "{{ traefik_default_certresolver }}"- docspell_traefik_enabled: true- docspell_traefik_api_enabled: true- docspell_traefik_api_endpoint: "PathPrefix(`/api`)"- - ################################- # Docker- ################################- - # Container- docspell_docker_container: "{{ docspell_name }}"- - # Image- docspell_docker_image_pull: true- docspell_docker_image_tag: "latest"- docspell_docker_image: "docspell/restserver:{{ docspell_docker_image_tag }}"- - # Ports- docspell_docker_ports_defaults: []- docspell_docker_ports_custom: []- docspell_docker_ports: "{{ docspell_docker_ports_defaults-                            + docspell_docker_ports_custom }}"- - # Envs- docspell_docker_envs_default:-   TZ: "{{ tz }}"-   DOCSPELL_SERVER_INTERNAL__URL: "http://{{ docspell_name }}:{{ docspell_web_port }}"-   DOCSPELL_SERVER_ADMIN__ENDPOINT_SECRET: "{{ docspell_admin_key.stdout }}"-   # DOCSPELL_SERVER_AUTH_SERVER__SECRET: ""-   DOCSPELL_SERVER_BACKEND_JDBC_PASSWORD: "{{ mariadb_docker_env_password }}"-   DOCSPELL_SERVER_BACKEND_JDBC_URL: "jdbc:mariadb://{{ docspell_name }}-mariadb:3306/{{ docspell_name }}"-   DOCSPELL_SERVER_BACKEND_JDBC_USER: "root"-   DOCSPELL_SERVER_BIND_ADDRESS: "0.0.0.0"-   DOCSPELL_SERVER_FULL__TEXT__SEARCH_ENABLED: "true"-   DOCSPELL_SERVER_FULL__TEXT__SEARCH_SOLR_URL: "http://{{ docspell_name }}-solr:{{ solr_docker_env_port }}/solr/{{ docspell_name }}"-   DOCSPELL_SERVER_INTEGRATION__ENDPOINT_ENABLED: "true"-   DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_ENABLED: "true"-   DOCSPELL_SERVER_INTEGRATION__ENDPOINT_HTTP__HEADER_HEADER__VALUE: "{{ docspell_integration_key.stdout }}"-   DOCSPELL_SERVER_BACKEND_SIGNUP_MODE: "open"-   DOCSPELL_SERVER_BACKEND_SIGNUP_NEW__INVITE__PASSWORD: "{{ docspell_register_key.stdout }}"-   DOCSPELL_SERVER_BACKEND_ADDONS_ENABLED: "false"- docspell_docker_envs_custom: {}- docspell_docker_envs: "{{ docspell_docker_envs_default-                           | combine(docspell_docker_envs_custom) }}"- - # Commands- docspell_docker_commands_default: []- docspell_docker_commands_custom: []- docspell_docker_commands: "{{ docspell_docker_commands_default-                               + docspell_docker_commands_custom }}"- - # Volumes- docspell_docker_volumes_default: []- docspell_docker_volumes_custom: []- docspell_docker_volumes: "{{ docspell_docker_volumes_default-                              + docspell_docker_volumes_custom }}"- - # Devices- docspell_docker_devices_default: []- docspell_docker_devices_custom: []- docspell_docker_devices: "{{ docspell_docker_devices_default-                              + docspell_docker_devices_custom }}"- - # Hosts- docspell_docker_hosts_default: {}- docspell_docker_hosts_custom: {}- docspell_docker_hosts: "{{ docker_hosts_common-                            | combine(docspell_docker_hosts_default)-                            | combine(docspell_docker_hosts_custom) }}"- - # Labels- docspell_docker_labels_default: {}- docspell_docker_labels_custom: {}- docspell_docker_labels: "{{ docker_labels_common-                             | combine(docspell_docker_labels_default)-                             | combine(docspell_docker_labels_custom) }}"- - # Hostname- docspell_docker_hostname: "{{ docspell_name }}"- - # Networks- docspell_docker_networks_alias: "{{ docspell_name }}"- docspell_docker_networks_default: []- docspell_docker_networks_custom: []- docspell_docker_networks: "{{ docker_networks_common-                               + docspell_docker_networks_default-                               + docspell_docker_networks_custom }}"- - # Capabilities- docspell_docker_capabilities_default: []- docspell_docker_capabilities_custom: []- docspell_docker_capabilities: "{{ docspell_docker_capabilities_default-                                   + docspell_docker_capabilities_custom }}"- - # Security Opts- docspell_docker_security_opts_default: []- docspell_docker_security_opts_custom: []- docspell_docker_security_opts: "{{ docspell_docker_security_opts_default-                                    + docspell_docker_security_opts_custom }}"- - # Restart Policy- docspell_docker_restart_policy: unless-stopped- - # State- docspell_docker_state: started- - # Dependencies- docspell_depends_on: "{{ docspell_name }}-mariadb"- docspell_depends_on_delay: "0"- docspell_depends_on_healthchecks: "false"

- #########################################################################- # Title:            Sandbox: docspell                                   #- # Author(s):        JigSawFr                                            #- # URL:              https://github.com/saltyorg/Sandbox                 #- # URL:              https://github.com/eikek/docspell                   #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Check if db folder exists-   ansible.builtin.stat:-     path: "{{ server_appdata_path }}/{{ docspell_paths_folder }}/mariadb"-   register: stat_docspell_db_folder- - - name: Remove legacy MariaDB Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"-   vars:-     var_prefix: "{{ docspell_name }}_mariadb"- - - name: MariaDB Role-   ansible.builtin.include_role:-     name: mariadb-   vars:-     mariadb_instances: ["{{ docspell_name }}-mariadb"]-     mariadb_paths_folder: "{{ docspell_name }}"-     mariadb_paths_location: "{{ server_appdata_path }}/{{ docspell_paths_folder }}/mariadb"- - - name: Create docspell database-   community.mysql.mysql_db:-     name: "{{ docspell_name }}"-     login_host: "{{ docspell_name }}-mariadb"-     login_user: "root"-     login_password: "{{ mariadb_docker_env_password }}"-     state: present- - - name: Remove legacy Solr Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"-   vars:-     var_prefix: "{{ docspell_name }}_solr"- - - name: Solr Role-   ansible.builtin.include_role:-     name: solr-   vars:-     solr_name: "{{ docspell_name }}-solr"-     solr_docker_env_core_name: "{{ docspell_name }}"-     solr_paths_folder: "{{ docspell_name }}"-     solr_paths_location: "{{ server_appdata_path }}/{{ solr_paths_folder }}/solr"- - - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - - name: "Generate Secret Key for registration"-   ansible.builtin.shell: "openssl rand -hex 20"-   register: docspell_register_key- - - name: "Generate Secret Key for integration endpoint"-   ansible.builtin.shell: "openssl rand -hex 30"-   register: docspell_integration_key- - - name: "Generate Secret Key for admin endpoint"-   ansible.builtin.shell: "openssl rand -hex 30"-   register: docspell_admin_key- - - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container (docspell-server)-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"- - - name: Remove legacy docspell-worker Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"-   vars:-     var_prefix: "{{ docspell_name }}_joex"- - - name: Create Docker container (docspell-worker)-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"-   vars:-     docspell_docker_container: "{{ docspell_name }}-joex"-     docspell_docker_image: "docspell/joex:latest"-     docspell_web_port: "7878"-     docspell_docker_envs:-       TZ: "{{ tz }}"-       DOCSPELL_JOEX_APP__ID: "joex"-       DOCSPELL_JOEX_PERIODIC__SCHEDULER_NAME: "joex"-       DOCSPELL_JOEX_SCHEDULER_NAME: "joex"-       DOCSPELL_JOEX_BASE__URL: "http://{{ docspell_docker_container }}:{{ docspell_web_port }}"-       DOCSPELL_JOEX_BIND_ADDRESS: "0.0.0.0"-       DOCSPELL_JOEX_FULL__TEXT__SEARCH_ENABLED: "true"-       DOCSPELL_JOEX_FULL__TEXT__SEARCH_SOLR_URL: "http://{{ docspell_name }}-solr:{{ solr_docker_env_port }}/solr/{{ docspell_name }}"-       DOCSPELL_JOEX_JDBC_PASSWORD: "{{ mariadb_docker_env_password }}"-       DOCSPELL_JOEX_JDBC_URL: "jdbc:mariadb://{{ docspell_name }}-mariadb:3306/{{ docspell_name }}"-       DOCSPELL_JOEX_JDBC_USER: "root"-       DOCSPELL_JOEX_ADDONS_EXECUTOR__CONFIG_RUNNER: "docker,trivial"-       DOCSPELL_JOEX_CONVERT_HTML__CONVERTER: "weasyprint"-     docspell_docker_labels: "{{ omit }}"-     docspell_docker_volumes:-       - /tmp:/tmp

- ##########################################################################- # Title:         Sandbox: rdtclient                                      #- # Author(s):     kxzaon, salty                                           #- # URL:           https://github.com/saltyorg/Sandbox                     #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - rdtclient_name: rdtclient- - ################################- # Paths- ################################- - rdtclient_paths_folder: "{{ rdtclient_name }}"- rdtclient_paths_location: "{{ server_appdata_path }}/{{ rdtclient_paths_folder }}"- rdtclient_paths_config_location: "{{ rdtclient_paths_location }}/config"- rdtclient_paths_db_location: "{{ rdtclient_paths_location }}/db"- rdtclient_paths_downloads_location: "/mnt/unionfs/downloads/torrents/rdtclient"- rdtclient_paths_folders_list:-   - "{{ rdtclient_paths_location }}"-   - "{{ rdtclient_paths_config_location }}"-   - "{{ rdtclient_paths_db_location }}"-   - "{{ rdtclient_paths_downloads_location }}"- - ################################- # Web- ################################- - rdtclient_web_subdomain: "{{ rdtclient_name }}"- rdtclient_web_domain: "{{ user.domain }}"- rdtclient_web_port: "6500"- rdtclient_web_url: "{{ 'https://' + (rdtclient_web_subdomain + '.' + rdtclient_web_domain-                     if (rdtclient_web_subdomain | length > 0)-                     else rdtclient_web_domain) }}"- - ################################- # DNS- ################################- - rdtclient_dns_record: "{{ rdtclient_web_subdomain }}"- rdtclient_dns_zone: "{{ rdtclient_web_domain }}"- rdtclient_dns_proxy: "{{ dns.proxied }}"- - ################################- # Traefik- ################################- - rdtclient_traefik_sso_middleware: ""- rdtclient_traefik_middleware_default: "{{ traefik_default_middleware }}"- rdtclient_traefik_middleware_custom: ""- rdtclient_traefik_certresolver: "{{ traefik_default_certresolver }}"- rdtclient_traefik_enabled: true- rdtclient_traefik_api_enabled: false- rdtclient_traefik_api_endpoint: ""- - ################################- # Docker- ################################- - # Container- rdtclient_docker_container: "{{ rdtclient_name }}"- - # Image- rdtclient_docker_image_pull: true- rdtclient_docker_image_tag: "latest"- rdtclient_docker_image: "rogerfar/rdtclient:{{ rdtclient_docker_image_tag }}"- - # Ports- rdtclient_docker_ports_defaults: []- rdtclient_docker_ports_custom: []- rdtclient_docker_ports: "{{ rdtclient_docker_ports_defaults-                             + rdtclient_docker_ports_custom }}"- - # Envs- rdtclient_docker_envs_default:-   PUID: "{{ uid }}"-   PGID: "{{ gid }}"-   TZ: "{{ tz }}"- rdtclient_docker_envs_custom: {}- rdtclient_docker_envs: "{{ rdtclient_docker_envs_default-                            | combine(rdtclient_docker_envs_custom) }}"- - # Commands- rdtclient_docker_commands_default: []- rdtclient_docker_commands_custom: []- rdtclient_docker_commands: "{{ rdtclient_docker_commands_default-                                + rdtclient_docker_commands_custom }}"- - # Volumes- rdtclient_docker_volumes_default:-   - "{{ rdtclient_paths_location }}:/data"-   - "{{ rdtclient_paths_config_location }}:/data/config"-   - "{{ rdtclient_paths_db_location }}:/data/db"-   - "{{ rdtclient_paths_downloads_location }}:/data/downloads"- rdtclient_docker_volumes_custom: []- rdtclient_docker_volumes: "{{ rdtclient_docker_volumes_default-                               + rdtclient_docker_volumes_custom }}"- - # Devices- rdtclient_docker_devices_default: []- rdtclient_docker_devices_custom: []- rdtclient_docker_devices: "{{ rdtclient_docker_devices_default-                               + rdtclient_docker_devices_custom }}"- - # Hosts- rdtclient_docker_hosts_default: {}- rdtclient_docker_hosts_custom: {}- rdtclient_docker_hosts: "{{ docker_hosts_common-                             | combine(rdtclient_docker_hosts_default)-                             | combine(rdtclient_docker_hosts_custom) }}"- - # Labels- rdtclient_docker_labels_default: {}- rdtclient_docker_labels_custom: {}- rdtclient_docker_labels: "{{ docker_labels_common-                              | combine(rdtclient_docker_labels_default)-                              | combine(rdtclient_docker_labels_custom) }}"- - # Hostname- rdtclient_docker_hostname: "{{ rdtclient_name }}"- - # Networks- rdtclient_docker_networks_alias: "{{ rdtclient_name }}"- rdtclient_docker_networks_default: []- rdtclient_docker_networks_custom: []- rdtclient_docker_networks: "{{ docker_networks_common-                                + rdtclient_docker_networks_default-                                + rdtclient_docker_networks_custom }}"- - # Capabilities- rdtclient_docker_capabilities_default: []- rdtclient_docker_capabilities_custom: []- rdtclient_docker_capabilities: "{{ rdtclient_docker_capabilities_default-                                    + rdtclient_docker_capabilities_custom }}"- - # Security Opts- rdtclient_docker_security_opts_default: []- rdtclient_docker_security_opts_custom: []- rdtclient_docker_security_opts: "{{ rdtclient_docker_security_opts_default-                                     + rdtclient_docker_security_opts_custom }}"- - # Restart Policy- rdtclient_docker_restart_policy: unless-stopped- - # State- rdtclient_docker_state: started

- #########################################################################- # Title:            Sandbox: rdtclient                                  #- # Author(s):        kxzaon, salty                                       #- # URL:              https://github.com/saltyorg/Sandbox                 #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"

- #!/srv/ansible/venv/bin/python3- """- -     #########################################################################-     # Title:         Settings Updater Script                                #-     # Author(s):     l3uddz, salty                                          #-     # URL:           https://github.com/saltyorg/Sandbox                    #-     # Description:   Adds variables to settings.yml.                        #-     # --                                                                    #-     #########################################################################-     #                   GNU General Public License v3.0                     #-     #########################################################################- - """- import logging- import os- import sys- from logging.handlers import RotatingFileHandler- - from ruamel.yaml import YAML- from ruamel.yaml.comments import CommentedMap- - ############################################################- # INIT- ############################################################- - - log = None- - - def init_logging(playbook_path):-     # log settings-     log_format = '%(asctime)s - %(levelname)-10s - %(name)-35s - %(funcName)-35s - %(message)s'-     log_file_path = os.path.join(playbook_path, "settings-updater.log")-     log_level = logging.DEBUG- -     # init root_logger-     log_formatter = logging.Formatter(log_format)-     root_logger = logging.getLogger()-     root_logger.setLevel(log_level)- -     # init console_logger-     console_handler = logging.StreamHandler(sys.stdout)-     console_handler.setFormatter(log_formatter)-     root_logger.addHandler(console_handler)- -     # init file_logger-     file_handler = RotatingFileHandler(-         log_file_path,-         maxBytes=1024 * 1024 * 5,-         backupCount=5-     )-     file_handler.setFormatter(log_formatter)-     root_logger.addHandler(file_handler)- -     # Set chosen logging level-     root_logger.setLevel(log_level)- -     # Get logger-     return root_logger.getChild("settings-updater")- - - ############################################################- # UPDATER- ############################################################- - def load_settings(file_to_load):-     yaml_instance = YAML()-     yaml_instance.preserve_quotes = True- -     settings = None-     try:-         with open(file_to_load, "r") as f:-             settings = yaml_instance.load(f)-     except Exception:-         log.exception("Exception loading %s: ", file_to_load)-     return settings- - - def dump_settings(settings, file_to_dump):-     dumped = False-     try:-         yaml_instance = YAML()-         yaml_instance.preserve_quotes = True-         with open(file_to_dump, 'w') as fp:-             yaml_instance.dump(settings, fp)-         dumped = True-     except Exception:-         log.exception("Exception dumping upgraded %s: ", file_to_dump)-     return dumped- - - def upgrade_settings(defaults, current, key=None):-     upgraded = False-     res = CommentedMap()-     for k, v in defaults.items():-         if k not in current:-             res[k] = v-             upgraded = True-             log.info("Added field: \'%s%s\'.", k, '' if not key else ' to \'%s\'.' % key)-         else:-             res[k] = current[k]- -         if hasattr(v, 'items'):-             if k in current:-                 sub_upgrade, res[k] = upgrade_settings(v, current[k], k)-                 if sub_upgrade:-                     upgraded = True-             else:-                 res[k] = v-                 upgraded = True- -     return upgraded, res- - - ############################################################- # MAIN- ############################################################- - if __name__ == "__main__":-     # get playbook dir-     if not len(sys.argv) >= 4:-         print("3 arguments must be supplied, playbook_dir default_settings current_settings")-         sys.exit(1)-     playbook_dir = sys.argv[1]-     default_file = sys.argv[2]-     current_file = sys.argv[3]- -     # init logging-     log = init_logging(playbook_dir)- -     # load settings-     default_settings = load_settings(os.path.join(playbook_dir, default_file))-     if not default_settings:-         log.error("Failed loading \'%s\'. Aborting...", default_file)-         sys.exit(1)- -     current_settings = load_settings(os.path.join(playbook_dir, current_file))-     if not current_settings:-         log.error("Failed loading \'%s\'. Aborting...", current_file)-         sys.exit(1)- -     # compare/upgrade settings-     did_upgrade, upgraded_settings = upgrade_settings(default_settings, current_settings)-     if not did_upgrade:-         log.info("There were no settings changes to apply.")-         sys.exit(0)-     else:-         if not dump_settings(upgraded_settings, os.path.join(playbook_dir, current_file)):-             log.error("Failed dumping updated \'%s\'.", current_file)-             sys.exit(1)-         log.info("Successfully upgraded: \'%s\'.", current_file)-         sys.exit(2)

- #########################################################################- # Title:         Sandbox: Settings Role                                 #- # Author(s):     desimaniac, salty                                      #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Settings | Start"-   ansible.builtin.include_tasks: "subtasks/start.yml"- - - name: "Settings | Main 2"-   ansible.builtin.include_tasks: "main2.yml"-   loop: "{{ config_files }}"-   loop_control:-     loop_var: outer_item- - - name: "Settings | Finish"-   ansible.builtin.include_tasks: "subtasks/finish.yml"

- #########################################################################- # Title:         Sandbox: Settings | Main 2                             #- # Author(s):     desimaniac, salty                                      #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Settings | Copy"-   ansible.builtin.include_tasks: "subtasks/copy.yml"-   vars:-     file: "{{ outer_item }}"- - - name: "Settings | Migrator"-   ansible.builtin.include_tasks: "subtasks/migrator.yml"-   vars:-     file: "{{ outer_item }}"- - - name: "Settings | Updater"-   ansible.builtin.include_tasks: "subtasks/updater.yml"-   vars:-     file: "{{ outer_item }}"

- #########################################################################- # Title:         Sandbox: Settings | Copy                               #- # Author(s):     desimaniac, salty                                      #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- # Check for config files and import they are missing- - name: "Copy | Check if '{{ file }}' exists"-   ansible.builtin.stat:-     path: "{{ playbook_dir }}/{{ file }}"-   register: file0- - - name: "Copy | Copy '{{ file }}.default' to '{{ file }}'"-   ansible.builtin.copy:-     src: "{{ playbook_dir }}/defaults/{{ file }}.default"-     dest: "{{ playbook_dir }}/{{ file }}"-     owner: "{{ sandbox_yml.stat.uid }}"-     group: "{{ sandbox_yml.stat.gid }}"-     mode: "0664"-   when: not file0.stat.exists

- #########################################################################- # Title:         Sandbox: Settings | Finish                             #- # Author(s):     desimaniac, salty                                      #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Finish | Check 'settings-updater.py' for new settings"-   ansible.builtin.debug: # noqa jinja[invalid]-     msg:-       - "The 'settings_updater.py' script updated the following-           file{{ 's' if (files_updated_successfully | length > 1) else '' }}: '{{ files_updated_successfully | join(', ') | trim }}'"-       - "Please check {{ 'these files' if (files_updated_successfully | length > 1) else 'this file' }} for the newly added settings"-       - "You can also review the log file: 'settings-updater.log'"-   when:-     - files_updated_successfully | length > 0- - # Exit playbook When necessary- - name: Finish | Exit Tasks-   when: exit_is_necessary-   block:-     - name: "Finish | Check 'settings-updater.py' run status for errors"-       ansible.builtin.debug:-         msg:-           - "The 'settings_updater.py' script exited with an error when updating the following-               file{{ 's' if (files_updated_unsuccessfully | length > 1) else '' }}: '{{ files_updated_unsuccessfully | join(', ') | trim }}'"-           - "Please check 'settings-updater.log' for details"-       when: files_updated_unsuccessfully | length > 0- -     - name: "Finish | Exit so that user can check updated config files"-       ansible.builtin.debug:-         msg: "Sandbox Installer will now exit."- -     - name: "Finish | Exit"-       ansible.builtin.meta: end_play

- #########################################################################- # Title:         Sandbox: Settings | Migrator                           #- # Author(s):     desimaniac, salty                                      #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Migrator | Migrations for all config files-   block:-     - name: Migrator | All | Migration 01-       ansible.builtin.include_tasks: "migrator/all/migration_01.yml"

- ########################################################################################- # Title:         Sandbox: Settings | Migrator | All | Migration 01                     #- # Author(s):     desimaniac, salty                                                     #- # URL:           https://github.com/saltyorg/Sandbox                                   #- # --                                                                                   #- ########################################################################################- #                            GNU General Public License v3.0                           #- ########################################################################################- ---- - name: Migrator | All | '{{ file }}' | Migration 01 | Add single space after colon (if needed)-   ansible.builtin.replace:-     path: "{{ playbook_dir }}/{{ file }}"-     regexp: '(:)[ \t]*(.*)'-     replace: '\1 \2'-     owner: "{{ sandbox_yml.stat.uid }}"-     group: "{{ sandbox_yml.stat.gid }}"-     mode: "0664"- - - name: Migrator | All | '{{ file }}' | Migration 01 | Re-import Variables-   ansible.builtin.include_vars: "{{ playbook_dir }}/{{ file }}"

- #########################################################################- # Title:         Sandbox: Settings | Start                              #- # Author(s):     desimaniac, salty                                      #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Start | Install yyq"-   ansible.builtin.include_role:-     name: yyq- - - name: "Start | Get 'sandbox.yml' info"-   ansible.builtin.stat:-     path: "{{ playbook_dir }}/sandbox.yml"-   register: sandbox_yml- - - name: "Start | Create list of config files"-   ansible.builtin.set_fact:-     config_files:-       - "settings.yml"- - - name: Start | Initialize vars with empty lists-   ansible.builtin.set_fact:-     files_updated_successfully: []-     files_updated_unsuccessfully: []-     exit_is_necessary: false- - - name: "Start | Check if 'settings-updater.log' exists"-   ansible.builtin.stat:-     path: "{{ playbook_dir }}/settings-updater.log"-   register: settings_updater_log- - - name: "Start | Reset ownership of 'settings-updater.log'"-   ansible.builtin.file:-     path: "{{ playbook_dir }}/settings-updater.log"-     state: file-     owner: "{{ sandbox_yml.stat.uid }}"-     group: "{{ sandbox_yml.stat.gid }}"-     mode: "0664"-   when: (settings_updater_log.stat.exists)

- #########################################################################- # Title:         Sandbox: Settings | Updater                            #- # Author(s):     desimaniac, l3uddz, salty                              #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Updater | Run 'settings-updater.py' for '{{ file }}'"-   ansible.builtin.script: "'roles/settings/files/settings-updater.py' '{{ playbook_dir }}' 'defaults/{{ file }}.default' '{{ file }}'"-   become: true-   become_user: "{{ sandbox_yml.stat.pw_name }}"-   register: settings_updater-   ignore_errors: true-   changed_when: false-   failed_when: settings_updater.rc == 1- - - name: Updater | Build 'files_updated_successfully' list-   ansible.builtin.set_fact:-     files_updated_successfully: "{{ files_updated_successfully + [file] }}"-   when: settings_updater.rc == 2- - - name: Updater | Build 'files_updated_unsuccessfully' list-   ansible.builtin.set_fact:-     files_updated_unsuccessfully: "{{ files_updated_unsuccessfully + [file] }}"-   when: settings_updater.rc == 1- - - name: Updater | Set 'exit_is_necessary' variable-   ansible.builtin.set_fact:-     exit_is_necessary: true-   when: (settings_updater.rc == 2)

- ##########################################################################- # Title:            Sandbox: solr | Default Variables                    #- # Author(s):        JigSawFr                                             #- # URL:              https://github.com/saltyorg/Sandbox                  #- # URL:              https://github.com/apache/solr                       #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - solr_name: solr- - ################################- # Settings- ################################- - # solr_docker_env_password: "solr147"- solr_docker_env_port: "8983"- solr_docker_env_core_name: "{{ solr_name }}"- - ################################- # Paths- ################################- - solr_paths_folder: "{{ solr_name }}"- solr_paths_location: "{{ server_appdata_path }}/{{ solr_paths_folder }}"- solr_paths_folders_list:-   - "{{ solr_paths_location }}"- - ################################- # Docker- ################################- - # Container- solr_docker_container: "{{ solr_name }}"- - # Image- solr_docker_image_pull: true- solr_docker_image_tag: "latest"- solr_docker_image: "solr:{{ solr_docker_image_tag }}"- - # Ports- solr_docker_ports_defaults: []- solr_docker_ports_custom: []- solr_docker_ports: "{{ solr_docker_ports_defaults-                        + solr_docker_ports_custom }}"- - # Envs- solr_docker_envs_default:-   TZ: "{{ tz }}"-   SOLR_HOST: "{{ solr_name }}"-   # SOLR_UID: "{{ uid }}"-   # SOLR_GID: "{{ gid }}"- solr_docker_envs_custom: {}- solr_docker_envs: "{{ solr_docker_envs_default-                       | combine(solr_docker_envs_custom) }}"- - # Commands- solr_docker_commands_default:-   - "solr-precreate {{ solr_docker_env_core_name }}"- solr_docker_commands_custom: []- solr_docker_commands: "{{ solr_docker_commands_default-                           + solr_docker_commands_custom }}"- - # Volumes- solr_docker_volumes_default: []- #  - "{{ solr_paths_location }}:/var/solr/data"- solr_docker_volumes_custom: []- solr_docker_volumes: "{{ solr_docker_volumes_default-                          + solr_docker_volumes_custom }}"- - # Devices- solr_docker_devices_default: []- solr_docker_devices_custom: []- solr_docker_devices: "{{ solr_docker_devices_default-                          + solr_docker_devices_custom }}"- - # Hosts- solr_docker_hosts_default: {}- solr_docker_hosts_custom: {}- solr_docker_hosts: "{{ docker_hosts_common-                        | combine(solr_docker_hosts_default)-                        | combine(solr_docker_hosts_custom) }}"- - # Labels- solr_docker_labels_default: {}- solr_docker_labels_custom: {}- solr_docker_labels: "{{ docker_labels_common-                         | combine(solr_docker_labels_default)-                         | combine(solr_docker_labels_custom) }}"- - # Hostname- solr_docker_hostname: "{{ solr_name }}"- - # Networks- solr_docker_networks_alias: "{{ solr_name }}"- solr_docker_networks_default: []- solr_docker_networks_custom: []- solr_docker_networks: "{{ docker_networks_common-                           + solr_docker_networks_default-                           + solr_docker_networks_custom }}"- - # Capabilities- solr_docker_capabilities_default: []- solr_docker_capabilities_custom: []- solr_docker_capabilities: "{{ solr_docker_capabilities_default-                               + solr_docker_capabilities_custom }}"- - # Security Opts- solr_docker_security_opts_default: []- solr_docker_security_opts_custom: []- solr_docker_security_opts: "{{ solr_docker_security_opts_default-                                + solr_docker_security_opts_custom }}"- - # Restart Policy- solr_docker_restart_policy: always- - # State- solr_docker_state: started- - # User- # solr_docker_user: "{{ uid }}:{{ gid }}"

- ##########################################################################- # Title:            Sandbox: Gotenberg                                   #- # Author(s):        JigSawFr                                             #- # URL:              https://github.com/saltyorg/Sandbox                  #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"

- ##########################################################################- # Title:         Sandbox: Teamspeak | Default Variables                  #- # Author(s):     salty                                                   #- # URL:           https://github.com/saltyorg/Sandbox                     #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - teamspeak_name: "teamspeak"- - ################################- # Paths- ################################- - teamspeak_paths_folder: "{{ teamspeak_name }}"- teamspeak_paths_location: "{{ server_appdata_path }}/{{ teamspeak_paths_folder }}"- teamspeak_paths_folders_list:-   - "{{ teamspeak_paths_location }}"- - ################################- # Web- ################################- - teamspeak_web_subdomain: "{{ teamspeak_name }}"- teamspeak_web_domain: "{{ user.domain }}"- - ################################- # DNS- ################################- - teamspeak_dns_record: "{{ lookup('vars', teamspeak_name + '_web_subdomain', default=teamspeak_web_subdomain) }}"- teamspeak_dns_zone: "{{ lookup('vars', teamspeak_name + '_web_domain', default=teamspeak_web_domain) }}"- teamspeak_dns_proxy: false- - ################################- # Ports- ################################- teamspeak_docker_ports_9987: "{{ port_lookup_voice.meta.port-                               if (port_lookup_voice.meta.port is defined) and (port_lookup_voice.meta.port | trim | length > 0)-                               else '9987' }}"- - teamspeak_docker_ports_10011: "{{ port_lookup_webquery.meta.port-                                if (port_lookup_webquery.meta.port is defined) and (port_lookup_webquery.meta.port | trim | length > 0)-                                else '10011' }}"- - teamspeak_docker_ports_30033: "{{ port_lookup_file.meta.port-                                if (port_lookup_file.meta.port is defined) and (port_lookup_file.meta.port | trim | length > 0)-                                else '30033' }}"- - ################################- # Docker- ################################- - # Container- teamspeak_docker_container: "{{ teamspeak_name }}"- - # Image- teamspeak_docker_image_pull: true- teamspeak_docker_image_repo: "teamspeak"- teamspeak_docker_image_tag: "latest"- teamspeak_docker_image: "{{ lookup('vars', teamspeak_name + '_docker_image_repo', default=teamspeak_docker_image_repo)-                             + ':' + lookup('vars', teamspeak_name + '_docker_image_tag', default=teamspeak_docker_image_tag) }}"- - # Ports- teamspeak_docker_ports_defaults:-   - "{{ teamspeak_docker_ports_9987 }}:9987/udp"-   - "{{ teamspeak_docker_ports_10011 }}:10011"-   - "{{ teamspeak_docker_ports_30033 }}:30033"- teamspeak_docker_ports_custom: []- teamspeak_docker_ports: "{{ lookup('vars', teamspeak_name + '_docker_ports_defaults', default=teamspeak_docker_ports_defaults)-                             + lookup('vars', teamspeak_name + '_docker_ports_custom', default=teamspeak_docker_ports_custom) }}"- - # Envs- teamspeak_docker_envs_default:-   TS3SERVER_DB_PLUGIN: "ts3db_mariadb"-   TS3SERVER_DB_SQLCREATEPATH: "create_mariadb"-   TS3SERVER_DB_HOST: "mariadb"-   TS3SERVER_DB_USER: "root"-   TS3SERVER_DB_PASSWORD: "{{ mariadb_docker_env_password }}"-   TS3SERVER_DB_NAME: "{{ teamspeak_name }}"-   TS3SERVER_DB_WAITUNTILREADY: "30"-   TS3SERVER_LICENSE: "accept"- teamspeak_docker_envs_custom: {}- teamspeak_docker_envs: "{{ lookup('vars', teamspeak_name + '_docker_envs_default', default=teamspeak_docker_envs_default)-                            | combine(lookup('vars', teamspeak_name + '_docker_envs_custom', default=teamspeak_docker_envs_custom)) }}"- - # Commands- teamspeak_docker_commands_default: []- teamspeak_docker_commands_custom: []- teamspeak_docker_commands: "{{ lookup('vars', teamspeak_name + '_docker_commands_default', default=teamspeak_docker_commands_default)-                                + lookup('vars', teamspeak_name + '_docker_commands_custom', default=teamspeak_docker_commands_custom) }}"- - # Volumes- teamspeak_docker_volumes_default:-   - "{{ teamspeak_paths_location }}:/var/ts3server"- teamspeak_docker_volumes_custom: []- teamspeak_docker_volumes: "{{ lookup('vars', teamspeak_name + '_docker_volumes_default', default=teamspeak_docker_volumes_default)-                               + lookup('vars', teamspeak_name + '_docker_volumes_custom', default=teamspeak_docker_volumes_custom) }}"- - # Devices- teamspeak_docker_devices_default: []- teamspeak_docker_devices_custom: []- teamspeak_docker_devices: "{{ lookup('vars', teamspeak_name + '_docker_devices_default', default=teamspeak_docker_devices_default)-                               + lookup('vars', teamspeak_name + '_docker_devices_custom', default=teamspeak_docker_devices_custom) }}"- - # Hosts- teamspeak_docker_hosts_default: {}- teamspeak_docker_hosts_custom: {}- teamspeak_docker_hosts: "{{ docker_hosts_common-                             | combine(lookup('vars', teamspeak_name + '_docker_hosts_default', default=teamspeak_docker_hosts_default))-                             | combine(lookup('vars', teamspeak_name + '_docker_hosts_custom', default=teamspeak_docker_hosts_custom)) }}"- - # Labels- teamspeak_docker_labels_default: {}- teamspeak_docker_labels_custom: {}- teamspeak_docker_labels: "{{ docker_labels_common-                              | combine(lookup('vars', teamspeak_name + '_docker_labels_default', default=teamspeak_docker_labels_default))-                              | combine(lookup('vars', teamspeak_name + '_docker_labels_custom', default=teamspeak_docker_labels_custom)) }}"- - # Hostname- teamspeak_docker_hostname: "{{ teamspeak_name }}"- - # Networks- teamspeak_docker_networks_alias: "{{ teamspeak_name }}"- teamspeak_docker_networks_default: []- teamspeak_docker_networks_custom: []- teamspeak_docker_networks: "{{ docker_networks_common-                                + lookup('vars', teamspeak_name + '_docker_networks_default', default=teamspeak_docker_networks_default)-                                + lookup('vars', teamspeak_name + '_docker_networks_custom', default=teamspeak_docker_networks_custom) }}"- - # Capabilities- teamspeak_docker_capabilities_default: []- teamspeak_docker_capabilities_custom: []- teamspeak_docker_capabilities: "{{ lookup('vars', teamspeak_name + '_docker_capabilities_default', default=teamspeak_docker_capabilities_default)-                                    + lookup('vars', teamspeak_name + '_docker_capabilities_custom', default=teamspeak_docker_capabilities_custom) }}"- - # Security Opts- teamspeak_docker_security_opts_default: []- teamspeak_docker_security_opts_custom: []- teamspeak_docker_security_opts: "{{ lookup('vars', teamspeak_name + '_docker_security_opts_default', default=teamspeak_docker_security_opts_default)-                                     + lookup('vars', teamspeak_name + '_docker_security_opts_custom', default=teamspeak_docker_security_opts_custom) }}"- - # Restart Policy- teamspeak_docker_restart_policy: unless-stopped- - # State- teamspeak_docker_state: started- - # Dependencies- teamspeak_depends_on: "mariadb"- teamspeak_depends_on_delay: "0"- teamspeak_depends_on_healthchecks: "false"

- #########################################################################- # Title:            Sandbox: Teamspeak                                  #- # Author(s):        salty                                               #- # URL:              https://github.com/saltyorg/Sandbox                 #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: MariaDB Role-   ansible.builtin.include_role:-     name: mariadb- - - name: MariaDB | Create {{ teamspeak_name }} database-   community.mysql.mysql_db:-     name: "{{ teamspeak_name }}"-     login_host: "mariadb"-     login_user: "root"-     login_password: "{{ mariadb_docker_env_password }}"-     state: present- - - name: Get next available port within the range of '9987-9997' # noqa fqcn[action]-   find_open_port:-     low_bound: 9987-     high_bound: 9997-     protocol: udp-   register: port_lookup_voice-   ignore_errors: true- - - name: Get next available port within the range of '10011-10021' # noqa fqcn[action]-   find_open_port:-     low_bound: 10011-     high_bound: 10021-     protocol: tcp-   register: port_lookup_webquery-   ignore_errors: true- - - name: Get next available port within the range of '30033-30043' # noqa fqcn[action]-   find_open_port:-     low_bound: 30033-     high_bound: 30043-     protocol: tcp-   register: port_lookup_file-   ignore_errors: true- - - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - - name: Add SRV record-   community.general.cloudflare_dns:-     account_api_key: "{{ cloudflare.api }}"-     account_email: "{{ cloudflare.email }}"-     port: "{{ teamspeak_docker_ports_9987 }}"-     priority: 10-     proto: udp-     proxied: false-     record: "{{ _dns_tasker_record }}"-     service: "ts3"-     solo: true-     state: present-     type: SRV-     value: "{{ _dns_tasker_record }}.{{ _dns_tasker_zone }}"-     weight: 20-     zone: "{{ _dns_tasker_zone }}"-   when: cloudflare_is_enabled- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"- - - name: Port Information-   ansible.builtin.debug:-     msg:-       - "Voice port is: {{ teamspeak_docker_ports_9987 }}"-       - "Web Query port is: {{ teamspeak_docker_ports_10011 }}"-       - "File port is: {{ teamspeak_docker_ports_30033 }}"

- ##########################################################################- # Title:            Sandbox: Watchtower Role | Default Variables         #- # Author(s):        l3uddz, salty, owine                                 #- # URL:              https://github.com/saltyorg/Sandbox                  #- # --                                                                     #- ##########################################################################- #                   GNU General Public License v3.0                      #- ##########################################################################- ---- ################################- # Basics- ################################- - watchtower_instances: ["watchtower"]- - ################################- # Settings- ################################- - watchtower_metrics_enable: false- watchtower_metrics_external: false- watchtower_poll_interval: "43200"- - ################################- # Paths- ################################- - watchtower_paths_folder: "{{ watchtower_name }}"- watchtower_paths_location: "{{ server_appdata_path }}/{{ watchtower_paths_folder }}"- watchtower_paths_folders_list:-   - "{{ watchtower_paths_location }}"- - ################################- # Web- ################################- - watchtower_web_subdomain: "{{ watchtower_name }}"- watchtower_web_domain: "{{ user.domain }}"- watchtower_web_port: "8080"- watchtower_host: "{{ lookup('vars', watchtower_name + '_web_subdomain', default=watchtower_web_subdomain)-                              + '.' + lookup('vars', watchtower_name + '_web_domain', default=watchtower_web_domain) }}"- - ################################- # DNS- ################################- - watchtower_dns_record: "{{ lookup('vars', watchtower_name + '_web_subdomain', default=watchtower_web_subdomain) }}"- watchtower_dns_zone: "{{ lookup('vars', watchtower_name + '_web_domain', default=watchtower_web_domain) }}"- watchtower_dns_proxy: "{{ dns.proxied }}"- - ################################- # Traefik- ################################- - watchtower_traefik_sso_middleware: ""- watchtower_traefik_middleware_default: "{{ traefik_default_middleware }}"- watchtower_traefik_middleware_custom: ""- watchtower_traefik_certresolver: "{{ traefik_default_certresolver }}"- watchtower_traefik_enabled: "{{ true if (watchtower_metrics_enable and watchtower_metrics_externa) else false }}"- watchtower_traefik_api_enabled: false- watchtower_traefik_api_endpoint: ""- - ################################- # Docker- ################################- - # Container- watchtower_docker_container: "{{ watchtower_name }}"- - # Image- watchtower_docker_image_pull: true- watchtower_docker_image_repo: "containrrr/watchtower"- watchtower_docker_image_tag: "latest"- watchtower_docker_image: "{{ lookup('vars', watchtower_name + '_docker_image_repo', default=watchtower_docker_image_repo)-                              + ':' + lookup('vars', watchtower_name + '_docker_image_tag', default=watchtower_docker_image_tag) }}"- - # Envs- watchtower_docker_envs_default:-   TZ: "{{ tz }}"-   WATCHTOWER_CLEANUP: "true"-   WATCHTOWER_POLL_INTERVAL: "{{ watchtower_poll_interval }}"-   WATCHTOWER_HTTP_API_METRICS: "{{ 'true' if watchtower_metrics_enable else omit }}"- watchtower_docker_envs_custom: {}- watchtower_docker_envs: "{{ lookup('vars', watchtower_name + '_docker_envs_default', default=watchtower_docker_envs_default)-                             | combine(lookup('vars', watchtower_name + '_docker_envs_custom', default=watchtower_docker_envs_custom)) }}"- watchtower_docker_env_file: "{{ watchtower_paths_location + '/watchtower.env' if watchtower_env.stat.exists else omit }}"- - # Commands- watchtower_docker_commands_default: []- watchtower_docker_commands_custom: []- watchtower_docker_commands: "{{ lookup('vars', watchtower_name + '_docker_commands_default', default=watchtower_docker_commands_default)-                                 + lookup('vars', watchtower_name + '_docker_commands_custom', default=watchtower_docker_commands_custom) }}"- - - # Volumes- watchtower_docker_volumes_default:-   - "/var/run/docker.sock:/var/run/docker.sock"- watchtower_docker_volumes_custom: []- watchtower_docker_volumes: "{{ lookup('vars', watchtower_name + '_docker_volumes_default', default=watchtower_docker_volumes_default)-                                + lookup('vars', watchtower_name + '_docker_volumes_custom', default=watchtower_docker_volumes_custom) }}"- - # Devices- watchtower_docker_devices_default: []- watchtower_docker_devices_custom: []- watchtower_docker_devices: "{{ lookup('vars', watchtower_name + '_docker_devices_default', default=watchtower_docker_devices_default)-                                + lookup('vars', watchtower_name + '_docker_devices_custom', default=watchtower_docker_devices_custom) }}"- - # Hosts- watchtower_docker_hosts_default: {}- watchtower_docker_hosts_custom: {}- watchtower_docker_hosts: "{{ docker_hosts_common-                              | combine(lookup('vars', watchtower_name + '_docker_hosts_default', default=watchtower_docker_hosts_default))-                              | combine(lookup('vars', watchtower_name + '_docker_hosts_custom', default=watchtower_docker_hosts_custom)) }}"- - # Labels- watchtower_docker_labels_default: {}- watchtower_docker_labels_custom: {}- watchtower_docker_labels: "{{ docker_labels_common-                              | combine(lookup('vars', watchtower_name + '_docker_labels_default', default=watchtower_docker_labels_default))-                              | combine(lookup('vars', watchtower_name + '_docker_labels_custom', default=watchtower_docker_labels_custom)) }}"- - # Hostname- watchtower_docker_hostname: "{{ watchtower_name }}"- - # Network Mode- watchtower_docker_network_mode_default: "{{ docker_networks_name_common }}"- watchtower_docker_network_mode: "{{ lookup('vars', watchtower_name + '_docker_network_mode_default', default=watchtower_docker_network_mode_default) }}"- - # Networks- watchtower_docker_networks_alias: "{{ watchtower_name }}"- watchtower_docker_networks_default: []- watchtower_docker_networks_custom: []- watchtower_docker_networks: "{{ docker_networks_common-                                 + lookup('vars', watchtower_name + '_docker_networks_default', default=watchtower_docker_networks_default)-                                 + lookup('vars', watchtower_name + '_docker_networks_custom', default=watchtower_docker_networks_custom) }}"- - # Capabilities- watchtower_docker_capabilities_default: []- watchtower_docker_capabilities_custom: []- watchtower_docker_capabilities: "{{ lookup('vars', watchtower_name + '_docker_capabilities_default', default=watchtower_docker_capabilities_default)-                                     + lookup('vars', watchtower_name + '_docker_capabilities_custom', default=watchtower_docker_capabilities_custom) }}"- - # Security Opts- watchtower_docker_security_opts_default: []- watchtower_docker_security_opts_custom: []- watchtower_docker_security_opts: "{{ lookup('vars', watchtower_name + '_docker_security_opts_default', default=watchtower_docker_security_opts_default)-                                      + lookup('vars', watchtower_name + '_docker_security_opts_custom', default=watchtower_docker_security_opts_custom) }}"- - # Restart Policy- watchtower_docker_restart_policy: unless-stopped- - # State- watchtower_docker_state: started

- #########################################################################- # Title:         Sandbox: Watchower Role                                #- # Author(s):     l3uddz, salty, owine                                   #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: "Execute Watchtower roles"-   ansible.builtin.include_tasks: main2.yml-   vars:-     watchtower_name: "{{ instance }}"-   with_items: "{{ watchtower_instances }}"-   loop_control:-     loop_var: instance

- #########################################################################- # Title:         Sandbox: Watchower Role                                #- # Author(s):     l3uddz, salty, owine                                   #- # URL:           https://github.com/saltyorg/Sandbox                    #- # --                                                                    #- #########################################################################- #                   GNU General Public License v3.0                     #- #########################################################################- ---- - name: Add DNS record-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"-   vars:-     dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-     dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-     dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"- - - name: Remove existing Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"- - - name: Create directories-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"- - - name: "Check if watchtower.env file exists"-   ansible.builtin.stat:-     path: "{{ watchtower_paths_location }}/watchtower.env"-   register: watchtower_env- - - name: Create Docker container-   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"

- import os- import sys- - def lint_ansible_defaults(content, file_path):-     errors = []-     lines = content.split('\n')-     -     multi_line_jinja_start = None-     within_multi_line_jinja = False- -     for line_no, line in enumerate(lines, start=1):-         stripped_line = line.strip()- -         if stripped_line == '---':-             continue- -         if '{{' in stripped_line and not within_multi_line_jinja:-             multi_line_jinja_start = line.find('{{')-             within_multi_line_jinja = '}}' not in stripped_line- -         elif within_multi_line_jinja:-             if 'if' in stripped_line or 'else' in stripped_line:-                 if line.find('if') < multi_line_jinja_start and line.find('else') < multi_line_jinja_start:-                     message = f"'if/else' within Jinja expression should align with the start."-                     errors.append((line_no, message))- -             if '}}' in stripped_line:-                 within_multi_line_jinja = False- -         if '}}' in stripped_line and within_multi_line_jinja:-             within_multi_line_jinja = False- -     for error in errors:-         line_no, message = error-         print(f"::warning file={file_path},line={line_no},endLine={line_no},title=Salty Lint Error::{message}")- -     return len(errors) > 0- - def crawl_and_lint_ansible_roles(roles_dir):-     errors_found = False- -     if not os.path.exists(roles_dir):-         print("Roles directory does not exist.")-         return- -     for role_name in os.listdir(roles_dir):-         defaults_main_path = os.path.join(roles_dir, role_name, "defaults", "main.yml")-         if os.path.isfile(defaults_main_path):-             with open(defaults_main_path, 'r') as file:-                 content = file.read()-                 if lint_ansible_defaults(content, defaults_main_path):-                     errors_found = True- -     sys.exit(1 if errors_found else 0)- - if len(sys.argv) < 2:-     print("Usage: python script.py /path/to/your/ansible/roles")-     sys.exit(1)- - roles_directory_path = sys.argv[1]- crawl_and_lint_ansible_roles(roles_directory_path)

@@ -5,27 +5,24 @@   - bin/   - defaults/ -offline: False+offline: false  mock_roles:   - pre_tasks   - user_check  skip_list:-  - braces-  - git-latest-  - no-changed-when-  - ignore-errors-  - risky-shell-pipe-  - package-latest-  - no-handler   - command-instead-of-module   - command-instead-of-shell-  - deprecated-command-syntax-  - yaml[line-length]-  - yaml[truthy]-  - schema[tasks]+  - ignore-errors+  - latest[git]   - name[casing]   - name[template]+  - no-changed-when+  - no-handler+  - package-latest+  - risky-shell-pipe+  - schema[playbook]+  - schema[tasks]   - var-naming[no-role-prefix]-  - schema[playbook]+  - yaml[line-length]

@@ -13,7 +13,7 @@     },     "baseBranches": [         "$default",-        "role-refactor"+        "role-factor"     ],      "labels": [         "dependencies"

@@ -7,7 +7,7 @@   add-contributors:     runs-on: ubuntu-latest     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6        - uses: BobAnkh/add-contributors@master         with:

@@ -14,7 +14,7 @@     runs-on: ubuntu-24.04     if: github.event.repository.fork == false && (github.event.workflow_run.conclusion == 'success' || (github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt >= 3) || github.event.workflow_run.conclusion == 'cancelled')     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6        - name: Send notification         env:

@@ -12,7 +12,7 @@  jobs:   rerun:-    runs-on: ubuntu-latest+    runs-on: ubuntu-24.04     if: ${{ github.event.workflow_run.conclusion == 'failure' }}     steps:       - name: Check attempt count@@ -30,8 +30,30 @@             echo "attempt_allowed=false" >> $GITHUB_OUTPUT           fi +      - name: Check for lint failures+        id: check_lint+        if: steps.check_attempts.outputs.attempt_allowed == 'true'+        env:+          GH_TOKEN: ${{ github.token }}+          GH_REPO: ${{ github.repository }}+        run: |+          failed_jobs=$(gh run view ${{ github.event.workflow_run.id }} --json jobs -q '.jobs[] | select(.conclusion == "failure") | .name')++          if echo "$failed_jobs" | grep -qE '^(ansible-lint|defaults-lint)$'; then+            echo "Lint job failed - skipping retry"+            echo "skip_retry=true" >> $GITHUB_OUTPUT+          else+            echo "No lint failures detected"+            echo "skip_retry=false" >> $GITHUB_OUTPUT+          fi++      - name: Sleep for 60 seconds+        if: steps.check_attempts.outputs.attempt_allowed == 'true' && steps.check_lint.outputs.skip_retry != 'true'+        run: sleep 60s+        shell: bash+       - name: rerun ${{ github.event.workflow_run.id }}-        if: steps.check_attempts.outputs.attempt_allowed == 'true'+        if: steps.check_attempts.outputs.attempt_allowed == 'true' && steps.check_lint.outputs.skip_retry != 'true'         env:           GH_REPO: ${{ github.repository }}           GH_TOKEN: ${{ github.token }}

@@ -8,15 +8,16 @@     if: github.event_name == 'pull_request' || !(github.event_name == 'push' && github.actor == 'renovate[bot]')     runs-on: ubuntu-24.04     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6         with:           path: sandbox        - name: Checkout Saltbox repository-        uses: actions/checkout@v5+        uses: actions/checkout@v6         with:           repository: saltyorg/Saltbox           path: saltbox+          ref: role-refactor  # Remove branch once we move to master        - name: Create Directories         run: sudo mkdir -p /srv/git@@ -29,7 +30,7 @@        - uses: actions/setup-python@v6         with:-          python-version: '3.13'+          python-version: '3.14'           cache: 'pip'           cache-dependency-path: 'saltbox/requirements/requirements-saltbox.txt' @@ -40,14 +41,24 @@         working-directory: ${{ github.workspace }}/sandbox         run: ansible-lint -      - name: Run salty linter-        run: python3 ./sandbox/scripts/salty-linter.py ./roles+  defaults-lint:+    if: github.event_name == 'pull_request' || !(github.event_name == 'push' && github.actor == 'renovate[bot]')+    runs-on: ubuntu-24.04+    steps:+      - uses: actions/checkout@v6++      - uses: actions/setup-python@v6+        with:+          python-version: '3.14'++      - name: Run Defaults Linter+        run: python3 scripts/saltbox-defaults-linter.py roles/    check-entries:     if: github.event_name == 'pull_request' || !(github.event_name == 'push' && github.actor == 'renovate[bot]')     runs-on: ubuntu-24.04     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6        - name: Check Missing Entries         run: ./scripts/check_missing_entries.sh@@ -58,56 +69,88 @@     outputs:       matrix: ${{ steps.set-matrix.outputs.matrix }}     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6       - id: set-matrix         run: |           ROLES=$(awk '/# Apps Start/{flag=1;next}/# Apps End/{flag=0}flag' sandbox.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/')-          echo "matrix={\"roles\":[$ROLES],\"os\":[\"20.04\",\"22.04\",\"24.04\"]}" >> $GITHUB_OUTPUT+          echo "matrix={\"roles\":[$ROLES],\"os\":[\"22.04\",\"24.04\"]}" >> $GITHUB_OUTPUT    install:     name: '${{ matrix.roles }}-${{ matrix.os }}'     runs-on: ubuntu-${{ matrix.os }}-    needs: [ansible-lint, find-roles]+    needs: [ansible-lint, defaults-lint, find-roles]     strategy:       matrix: ${{ fromJson(needs.find-roles.outputs.matrix) }}       fail-fast: false     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6++      - name: Install sb binary+        uses: jaxxstorm/action-install-gh-release@v2.1.0+        with:+          repo: saltyorg/sb-go+          tag: latest+          extension-matching: disable+          platform: linux+          arch: amd64+          rename-to: sb+          chmod: "0755"++      - name: Check sb version+        run: |+          sudo mv /opt/hostedtoolcache/saltyorg/sb-go/latest/linux-amd64/sb /usr/local/bin/sb+          /usr/local/bin/sb version        - name: Install Dependencies-        run: curl https://raw.githubusercontent.com/saltyorg/sb/master/sb_install.sh --output sb_install.sh && sudo bash sb_install.sh -v && ansible --version+        run: /usr/local/bin/sb setup -v -b role-refactor && /srv/ansible/venv/bin/ansible --version # Remove branch flag once we move to master        - name: Chown /srv/git         run: sudo chown -R runner:runner /srv/git        - name: Print pip dependencies-        run: cat /srv/git/sb/requirements-saltbox.txt+        run: cat /srv/git/saltbox/requirements/requirements-saltbox.txt        - name: Edit accounts.yml         run: cd /srv/git/saltbox && sed -i 's/seed/runner/g' accounts.yml -      - name: Create, chown and chmod /tmp/ansible-        run: sudo mkdir /tmp/ansible && sudo chown -R runner:runner /tmp/ansible && chmod 0777 /tmp/ansible-       - name: Syntax Check         run: cd /srv/git/saltbox && sudo ansible-playbook saltbox.yml --syntax-check++      - name: Create basic vars file+        run: |+          echo "continuous_integration: true" > /tmp/vars.yml+          echo "server_appdata_path: /opt2" >> /tmp/vars.yml+          sudo mkdir -p /opt2        - name: Create CI vars file         if: github.repository == 'saltyorg/Sandbox' && github.event.repository.fork == false         run: |-          echo "continuous_integration: true" > /tmp/vars.yml           echo "dockerhub:" >> /tmp/vars.yml           echo "  token: ${{ secrets.DOCKERHUB_TOKEN }}" >> /tmp/vars.yml           echo "  user: ${{ secrets.DOCKERHUB_USERNAME }}" >> /tmp/vars.yml++      - name: Install Saltbox Preinstall+        run: cd /srv/git/saltbox && sudo /srv/ansible/venv/bin/ansible-playbook saltbox.yml --tags "preinstall" --skip-tags "settings" --extra-vars "@/tmp/vars.yml"++      - name: Run saltbox.fact+        run: /srv/git/saltbox/ansible_facts.d/saltbox.fact        - name: Install Saltbox Core         run: cd /srv/git/saltbox && sudo ansible-playbook saltbox.yml --tags "core" --skip-tags "settings" --extra-vars "@/tmp/vars.yml"        - name: Copy default configuration-        run: cp -n defaults/settings.yml.default settings.yml+        run: |+          if touch /tmp/test1 && cp --update=none /tmp/test1 /tmp/test2 2>/dev/null; then+             && cp --update=none defaults/settings.yml.default settings.yml+          else+            cp -n defaults/settings.yml.default settings.yml+          fi        - name: Install ${{ matrix.roles }}         run: sudo ansible-playbook sandbox.yml --tags "${{ matrix.roles }}" --skip-tags "settings" --extra-vars "@/tmp/vars.yml"++      - name: Run Tree on app data folder+        run: sudo tree -aug /opt2        - name: Inspect all Docker containers         run: |

@@ -21,15 +21,16 @@     if: github.event_name == 'pull_request' || !(github.event_name == 'push' && github.actor == 'renovate[bot]')     runs-on: ubuntu-24.04     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6         with:           path: sandbox        - name: Checkout Saltbox repository-        uses: actions/checkout@v5+        uses: actions/checkout@v6         with:           repository: saltyorg/Saltbox           path: saltbox+          ref: role-refactor  # Remove branch once we move to master        - name: Create Directories         run: sudo mkdir -p /srv/git@@ -42,7 +43,7 @@        - uses: actions/setup-python@v6         with:-          python-version: '3.13'+          python-version: '3.14'           cache: 'pip'           cache-dependency-path: 'saltbox/requirements/requirements-saltbox.txt' @@ -53,14 +54,24 @@         working-directory: ${{ github.workspace }}/sandbox         run: ansible-lint -      - name: Run salty linter-        run: python3 ./sandbox/scripts/salty-linter.py ./roles+  defaults-lint:+    if: github.event_name == 'pull_request' || !(github.event_name == 'push' && github.actor == 'renovate[bot]')+    runs-on: ubuntu-24.04+    steps:+      - uses: actions/checkout@v6++      - uses: actions/setup-python@v6+        with:+          python-version: '3.14'++      - name: Run Defaults Linter+        run: python3 scripts/saltbox-defaults-linter.py roles/    check-entries:     if: github.event_name == 'pull_request' || !(github.event_name == 'push' && github.actor == 'renovate[bot]')     runs-on: ubuntu-24.04     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6        - name: Check Missing Entries         run: ./scripts/check_missing_entries.sh@@ -71,54 +82,81 @@     outputs:       matrix: ${{ steps.set-matrix.outputs.matrix }}     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6       - id: set-matrix         run: echo "matrix={\"roles\":[$(awk '/# Apps Start/{flag=1;next}/# Apps End/{flag=0}flag' sandbox.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/')]}" >> $GITHUB_OUTPUT    install:     name: '${{ matrix.roles }}'-    needs: [ansible-lint, check-entries, find-roles]+    needs: [ansible-lint, defaults-lint, check-entries, find-roles]     runs-on: ubuntu-24.04     strategy:       matrix: ${{ fromJson(needs.find-roles.outputs.matrix) }}       fail-fast: false     steps:-      - uses: actions/checkout@v5+      - uses: actions/checkout@v6++      - name: Install sb binary+        uses: jaxxstorm/action-install-gh-release@v2.1.0+        with:+          repo: saltyorg/sb-go+          tag: latest+          extension-matching: disable+          platform: linux+          arch: amd64+          rename-to: sb+          chmod: "0755"++      - name: Check sb version+        run: |+          sudo mv /opt/hostedtoolcache/saltyorg/sb-go/latest/linux-amd64/sb /usr/local/bin/sb+          /usr/local/bin/sb version        - name: Install Dependencies-        run: curl https://raw.githubusercontent.com/saltyorg/sb/master/sb_install.sh --output sb_install.sh && sudo bash sb_install.sh -v && ansible --version+        run: /usr/local/bin/sb setup -v -b role-refactor && /srv/ansible/venv/bin/ansible --version # Remove branch flag once we move to master        - name: Chown /srv/git         run: sudo chown -R runner:runner /srv/git        - name: Print pip dependencies-        run: cat /srv/git/sb/requirements-saltbox.txt+        run: cat /srv/git/saltbox/requirements/requirements-saltbox.txt        - name: Edit accounts.yml         run: cd /srv/git/saltbox && sed -i 's/seed/runner/g' accounts.yml -      - name: Create, chown and chmod /tmp/ansible-        run: sudo mkdir /tmp/ansible && sudo chown -R runner:runner /tmp/ansible && chmod 0777 /tmp/ansible-       - name: Syntax Check         run: cd /srv/git/saltbox && sudo ansible-playbook saltbox.yml --syntax-check +      - name: Create basic vars file+        run: |+          echo "continuous_integration: true" > /tmp/vars.yml+          echo "server_appdata_path: /opt2" >> /tmp/vars.yml+          sudo mkdir -p /opt2+       - name: Create CI vars file         if: github.repository == 'saltyorg/Sandbox' && github.event.repository.fork == false         run: |-          echo "continuous_integration: true" > /tmp/vars.yml           echo "dockerhub:" >> /tmp/vars.yml           echo "  token: ${{ secrets.DOCKERHUB_TOKEN }}" >> /tmp/vars.yml           echo "  user: ${{ secrets.DOCKERHUB_USERNAME }}" >> /tmp/vars.yml +      - name: Install Saltbox Preinstall+        run: cd /srv/git/saltbox && sudo /srv/ansible/venv/bin/ansible-playbook saltbox.yml --tags "preinstall" --skip-tags "settings" --extra-vars "@/tmp/vars.yml"++      - name: Run saltbox.fact+        run: /srv/git/saltbox/ansible_facts.d/saltbox.fact+       - name: Install Saltbox Core         run: cd /srv/git/saltbox && sudo ansible-playbook saltbox.yml --tags "core" --skip-tags "settings" --extra-vars "@/tmp/vars.yml"        - name: Copy default configuration-        run: cp -n defaults/settings.yml.default settings.yml+        run: cp --update=none defaults/settings.yml.default settings.yml        - name: Install ${{ matrix.roles }}         run: sudo ansible-playbook sandbox.yml --tags "${{ matrix.roles }}" --skip-tags "settings" --extra-vars "@/tmp/vars.yml"++      - name: Run Tree on app data folder+        run: sudo tree -aug /opt2        - name: Inspect all Docker containers         run: |

@@ -2,6 +2,7 @@ inventory = /srv/git/saltbox/inventories/local roles_path = roles:/srv/git/saltbox/roles:/srv/git/saltbox/resources/roles filter_plugins = /srv/git/saltbox/filter_plugins+lookup_plugins = /srv/git/saltbox/lookup_plugins library = /srv/git/saltbox/library log_path = ./sandbox.log callbacks_enabled = profile_tasks

@@ -1,36 +1,8 @@ ----a_train:-  remotes: [""]-delugevpn:-  vpn_endpoint: netherlands.ovpn-  vpn_pass: your_vpn_password-  vpn_prov: pia-  vpn_user: your_vpn_username-  vpn_client: wireguard-doplarr:-  discord_token: your_discord_bot_token-  overseerr_url: "http://overseerr:5055"-  overseerr_api:-  radarr_api:-  radarr_url:-  sonarr_api:-  sonarr_url:-  discord_max_results: 25-  discord_role_id:-  discord_requested_msg_style: ":plain"-  sonarr_quality_profile:-  radarr_quality_profile:-  sonarr_language_profile:-  overseer_default_id:-  partial_seasons: "true"-  log_level: ":info" foundry:   user: your_foundryvtt_username   pass: your_foundryvtt_password   app_key: your_foundryvtt_license-goplaxt:-  trakt_id: ~-  trakt_secret: ~ handbrake:   handbrake_pass: saltbox invoiceninja:@@ -66,19 +38,9 @@   vpn_prov: pia   vpn_user: your_vpn_username   vpn_client: wireguard-recyclarr:-  cron_schedule: "@daily"-  sleeptime:-  rc_port:-  rc_user:-  rc_pass:-  apprise: tqm:   download_client: "qbt" transmissionvpn:   vpn_user:   vpn_pass:   vpn_prov:-your_spotify:-  public_key:-  secret_key:

@@ -14,97 +14,66 @@ a_train_name: a-train  ################################+# Settings+################################++a_train_role_remotes: [""]++################################ # Paths ################################ -a_train_paths_folder: "{{ a_train_name }}"-a_train_paths_location: "{{ server_appdata_path }}/{{ a_train_paths_folder }}"-a_train_paths_config_location: "{{ a_train_paths_location }}/a-train.toml"-a_train_paths_sa_location: "{{ a_train_paths_location }}/account.json"-a_train_paths_rclone_config_location: "/home/{{ user.name }}/.config/rclone/rclone.conf"-a_train_paths_folders_list:-  - "{{ a_train_paths_location }}"+a_train_role_paths_folder: "{{ a_train_name }}"+a_train_role_paths_location: "{{ server_appdata_path }}/{{ a_train_role_paths_folder }}"+a_train_role_paths_config_location: "{{ a_train_role_paths_location }}/a-train.toml"+a_train_role_paths_sa_location: "{{ a_train_role_paths_location }}/account.json"+a_train_role_paths_rclone_config_location: "/home/{{ user.name }}/.config/rclone/rclone.conf"+a_train_role_paths_folders_list:+  - "{{ a_train_role_paths_location }}"  ################################ # Docker ################################  # Container-a_train_docker_container: "{{ a_train_name }}"+a_train_role_docker_container: "{{ a_train_name }}"  # Image-a_train_docker_image_pull: true-a_train_docker_image_tag: "latest"-a_train_docker_image: "ghcr.io/m-rots/a-train:{{ a_train_docker_image_tag }}"+a_train_role_docker_image_pull: true+a_train_role_docker_image_repo: "ghcr.io/m-rots/a-train"+a_train_role_docker_image_tag: "latest"+a_train_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='a_train') }}:{{ lookup('role_var', '_docker_image_tag', role='a_train') }}"  # Envs-a_train_docker_envs_default:+a_train_role_docker_envs_default:   TZ: "{{ tz }}"-a_train_docker_envs_custom: {}-a_train_docker_envs: "{{ a_train_docker_envs_default-                         | combine(a_train_docker_envs_custom) }}"--# Commands-a_train_docker_commands_default: []-a_train_docker_commands_custom: []-a_train_docker_commands: "{{ a_train_docker_commands_default-                             + a_train_docker_commands_custom }}"+a_train_role_docker_envs_custom: {}+a_train_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='a_train')+                              | combine(lookup('role_var', '_docker_envs_custom', role='a_train')) }}"  # Volumes-a_train_docker_volumes_default:-  - "{{ a_train_paths_location }}:/data"-a_train_docker_volumes_custom: []-a_train_docker_volumes: "{{ a_train_docker_volumes_default-                            + a_train_docker_volumes_custom }}"--# Devices-a_train_docker_devices_default: []-a_train_docker_devices_custom: []-a_train_docker_devices: "{{ a_train_docker_devices_default-                            + a_train_docker_devices_custom }}"--# Hosts-a_train_docker_hosts_default: {}-a_train_docker_hosts_custom: {}-a_train_docker_hosts: "{{ docker_hosts_common-                          | combine(a_train_docker_hosts_default)-                          | combine(a_train_docker_hosts_custom) }}"--# Labels-a_train_docker_labels_default: {}-a_train_docker_labels_custom: {}-a_train_docker_labels: "{{ docker_labels_common-                           | combine(a_train_docker_labels_default)-                           | combine(a_train_docker_labels_custom) }}"+a_train_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='a_train') }}:/data"+a_train_role_docker_volumes_custom: []+a_train_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='a_train')+                                 + lookup('role_var', '_docker_volumes_custom', role='a_train') }}"  # Hostname-a_train_docker_hostname: "{{ a_train_name }}"+a_train_role_docker_hostname: "{{ a_train_name }}"  # Networks-a_train_docker_networks_alias: "{{ a_train_name }}"-a_train_docker_networks_default: []-a_train_docker_networks_custom: []-a_train_docker_networks: "{{ docker_networks_common-                             + a_train_docker_networks_default-                             + a_train_docker_networks_custom }}"--# Capabilities-a_train_docker_capabilities_default: []-a_train_docker_capabilities_custom: []-a_train_docker_capabilities: "{{ a_train_docker_capabilities_default-                                 + a_train_docker_capabilities_custom }}"--# Security Opts-a_train_docker_security_opts_default: []-a_train_docker_security_opts_custom: []-a_train_docker_security_opts: "{{ a_train_docker_security_opts_default-                                  + a_train_docker_security_opts_custom }}"+a_train_role_docker_networks_alias: "{{ a_train_name }}"+a_train_role_docker_networks_default: []+a_train_role_docker_networks_custom: []+a_train_role_docker_networks: "{{ docker_networks_common+                                  + lookup('role_var', '_docker_networks_default', role='a_train')+                                  + lookup('role_var', '_docker_networks_custom', role='a_train') }}"  # Restart Policy-a_train_docker_restart_policy: unless-stopped+a_train_role_docker_restart_policy: unless-stopped  # State-a_train_docker_state: started+a_train_role_docker_state: started  # User-a_train_docker_user: "{{ uid }}:{{ gid }}"+a_train_role_docker_user: "{{ uid }}:{{ gid }}"

@@ -16,7 +16,7 @@ - name: Set Default Autoscan instance   ansible.builtin.set_fact:     autoscan_name: "{{ autoscan_instances[0] }}"-  when: not autoscan_name is defined+  when: (not autoscan_name is defined)  - name: Import Settings task   ansible.builtin.import_tasks: "subtasks/settings.yml"

@@ -7,15 +7,17 @@ #                   GNU General Public License v3.0                     # ######################################################################### ---- - name: Get remote types from rclone config-  ansible.builtin.shell: "echo {{ lookup('ini', 'type', section=item, file=a_train_paths_rclone_config_location) }}"-  with_items: "{{ a_train.remotes }}"+  ansible.builtin.shell: "echo {{ lookup('ini', 'type', section=item, file=lookup('role_var', '_paths_rclone_config_location', role='a_train')) }}"+  with_items: "{{ lookup('role_var', '_remotes', role='a_train') }}"   register: remote_type -- name: Set variable for remote types+- name: Set variable for remote types along with empty default variables   ansible.builtin.set_fact:     remote_type_var: "{{ remote_type.results | map(attribute='stdout') }}"+    drive_id: []+    union_id: []+    td_id_var: []  - name: Fail if remote type is crypt   ansible.builtin.fail:@@ -30,7 +32,7 @@         drive_remotes: "{{ remote_type.results | selectattr('stdout', '==', 'drive') | map(attribute='item') }}"      - name: Get the ID of the teamdrives-      ansible.builtin.shell: "echo {{ lookup('ini', 'team_drive', section=item, file=a_train_paths_rclone_config_location) }}"+      ansible.builtin.shell: "echo {{ lookup('ini', 'team_drive', section=item, file=lookup('role_var', '_paths_rclone_config_location', role='a_train')) }}"       register: drive_id_var       loop: "{{ drive_remotes }}" @@ -46,27 +48,27 @@         union_remotes: "{{ remote_type.results | selectattr('stdout', '==', 'union') | map(attribute='item') }}"      - name: Get the upstreams-      ansible.builtin.shell: "echo {{ lookup('ini', 'upstreams', section=item, file=a_train_paths_rclone_config_location) }}"+      ansible.builtin.shell: "echo {{ lookup('ini', 'upstreams', section=item, file=lookup('role_var', '_paths_rclone_config_location', role='a_train')) }}"       with_items: "{{ union_remotes }}"       register: union_upstreams_var      - name: Set variable for upstreams       ansible.builtin.set_fact:-        union_upstreams: "{{ union_upstreams_var.results[0].stdout.split(separator) | replace(':', '') }}"+        union_upstreams: "{{ union_upstreams_var.results[0].stdout.split(separator) | map('replace', ':', '') }}"       vars:         separator: ': '       when: '": " in union_upstreams_var.results[0].stdout'      - name: Set variable for upstreams when root folder is specified       ansible.builtin.set_fact:-        union_upstreams: "{{ union_upstreams_var.results[0].stdout.split(separator) | replace(':', '') | replace(secret_slash, '') }}"+        union_upstreams: "{{ union_upstreams_var.results[0].stdout.split(separator) | map('replace', ':', '') | map('replace', secret_slash, '') }}"       vars:         separator: '/ '         secret_slash: '/'       when: '"/" in union_upstreams_var.results[0].stdout'      - name: Get the ID of the teamdrives-      ansible.builtin.shell: "echo {{ lookup('ini', 'team_drive', section=item, file=a_train_paths_rclone_config_location) }}"+      ansible.builtin.shell: "echo {{ lookup('ini', 'team_drive', section=item, file=lookup('role_var', '_paths_rclone_config_location', role='a_train')) }}"       register: union_id_var       loop: "{{ union_upstreams }}" @@ -76,10 +78,7 @@  - name: Merge teamdrive ID of both union and drive remotes   ansible.builtin.set_fact:-    td_id_var: "{{ td_id_var | default([]) + item }}"-  loop:-    - "{{ drive_id | default([]) }}"-    - "{{ union_id | default([]) }}"+    td_id_var: "{{ drive_id + union_id }}"  - name: Set variable for merged ID of teamdrives   ansible.builtin.set_fact:

@@ -7,37 +7,36 @@ #                   GNU General Public License v3.0                     # ######################################################################### ------ name: Settings | Check if `{{ a_train_paths_sa_location | basename }}` exists+- name: Settings | Check if `{{ lookup('role_var', '_paths_sa_location', role='a_train') | basename }}` exists   ansible.builtin.stat:-    path: "{{ a_train_paths_sa_location }}"+    path: "{{ lookup('role_var', '_paths_sa_location', role='a_train') }}"   register: a_train_sa -- name: Settings | Check if `{{ a_train_paths_config_location | basename }}` exists+- name: Settings | Check if `{{ lookup('role_var', '_paths_config_location', role='a_train') | basename }}` exists   ansible.builtin.stat:-    path: "{{ a_train_paths_config_location }}"+    path: "{{ lookup('role_var', '_paths_config_location', role='a_train') }}"   register: a_train_config  - name: "Fail when 'account.json' is `not present`"   ansible.builtin.fail:-    msg: "You need to setup your service account file. Create a service account, add it to the team drives you wish to monitor and copy the json file as 'account.json' to `{{ a_train_paths_location }}`"-  when: (not a_train_sa.stat.exists) and (not continuous_integration)+    msg: "You need to setup your service account file. Create a service account, add it to the team drives you wish to monitor and copy the json file as 'account.json' to `{{ lookup('role_var', '_paths_location', role='a_train') }}`"+  when: (not continuous_integration) and (not a_train_sa.stat.exists)  - name: "Fail when remotes are `not added`"   ansible.builtin.fail:-    msg: "You need to add remotes you wish to monitor in the settings file."-  when: ("" in a_train.remotes) and (not a_train_config.stat.exists) and (not continuous_integration)+    msg: "You need to add remotes you wish to monitor in a_train_role_remotes using the inventory."+  when: (not continuous_integration) and (not a_train_config.stat.exists) and ("" in lookup('role_var', '_remotes', role='a_train')) -- name: Settings | New `{{ a_train_paths_config_location | basename }}` tasks-  when: (not a_train_config.stat.exists) and (not continuous_integration)+- name: Settings | New `{{ lookup('role_var', '_paths_config_location', role='a_train') | basename }}` tasks+  when: (not continuous_integration) and (not a_train_config.stat.exists)   block:     - name: Import Settings task       ansible.builtin.import_tasks: "config.yml" -    - name: Settings | Import default `{{ a_train_paths_config_location | basename }}`+    - name: Settings | Import default `{{ lookup('role_var', '_paths_config_location', role='a_train') | basename }}`       ansible.builtin.template:         src: a-train.toml.j2-        dest: "{{ a_train_paths_config_location }}"+        dest: "{{ lookup('role_var', '_paths_config_location', role='a_train') }}"         owner: "{{ user.name }}"         group: "{{ user.name }}"         mode: "0664"

@@ -1,7 +1,7 @@ # a-train.toml [autoscan] # Replace the URL with your Autoscan URL.-url = "{{ 'http://' + autoscan_docker_networks_alias + ':' + autoscan_web_port }}"+url = "{{ 'http://' + lookup('role_var', '_docker_networks_alias', role='autoscan') + ':' + lookup('role_var', '_web_port', role='autoscan') }}" username = "{{ user.name }}" password = "{{ user.pass }}" 

@@ -17,134 +17,88 @@ # Paths ################################ -actualbudget_paths_folder: "{{ actualbudget_name }}"-actualbudget_paths_location: "{{ server_appdata_path }}/{{ actualbudget_paths_folder }}"-actualbudget_paths_folders_list:-  - "{{ actualbudget_paths_location }}"-  - "{{ actualbudget_paths_location }}/server-files"-  - "{{ actualbudget_paths_location }}/user-files"+actualbudget_role_paths_folder: "{{ actualbudget_name }}"+actualbudget_role_paths_location: "{{ server_appdata_path }}/{{ actualbudget_role_paths_folder }}"+actualbudget_role_paths_folders_list:+  - "{{ actualbudget_role_paths_location }}"+  - "{{ actualbudget_role_paths_location }}/server-files"+  - "{{ actualbudget_role_paths_location }}/user-files"  ################################ # Web ################################ -actualbudget_web_subdomain: "{{ actualbudget_name }}"-actualbudget_web_domain: "{{ user.domain }}"-actualbudget_web_port: "5006"-actualbudget_web_url: "{{ 'https://' + (actualbudget_web_subdomain + '.' + actualbudget_web_domain-                       if (actualbudget_web_subdomain | length > 0)-                       else actualbudget_web_domain) }}"+actualbudget_role_web_subdomain: "{{ actualbudget_name }}"+actualbudget_role_web_domain: "{{ user.domain }}"+actualbudget_role_web_port: "5006"+actualbudget_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='actualbudget') + '.' + lookup('role_var', '_web_domain', role='actualbudget')+                            if (lookup('role_var', '_web_subdomain', role='actualbudget') | length > 0)+                            else lookup('role_var', '_web_domain', role='actualbudget')) }}"  ################################ # DNS ################################ -actualbudget_dns_record: "{{ actualbudget_web_subdomain }}"-actualbudget_dns_zone: "{{ actualbudget_web_domain }}"-actualbudget_dns_proxy: "{{ dns.proxied }}"+actualbudget_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='actualbudget') }}"+actualbudget_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='actualbudget') }}"+actualbudget_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -actualbudget_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-actualbudget_traefik_middleware_default: "{{ traefik_default_middleware }}"-actualbudget_traefik_certresolver: "{{ traefik_default_certresolver }}"-actualbudget_traefik_middleware_custom: ""-actualbudget_traefik_enabled: true-actualbudget_traefik_api_enabled: false-actualbudget_traefik_api_endpoint: ""+actualbudget_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+actualbudget_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+actualbudget_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+actualbudget_role_traefik_middleware_custom: ""+actualbudget_role_traefik_enabled: true+actualbudget_role_traefik_api_enabled: false+actualbudget_role_traefik_api_endpoint: ""  ################################ # Docker ################################  # Container-actualbudget_docker_container: "{{ actualbudget_name }}"+actualbudget_role_docker_container: "{{ actualbudget_name }}"  # Image-actualbudget_docker_image_pull: true-actualbudget_docker_image_tag: "latest"-actualbudget_docker_image: "actualbudget/actual-server:{{ actualbudget_docker_image_tag }}"--# Ports-actualbudget_docker_ports_defaults:-  - "{{ actualbudget_web_port }}"-actualbudget_docker_ports_custom: []-actualbudget_docker_ports: "{{ actualbudget_docker_ports_defaults-                               + actualbudget_docker_ports_custom-                            if (not reverse_proxy_is_enabled)-                            else actualbudget_docker_ports_custom }}"+actualbudget_role_docker_image_pull: true+actualbudget_role_docker_image_repo: "actualbudget/actual-server"+actualbudget_role_docker_image_tag: "latest"+actualbudget_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='actualbudget') }}:{{ lookup('role_var', '_docker_image_tag', role='actualbudget') }}"  # Envs-actualbudget_docker_envs_default:+actualbudget_role_docker_envs_default:   TZ: "{{ tz }}"-actualbudget_docker_envs_custom: {}-actualbudget_docker_envs: "{{ actualbudget_docker_envs_default-                              | combine(actualbudget_docker_envs_custom) }}"--# Commands-actualbudget_docker_commands_default: []-actualbudget_docker_commands_custom: []-actualbudget_docker_commands: "{{ actualbudget_docker_commands_default-                                  + actualbudget_docker_commands_custom }}"+actualbudget_role_docker_envs_custom: {}+actualbudget_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='actualbudget')+                                   | combine(lookup('role_var', '_docker_envs_custom', role='actualbudget')) }}"  # Volumes-actualbudget_docker_volumes_default:-  - "{{ actualbudget_paths_location }}:/data"+actualbudget_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='actualbudget') }}:/data"   - "/etc/localtime:/etc/localtime:ro"-actualbudget_docker_volumes_custom: []-actualbudget_docker_volumes: "{{ actualbudget_docker_volumes_default-                                 + actualbudget_docker_volumes_custom }}"--# Devices-actualbudget_docker_devices_default: []-actualbudget_docker_devices_custom: []-actualbudget_docker_devices: "{{ actualbudget_docker_devices_default-                                 + actualbudget_docker_devices_custom }}"--# Hosts-actualbudget_docker_hosts_default: []-actualbudget_docker_hosts_custom: []-actualbudget_docker_hosts: "{{ docker_hosts_common-                               | combine(actualbudget_docker_hosts_default)-                               | combine(actualbudget_docker_hosts_custom) }}"--# Labels-actualbudget_docker_labels_default: {}-actualbudget_docker_labels_custom: {}-actualbudget_docker_labels: "{{ docker_labels_common-                                | combine(actualbudget_docker_labels_default)-                                | combine(actualbudget_docker_labels_custom) }}"+actualbudget_role_docker_volumes_custom: []+actualbudget_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='actualbudget')+                                      + lookup('role_var', '_docker_volumes_custom', role='actualbudget') }}"  # Hostname-actualbudget_docker_hostname: "{{ actualbudget_name }}"+actualbudget_role_docker_hostname: "{{ actualbudget_name }}"  # Networks-actualbudget_docker_networks_alias: "{{ actualbudget_name }}"-actualbudget_docker_networks_default: []-actualbudget_docker_networks_custom: []-actualbudget_docker_networks: "{{ docker_networks_common-                                  + actualbudget_docker_networks_default-                                  + actualbudget_docker_networks_custom }}"--# Capabilities-actualbudget_docker_capabilities_default: []-actualbudget_docker_capabilities_custom: []-actualbudget_docker_capabilities: "{{ actualbudget_docker_capabilities_default-                                      + actualbudget_docker_capabilities_custom }}"--# Security Opts-actualbudget_docker_security_opts_default: []-actualbudget_docker_security_opts_custom: []-actualbudget_docker_security_opts: "{{ actualbudget_docker_security_opts_default-                                       + actualbudget_docker_security_opts_custom }}"+actualbudget_role_docker_networks_alias: "{{ actualbudget_name }}"+actualbudget_role_docker_networks_default: []+actualbudget_role_docker_networks_custom: []+actualbudget_role_docker_networks: "{{ docker_networks_common+                                       + lookup('role_var', '_docker_networks_default', role='actualbudget')+                                       + lookup('role_var', '_docker_networks_custom', role='actualbudget') }}"  # Restart Policy-actualbudget_docker_restart_policy: unless-stopped+actualbudget_role_docker_restart_policy: unless-stopped  # State-actualbudget_docker_state: started+actualbudget_role_docker_state: started  # User-actualbudget_docker_user: "{{ uid }}:{{ gid }}"+actualbudget_role_docker_user: "{{ uid }}:{{ gid }}"

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,132 +17,90 @@ # Paths ################################ -adguardhome_paths_folder: "{{ adguardhome_name }}"-adguardhome_paths_location: "{{ server_appdata_path }}/{{ adguardhome_paths_folder }}"-adguardhome_config_path: "{{ adguardhome_paths_location }}/conf/AdGuardHome.yaml"-adguardhome_paths_folders_list:-  - "{{ adguardhome_paths_location }}"-  - "{{ adguardhome_paths_location }}/conf"-  - "{{ adguardhome_paths_location }}/work"-  - "{{ adguardhome_paths_location }}/work/data"-  - "{{ adguardhome_paths_location }}/work/data/filters"+adguardhome_role_paths_folder: "{{ adguardhome_name }}"+adguardhome_role_paths_location: "{{ server_appdata_path }}/{{ adguardhome_role_paths_folder }}"+adguardhome_role_paths_config_path: "{{ adguardhome_role_paths_location }}/conf/AdGuardHome.yaml"+adguardhome_role_paths_folders_list:+  - "{{ adguardhome_role_paths_location }}"+  - "{{ adguardhome_role_paths_location }}/conf"+  - "{{ adguardhome_role_paths_location }}/work"+  - "{{ adguardhome_role_paths_location }}/work/data"+  - "{{ adguardhome_role_paths_location }}/work/data/filters"  ################################ # Web ################################ -adguardhome_web_subdomain: "{{ adguardhome_name }}"-adguardhome_web_domain: "{{ user.domain }}"-adguardhome_web_port: "3000"-adguardhome_web_url: "{{ 'https://' + (adguardhome_web_subdomain + '.' + adguardhome_web_domain-                      if (adguardhome_web_subdomain | length > 0)-                      else adguardhome_web_domain) }}"+adguardhome_role_web_subdomain: "{{ adguardhome_name }}"+adguardhome_role_web_domain: "{{ user.domain }}"+adguardhome_role_web_port: "3000"+adguardhome_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='adguardhome') + '.' + lookup('role_var', '_web_domain', role='adguardhome')+                           if (lookup('role_var', '_web_subdomain', role='adguardhome') | length > 0)+                           else lookup('role_var', '_web_domain', role='adguardhome')) }}"  ################################ # DNS ################################ -adguardhome_dns_record: "{{ adguardhome_web_subdomain }}"-adguardhome_dns_zone: "{{ adguardhome_web_domain }}"-adguardhome_dns_proxy: "{{ dns.proxied }}"+adguardhome_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='adguardhome') }}"+adguardhome_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='adguardhome') }}"+adguardhome_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -adguardhome_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-adguardhome_traefik_middleware_default: "{{ traefik_default_middleware }}"-adguardhome_traefik_middleware_custom: ""-adguardhome_traefik_certresolver: "{{ traefik_default_certresolver }}"-adguardhome_traefik_enabled: true-adguardhome_traefik_api_enabled: true-adguardhome_traefik_api_endpoint: "PathPrefix(`/dns-query`)"+adguardhome_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+adguardhome_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+adguardhome_role_traefik_middleware_custom: ""+adguardhome_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+adguardhome_role_traefik_enabled: true+adguardhome_role_traefik_api_enabled: true+adguardhome_role_traefik_api_endpoint: "PathPrefix(`/dns-query`)"  ################################ # Docker ################################  # Container-adguardhome_docker_container: "{{ adguardhome_name }}"+adguardhome_role_docker_container: "{{ adguardhome_name }}"  # Image-adguardhome_docker_image_pull: true-adguardhome_docker_image_tag: "latest"-adguardhome_docker_image: "adguard/adguardhome:{{ adguardhome_docker_image_tag }}"--# Ports-adguardhome_docker_ports_defaults: []-adguardhome_docker_ports_custom: []-adguardhome_docker_ports: "{{ adguardhome_docker_ports_defaults-                              + adguardhome_docker_ports_custom }}"+adguardhome_role_docker_image_pull: true+adguardhome_role_docker_image_repo: "adguard/adguardhome"+adguardhome_role_docker_image_tag: "latest"+adguardhome_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='adguardhome') }}:{{ lookup('role_var', '_docker_image_tag', role='adguardhome') }}"  # Envs-adguardhome_docker_envs_default:+adguardhome_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"-adguardhome_docker_envs_custom: {}-adguardhome_docker_envs: "{{ adguardhome_docker_envs_default-                             | combine(adguardhome_docker_envs_custom) }}"--# Commands-adguardhome_docker_commands_default: []-adguardhome_docker_commands_custom: []-adguardhome_docker_commands: "{{ adguardhome_docker_commands_default-                                 + adguardhome_docker_commands_custom }}"+adguardhome_role_docker_envs_custom: {}+adguardhome_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='adguardhome')+                                  | combine(lookup('role_var', '_docker_envs_custom', role='adguardhome')) }}"  # Volumes-adguardhome_docker_volumes_default:-  - "{{ adguardhome_paths_location }}/work:/opt/adguardhome/work"-  - "{{ adguardhome_paths_location }}/conf:/opt/adguardhome/conf"-adguardhome_docker_volumes_custom: []-adguardhome_docker_volumes: "{{ adguardhome_docker_volumes_default }}"--# Devices-adguardhome_docker_devices_default: []-adguardhome_docker_devices_custom: []-adguardhome_docker_devices: "{{ adguardhome_docker_devices_default-                                + adguardhome_docker_devices_custom }}"--# Hosts-adguardhome_docker_hosts_default: {}-adguardhome_docker_hosts_custom: {}-adguardhome_docker_hosts: "{{ docker_hosts_common-                              | combine(adguardhome_docker_hosts_default)-                              | combine(adguardhome_docker_hosts_custom) }}"--# Labels-adguardhome_docker_labels_default: {}-adguardhome_docker_labels_custom: {}-adguardhome_docker_labels: "{{ docker_labels_common-                               | combine(adguardhome_docker_labels_default)-                               | combine(adguardhome_docker_labels_custom) }}"+adguardhome_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='adguardhome') }}/work:/opt/adguardhome/work"+  - "{{ lookup('role_var', '_paths_location', role='adguardhome') }}/conf:/opt/adguardhome/conf"+adguardhome_role_docker_volumes_custom: []+adguardhome_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='adguardhome')+                                     + lookup('role_var', '_docker_volumes_custom', role='adguardhome') }}"  # Hostname-adguardhome_docker_hostname: "{{ adguardhome_name }}"+adguardhome_role_docker_hostname: "{{ adguardhome_name }}"  # Networks-adguardhome_docker_networks_alias: "{{ adguardhome_name }}"-adguardhome_docker_networks_default: []-adguardhome_docker_networks_custom: []-adguardhome_docker_networks: "{{ docker_networks_common-                                 + adguardhome_docker_networks_default-                                 + adguardhome_docker_networks_custom }}"--# Capabilities-adguardhome_docker_capabilities_default: []-adguardhome_docker_capabilities_custom: []-adguardhome_docker_capabilities: "{{ adguardhome_docker_capabilities_default-                                     + adguardhome_docker_capabilities_custom }}"--# Security Opts-adguardhome_docker_security_opts_default: []-adguardhome_docker_security_opts_custom: []-adguardhome_docker_security_opts: "{{ adguardhome_docker_security_opts_default-                                      + adguardhome_docker_security_opts_custom }}"+adguardhome_role_docker_networks_alias: "{{ adguardhome_name }}"+adguardhome_role_docker_networks_default: []+adguardhome_role_docker_networks_custom: []+adguardhome_role_docker_networks: "{{ docker_networks_common+                                      + lookup('role_var', '_docker_networks_default', role='adguardhome')+                                      + lookup('role_var', '_docker_networks_custom', role='adguardhome') }}"  # Restart Policy-adguardhome_docker_restart_policy: unless-stopped+adguardhome_role_docker_restart_policy: unless-stopped  # State-adguardhome_docker_state: started+adguardhome_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"@@ -22,7 +22,7 @@  - name: "Settings | Check if AdGuardHome.yaml exists"   ansible.builtin.stat:-    path: "{{ adguardhome_config_path }}"+    path: "{{ lookup('role_var', '_paths_config_path', role='adguardhome') }}"   register: adguardhome_config  - name: "Settings | New AdGuardHome.yaml tasks"@@ -31,7 +31,7 @@     - name: "Settings | Import AdGuardHome.yaml.j2"       ansible.builtin.template:         src: AdGuardHome.yaml.j2-        dest: '{{ adguardhome_config_path }}'+        dest: "{{ lookup('role_var', '_paths_config_path', role='adguardhome') }}"         owner: "{{ user.name }}"         group: "{{ user.name }}"         mode: "0664"

@@ -70,7 +70,7 @@   local_ptr_upstreams: [] tls:   enabled: true-  server_name: {{ adguardhome_web_subdomain }}.{{ adguardhome_web_domain }}+  server_name: {{ lookup('role_var', '_web_subdomain', role='adguardhome') }}.{{ lookup('role_var', '_web_domain', role='adguardhome') }}   force_https: false   port_https: 0   port_dns_over_tls: 0

@@ -17,113 +17,64 @@ # Web ################################ -adminer_web_subdomain: "{{ adminer_name }}"-adminer_web_domain: "{{ user.domain }}"-adminer_web_port: "8080"-adminer_web_url: "{{ 'https://' + (adminer_web_subdomain + '.' + adminer_web_domain-                  if (adminer_web_subdomain | length > 0)-                  else adminer_web_domain) }}"+adminer_role_web_subdomain: "{{ adminer_name }}"+adminer_role_web_domain: "{{ user.domain }}"+adminer_role_web_port: "8080"+adminer_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='adminer') + '.' + lookup('role_var', '_web_domain', role='adminer')+                       if (lookup('role_var', '_web_subdomain', role='adminer') | length > 0)+                       else lookup('role_var', '_web_domain', role='adminer')) }}"  ################################ # DNS ################################ -adminer_dns_record: "{{ adminer_web_subdomain }}"-adminer_dns_zone: "{{ adminer_web_domain }}"-adminer_dns_proxy: "{{ dns.proxied }}"+adminer_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='adminer') }}"+adminer_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='adminer') }}"+adminer_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -adminer_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-adminer_traefik_middleware_default: "{{ traefik_default_middleware }}"-adminer_traefik_middleware_custom: ""-adminer_traefik_certresolver: "{{ traefik_default_certresolver }}"-adminer_traefik_enabled: true+adminer_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+adminer_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+adminer_role_traefik_middleware_custom: ""+adminer_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+adminer_role_traefik_enabled: true  ################################ # Docker ################################  # Container-adminer_docker_container: "{{ adminer_name }}"+adminer_role_docker_container: "{{ adminer_name }}"  # Image-adminer_docker_image_pull: true-adminer_docker_image_tag: "latest"-adminer_docker_image: "adminer:{{ adminer_docker_image_tag }}"--# Ports-adminer_docker_ports_defaults: []-adminer_docker_ports_custom: []-adminer_docker_ports: "{{ adminer_docker_ports_defaults-                          + adminer_docker_ports_custom }}"+adminer_role_docker_image_pull: true+adminer_role_docker_image_repo: "adminer"+adminer_role_docker_image_tag: "latest"+adminer_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='adminer') }}:{{ lookup('role_var', '_docker_image_tag', role='adminer') }}"  # Envs-adminer_docker_envs_default:+adminer_role_docker_envs_default:   ADMINER_DEFAULT_SERVER: "mysql"-adminer_docker_envs_custom: {}-adminer_docker_envs: "{{ adminer_docker_envs_default-                         | combine(adminer_docker_envs_custom) }}"--# Commands-adminer_docker_commands_default: []-adminer_docker_commands_custom: []-adminer_docker_commands: "{{ adminer_docker_commands_default-                             + adminer_docker_commands_custom }}"--# Volumes-adminer_docker_volumes_default: []-adminer_docker_volumes_custom: []-adminer_docker_volumes: "{{ adminer_docker_volumes_default-                            + adminer_docker_volumes_custom }}"--# Devices-adminer_docker_devices_default: []-adminer_docker_devices_custom: []-adminer_docker_devices: "{{ adminer_docker_devices_default-                            + adminer_docker_devices_custom }}"--# Hosts-adminer_docker_hosts_default: {}-adminer_docker_hosts_custom: {}-adminer_docker_hosts: "{{ docker_hosts_common-                          | combine(adminer_docker_hosts_default)-                          | combine(adminer_docker_hosts_custom) }}"--# Labels-adminer_docker_labels_default: {}-adminer_docker_labels_custom: {}-adminer_docker_labels: "{{ docker_labels_common-                           | combine(adminer_docker_labels_default)-                           | combine(adminer_docker_labels_custom) }}"+adminer_role_docker_envs_custom: {}+adminer_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='adminer')+                              | combine(lookup('role_var', '_docker_envs_custom', role='adminer')) }}"  # Hostname-adminer_docker_hostname: "{{ adminer_name }}"+adminer_role_docker_hostname: "{{ adminer_name }}"  # Networks-adminer_docker_networks_alias: "{{ adminer_name }}"-adminer_docker_networks_default: []-adminer_docker_networks_custom: []-adminer_docker_networks: "{{ docker_networks_common-                             + adminer_docker_networks_default-                             + adminer_docker_networks_custom }}"--# Capabilities-adminer_docker_capabilities_default: []-adminer_docker_capabilities_custom: []-adminer_docker_capabilities: "{{ adminer_docker_capabilities_default-                                 + adminer_docker_capabilities_custom }}"--# Security Opts-adminer_docker_security_opts_default: []-adminer_docker_security_opts_custom: []-adminer_docker_security_opts: "{{ adminer_docker_security_opts_default-                                  + adminer_docker_security_opts_custom }}"+adminer_role_docker_networks_alias: "{{ adminer_name }}"+adminer_role_docker_networks_default: []+adminer_role_docker_networks_custom: []+adminer_role_docker_networks: "{{ docker_networks_common+                                  + lookup('role_var', '_docker_networks_default', role='adminer')+                                  + lookup('role_var', '_docker_networks_custom', role='adminer') }}"  # Restart Policy-adminer_docker_restart_policy: unless-stopped+adminer_role_docker_restart_policy: unless-stopped  # State-adminer_docker_state: started+adminer_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,138 +17,101 @@ # Paths ################################ -airdcpp_paths_folder: "{{ airdcpp_name }}"-airdcpp_paths_location: "{{ server_appdata_path }}/{{ airdcpp_paths_folder }}"-airdcpp_paths_folders_list:-  - "{{ airdcpp_paths_location }}"-  - /mnt/local/downloads/airdcpp-  - /mnt/local/downloads/airdcpp/Movies-  - /mnt/local/downloads/airdcpp/TV-  - /mnt/local/downloads/airdcpp/4K-  - /mnt/local/downloads/airdcpp/4K/Movies-  - /mnt/local/downloads/airdcpp/4K/TV+airdcpp_role_paths_folder: "{{ airdcpp_name }}"+airdcpp_role_paths_location: "{{ server_appdata_path }}/{{ airdcpp_role_paths_folder }}"+airdcpp_role_paths_folders_list:+  - "{{ airdcpp_role_paths_location }}"+  - "{{ server_local_folder_path }}/downloads/airdcpp"+  - "{{ server_local_folder_path }}/downloads/airdcpp/Movies"+  - "{{ server_local_folder_path }}/downloads/airdcpp/TV"+  - "{{ server_local_folder_path }}/downloads/airdcpp/4K"+  - "{{ server_local_folder_path }}/downloads/airdcpp/4K/Movies"+  - "{{ server_local_folder_path }}/downloads/airdcpp/4K/TV"  ################################ # Web ################################ -airdcpp_web_subdomain: "{{ airdcpp_name }}"-airdcpp_web_domain: "{{ user.domain }}"-airdcpp_web_port: "5600"-airdcpp_web_url: "{{ 'https://' + (airdcpp_web_subdomain + '.' + airdcpp_web_domain-                  if (airdcpp_web_subdomain | length > 0)-                  else airdcpp_web_domain) }}"+airdcpp_role_web_subdomain: "{{ airdcpp_name }}"+airdcpp_role_web_domain: "{{ user.domain }}"+airdcpp_role_web_port: "5600"+airdcpp_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='airdcpp') + '.' + lookup('role_var', '_web_domain', role='airdcpp')+                       if (lookup('role_var', '_web_subdomain', role='airdcpp') | length > 0)+                       else lookup('role_var', '_web_domain', role='airdcpp')) }}"  ################################ # DNS ################################ -airdcpp_dns_record: "{{ airdcpp_web_subdomain }}"-airdcpp_dns_zone: "{{ airdcpp_web_domain }}"-airdcpp_dns_proxy: "{{ dns.proxied }}"+airdcpp_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='airdcpp') }}"+airdcpp_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='airdcpp') }}"+airdcpp_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -airdcpp_traefik_sso_middleware: ""-airdcpp_traefik_middleware_default: "{{ traefik_default_middleware }}"-airdcpp_traefik_middleware_custom: ""-airdcpp_traefik_certresolver: "{{ traefik_default_certresolver }}"-airdcpp_traefik_enabled: true-airdcpp_traefik_api_enabled: false-airdcpp_traefik_api_endpoint: ""+airdcpp_role_traefik_sso_middleware: ""+airdcpp_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+airdcpp_role_traefik_middleware_custom: ""+airdcpp_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+airdcpp_role_traefik_enabled: true+airdcpp_role_traefik_api_enabled: false+airdcpp_role_traefik_api_endpoint: ""  ################################ # Docker ################################  # Container-airdcpp_docker_container: "{{ airdcpp_name }}"+airdcpp_role_docker_container: "{{ airdcpp_name }}"  # Image-airdcpp_docker_image_pull: true-airdcpp_docker_image_tag: "latest"-airdcpp_docker_image: "gangefors/airdcpp-webclient:{{ airdcpp_docker_image_tag }}"+airdcpp_role_docker_image_pull: true+airdcpp_role_docker_image_repo: "gangefors/airdcpp-webclient"+airdcpp_role_docker_image_tag: "latest"+airdcpp_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='airdcpp') }}:{{ lookup('role_var', '_docker_image_tag', role='airdcpp') }}"  # Ports-airdcpp_docker_ports_defaults:+airdcpp_role_docker_ports_default:   - "21248:21248"   - "21248:21248/udp"   - "21249:21249"-airdcpp_docker_ports_custom: []-airdcpp_docker_ports: "{{ airdcpp_docker_ports_defaults-                          + airdcpp_docker_ports_custom }}"+airdcpp_role_docker_ports_custom: []+airdcpp_role_docker_ports: "{{ lookup('role_var', '_docker_ports_default', role='airdcpp')+                               + lookup('role_var', '_docker_ports_custom', role='airdcpp') }}"  # Envs-airdcpp_docker_envs_default:+airdcpp_role_docker_envs_default:   TZ: "{{ tz }}"-airdcpp_docker_envs_custom: {}-airdcpp_docker_envs: "{{ airdcpp_docker_envs_default-                         | combine(airdcpp_docker_envs_custom) }}"--# Commands-airdcpp_docker_commands_default: []-airdcpp_docker_commands_custom: []-airdcpp_docker_commands: "{{ airdcpp_docker_commands_default-                             + airdcpp_docker_commands_custom }}"+airdcpp_role_docker_envs_custom: {}+airdcpp_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='airdcpp')+                              | combine(lookup('role_var', '_docker_envs_custom', role='airdcpp')) }}"  # Volumes-airdcpp_docker_volumes_default:-  - "{{ airdcpp_paths_location }}:/.airdcpp"-  - "/mnt/local/downloads/airdcpp:/Downloads"-airdcpp_docker_volumes_custom: []-airdcpp_docker_volumes: "{{ airdcpp_docker_volumes_default-                            + airdcpp_docker_volumes_custom }}"--# Devices-airdcpp_docker_devices_default: []-airdcpp_docker_devices_custom: []-airdcpp_docker_devices: "{{ airdcpp_docker_devices_default-                            + airdcpp_docker_devices_custom }}"--# Hosts-airdcpp_docker_hosts_default: {}-airdcpp_docker_hosts_custom: {}-airdcpp_docker_hosts: "{{ docker_hosts_common-                          | combine(airdcpp_docker_hosts_default)-                          | combine(airdcpp_docker_hosts_custom) }}"--# Labels-airdcpp_docker_labels_default: {}-airdcpp_docker_labels_custom: {}-airdcpp_docker_labels: "{{ docker_labels_common-                           | combine(airdcpp_docker_labels_default)-                           | combine(airdcpp_docker_labels_custom) }}"+airdcpp_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='airdcpp') }}:/.airdcpp"+  - "/mnt/unionfs/downloads/airdcpp:/Downloads"+airdcpp_role_docker_volumes_custom: []+airdcpp_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='airdcpp')+                                 + lookup('role_var', '_docker_volumes_custom', role='airdcpp') }}"  # Hostname-airdcpp_docker_hostname: "{{ airdcpp_name }}"+airdcpp_role_docker_hostname: "{{ airdcpp_name }}"  # Networks-airdcpp_docker_networks_alias: "{{ airdcpp_name }}"-airdcpp_docker_networks_default: []-airdcpp_docker_networks_custom: []-airdcpp_docker_networks: "{{ docker_networks_common-                             + airdcpp_docker_networks_default-                             + airdcpp_docker_networks_custom }}"--# Capabilities-airdcpp_docker_capabilities_default: []-airdcpp_docker_capabilities_custom: []-airdcpp_docker_capabilities: "{{ airdcpp_docker_capabilities_default-                                 + airdcpp_docker_capabilities_custom }}"--# Security Opts-airdcpp_docker_security_opts_default: []-airdcpp_docker_security_opts_custom: []-airdcpp_docker_security_opts: "{{ airdcpp_docker_security_opts_default-                                  + airdcpp_docker_security_opts_custom }}"+airdcpp_role_docker_networks_alias: "{{ airdcpp_name }}"+airdcpp_role_docker_networks_default: []+airdcpp_role_docker_networks_custom: []+airdcpp_role_docker_networks: "{{ docker_networks_common+                                  + lookup('role_var', '_docker_networks_default', role='airdcpp')+                                  + lookup('role_var', '_docker_networks_custom', role='airdcpp') }}"  # Restart Policy-airdcpp_docker_restart_policy: unless-stopped+airdcpp_role_docker_restart_policy: unless-stopped  # State-airdcpp_docker_state: started+airdcpp_role_docker_state: started  # User-airdcpp_docker_user: "{{ uid }}:{{ gid }}"+airdcpp_role_docker_user: "{{ uid }}:{{ gid }}"

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"@@ -22,18 +22,18 @@  - name: Check WebServer.xml exists   ansible.builtin.stat:-    path: "/opt/airdcpp/WebServer.xml"+    path: "{{ lookup('role_var', '_paths_location', role='airdcpp') }}/WebServer.xml"   register: webserver_xml  - name: Check DCPlusPlus.xml exists   ansible.builtin.stat:-    path: "/opt/airdcpp/DCPlusPlus.xml"+    path: "{{ lookup('role_var', '_paths_location', role='airdcpp') }}/DCPlusPlus.xml"   register: dcplusplus_xml  - name: Import default 'WebServer.xml'   ansible.builtin.copy:     src: WebServer.xml-    dest: /opt/airdcpp/WebServer.xml+    dest: "{{ lookup('role_var', '_paths_location', role='airdcpp') }}/WebServer.xml"     owner: "{{ user.name }}"     group: "{{ user.name }}"     mode: "0664"@@ -43,7 +43,7 @@ - name: Import default 'DCPlusPlus.xml'   ansible.builtin.copy:     src: DCPlusPlus.xml-    dest: /opt/airdcpp/DCPlusPlus.xml+    dest: "{{ lookup('role_var', '_paths_location', role='airdcpp') }}/DCPlusPlus.xml"     owner: "{{ user.name }}"     group: "{{ user.name }}"     mode: "0664"

@@ -17,128 +17,85 @@ # Paths ################################ -airsonic_paths_folder: "{{ airsonic_name }}"-airsonic_paths_location: "{{ server_appdata_path }}/{{ airsonic_paths_folder }}"-airsonic_paths_folders_list:-  - "{{ airsonic_paths_location }}"+airsonic_role_paths_folder: "{{ airsonic_name }}"+airsonic_role_paths_location: "{{ server_appdata_path }}/{{ airsonic_role_paths_folder }}"+airsonic_role_paths_folders_list:+  - "{{ airsonic_role_paths_location }}"  ################################ # Web ################################ -airsonic_web_subdomain: "{{ airsonic_name }}"-airsonic_web_domain: "{{ user.domain }}"-airsonic_web_port: "4040"-airsonic_web_url: "{{ 'https://' + (airsonic_web_subdomain + '.' + airsonic_web_domain-                   if (airsonic_web_subdomain | length > 0)-                   else airsonic_web_domain) }}"+airsonic_role_web_subdomain: "{{ airsonic_name }}"+airsonic_role_web_domain: "{{ user.domain }}"+airsonic_role_web_port: "4040"+airsonic_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='airsonic') + '.' + lookup('role_var', '_web_domain', role='airsonic')+                        if (lookup('role_var', '_web_subdomain', role='airsonic') | length > 0)+                        else lookup('role_var', '_web_domain', role='airsonic')) }}"  ################################ # DNS ################################ -airsonic_dns_record: "{{ airsonic_web_subdomain }}"-airsonic_dns_zone: "{{ airsonic_web_domain }}"-airsonic_dns_proxy: "{{ dns.proxied }}"+airsonic_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='airsonic') }}"+airsonic_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='airsonic') }}"+airsonic_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -airsonic_traefik_sso_middleware: ""-airsonic_traefik_middleware_default: "{{ traefik_default_middleware }}"-airsonic_traefik_middleware_custom: ""-airsonic_traefik_certresolver: "{{ traefik_default_certresolver }}"-airsonic_traefik_enabled: true-airsonic_traefik_api_enabled: false-airsonic_traefik_api_endpoint: ""+airsonic_role_traefik_sso_middleware: ""+airsonic_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+airsonic_role_traefik_middleware_custom: ""+airsonic_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+airsonic_role_traefik_enabled: true+airsonic_role_traefik_api_enabled: false+airsonic_role_traefik_api_endpoint: ""  ################################ # Docker ################################  # Container-airsonic_docker_container: "{{ airsonic_name }}"+airsonic_role_docker_container: "{{ airsonic_name }}"  # Image-airsonic_docker_image_pull: true-airsonic_docker_image_tag: "latest"-airsonic_docker_image: "lscr.io/linuxserver/airsonic-advanced:{{ airsonic_docker_image_tag }}"--# Ports-airsonic_docker_ports_defaults: []-airsonic_docker_ports_custom: []-airsonic_docker_ports: "{{ airsonic_docker_ports_defaults-                           + airsonic_docker_ports_custom }}"+airsonic_role_docker_image_pull: true+airsonic_role_docker_image_repo: "lscr.io/linuxserver/airsonic-advanced"+airsonic_role_docker_image_tag: "latest"+airsonic_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='airsonic') }}:{{ lookup('role_var', '_docker_image_tag', role='airsonic') }}"  # Envs-airsonic_docker_envs_default:+airsonic_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"   JAVA_OPTS: "-Dserver.use-forward-headers=true"-airsonic_docker_envs_custom: {}-airsonic_docker_envs: "{{ airsonic_docker_envs_default-                          | combine(airsonic_docker_envs_custom) }}"--# Commands-airsonic_docker_commands_default: []-airsonic_docker_commands_custom: []-airsonic_docker_commands: "{{ airsonic_docker_commands_default-                              + airsonic_docker_commands_custom }}"+airsonic_role_docker_envs_custom: {}+airsonic_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='airsonic')+                               | combine(lookup('role_var', '_docker_envs_custom', role='airsonic')) }}"  # Volumes-airsonic_docker_volumes_default:-  - "{{ airsonic_paths_location }}:/config"-airsonic_docker_volumes_custom: []-airsonic_docker_volumes: "{{ airsonic_docker_volumes_default-                             + airsonic_docker_volumes_custom }}"--# Devices-airsonic_docker_devices_default: []-airsonic_docker_devices_custom: []-airsonic_docker_devices: "{{ airsonic_docker_devices_default-                             + airsonic_docker_devices_custom }}"--# Hosts-airsonic_docker_hosts_default: {}-airsonic_docker_hosts_custom: {}-airsonic_docker_hosts: "{{ docker_hosts_common-                           | combine(airsonic_docker_hosts_default)-                           | combine(airsonic_docker_hosts_custom) }}"--# Labels-airsonic_docker_labels_default: {}-airsonic_docker_labels_custom: {}-airsonic_docker_labels: "{{ docker_labels_common-                            | combine(airsonic_docker_labels_default)-                            | combine(airsonic_docker_labels_custom) }}"+airsonic_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='airsonic') }}:/config"+airsonic_role_docker_volumes_custom: []+airsonic_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='airsonic')+                                  + lookup('role_var', '_docker_volumes_custom', role='airsonic') }}"  # Hostname-airsonic_docker_hostname: "{{ airsonic_name }}"+airsonic_role_docker_hostname: "{{ airsonic_name }}"  # Networks-airsonic_docker_networks_alias: "{{ airsonic_name }}"-airsonic_docker_networks_default: []-airsonic_docker_networks_custom: []-airsonic_docker_networks: "{{ docker_networks_common-                              + airsonic_docker_networks_default-                              + airsonic_docker_networks_custom }}"--# Capabilities-airsonic_docker_capabilities_default: []-airsonic_docker_capabilities_custom: []-airsonic_docker_capabilities: "{{ airsonic_docker_capabilities_default-                                  + airsonic_docker_capabilities_custom }}"--# Security Opts-airsonic_docker_security_opts_default: []-airsonic_docker_security_opts_custom: []-airsonic_docker_security_opts: "{{ airsonic_docker_security_opts_default-                                   + airsonic_docker_security_opts_custom }}"+airsonic_role_docker_networks_alias: "{{ airsonic_name }}"+airsonic_role_docker_networks_default: []+airsonic_role_docker_networks_custom: []+airsonic_role_docker_networks: "{{ docker_networks_common+                                   + lookup('role_var', '_docker_networks_default', role='airsonic')+                                   + lookup('role_var', '_docker_networks_custom', role='airsonic') }}"  # Restart Policy-airsonic_docker_restart_policy: unless-stopped+airsonic_role_docker_restart_policy: unless-stopped  # State-airsonic_docker_state: started+airsonic_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,125 +17,82 @@ # Paths ################################ -apprise_paths_folder: "{{ apprise_name }}"-apprise_paths_location: "{{ server_appdata_path }}/{{ apprise_paths_folder }}"-apprise_paths_folders_list:-  - "{{ apprise_paths_location }}"+apprise_role_paths_folder: "{{ apprise_name }}"+apprise_role_paths_location: "{{ server_appdata_path }}/{{ apprise_role_paths_folder }}"+apprise_role_paths_folders_list:+  - "{{ apprise_role_paths_location }}"  ################################ # Web ################################ -apprise_web_subdomain: "{{ apprise_name }}"-apprise_web_domain: "{{ user.domain }}"-apprise_web_port: "8000"-apprise_web_url: "{{ 'https://' + (apprise_web_subdomain + '.' + apprise_web_domain-                  if (apprise_web_subdomain | length > 0)-                  else apprise_web_domain) }}"+apprise_role_web_subdomain: "{{ apprise_name }}"+apprise_role_web_domain: "{{ user.domain }}"+apprise_role_web_port: "8000"+apprise_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='apprise') + '.' + lookup('role_var', '_web_domain', role='apprise')+                       if (lookup('role_var', '_web_subdomain', role='apprise') | length > 0)+                       else lookup('role_var', '_web_domain', role='apprise')) }}"  ################################ # DNS ################################ -apprise_dns_record: "{{ apprise_web_subdomain }}"-apprise_dns_zone: "{{ apprise_web_domain }}"-apprise_dns_proxy: "{{ dns.proxied }}"+apprise_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='apprise') }}"+apprise_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='apprise') }}"+apprise_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -apprise_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-apprise_traefik_middleware_default: "{{ traefik_default_middleware }}"-apprise_traefik_middleware_custom: ""-apprise_traefik_certresolver: "{{ traefik_default_certresolver }}"-apprise_traefik_enabled: true+apprise_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+apprise_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+apprise_role_traefik_middleware_custom: ""+apprise_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+apprise_role_traefik_enabled: true  ################################ # Docker ################################  # Container-apprise_docker_container: "{{ apprise_name }}"+apprise_role_docker_container: "{{ apprise_name }}"  # Image-apprise_docker_image_pull: true-apprise_docker_image_tag: "latest"-apprise_docker_image: "lscr.io/linuxserver/apprise-api:{{ apprise_docker_image_tag }}"--# Ports-apprise_docker_ports_defaults: []-apprise_docker_ports_custom: []-apprise_docker_ports: "{{ apprise_docker_ports_defaults-                          + apprise_docker_ports_custom }}"+apprise_role_docker_image_pull: true+apprise_role_docker_image_repo: "lscr.io/linuxserver/apprise-api"+apprise_role_docker_image_tag: "latest"+apprise_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='apprise') }}:{{ lookup('role_var', '_docker_image_tag', role='apprise') }}"  # Envs-apprise_docker_envs_default:+apprise_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"-apprise_docker_envs_custom: {}-apprise_docker_envs: "{{ apprise_docker_envs_default-                         | combine(apprise_docker_envs_custom) }}"--# Commands-apprise_docker_commands_default: []-apprise_docker_commands_custom: []-apprise_docker_commands: "{{ apprise_docker_commands_default-                             + apprise_docker_commands_custom }}"+apprise_role_docker_envs_custom: {}+apprise_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='apprise')+                              | combine(lookup('role_var', '_docker_envs_custom', role='apprise')) }}"  # Volumes-apprise_docker_volumes_default:-  - "{{ apprise_paths_location }}:/config"-apprise_docker_volumes_custom: []-apprise_docker_volumes: "{{ apprise_docker_volumes_default-                            + apprise_docker_volumes_custom }}"--# Devices-apprise_docker_devices_default: []-apprise_docker_devices_custom: []-apprise_docker_devices: "{{ apprise_docker_devices_default-                            + apprise_docker_devices_custom }}"--# Hosts-apprise_docker_hosts_default: {}-apprise_docker_hosts_custom: {}-apprise_docker_hosts: "{{ docker_hosts_common-                          | combine(apprise_docker_hosts_default)-                          | combine(apprise_docker_hosts_custom) }}"--# Labels-apprise_docker_labels_default: {}-apprise_docker_labels_custom: {}-apprise_docker_labels: "{{ docker_labels_common-                           | combine(apprise_docker_labels_default)-                           | combine(apprise_docker_labels_custom) }}"+apprise_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='apprise') }}:/config"+apprise_role_docker_volumes_custom: []+apprise_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='apprise')+                                 + lookup('role_var', '_docker_volumes_custom', role='apprise') }}"  # Hostname-apprise_docker_hostname: "{{ apprise_name }}"+apprise_role_docker_hostname: "{{ apprise_name }}"  # Networks-apprise_docker_networks_alias: "{{ apprise_name }}"-apprise_docker_networks_default: []-apprise_docker_networks_custom: []-apprise_docker_networks: "{{ docker_networks_common-                             + apprise_docker_networks_default-                             + apprise_docker_networks_custom }}"--# Capabilities-apprise_docker_capabilities_default: []-apprise_docker_capabilities_custom: []-apprise_docker_capabilities: "{{ apprise_docker_capabilities_default-                                 + apprise_docker_capabilities_custom }}"--# Security Opts-apprise_docker_security_opts_default: []-apprise_docker_security_opts_custom: []-apprise_docker_security_opts: "{{ apprise_docker_security_opts_default-                                  + apprise_docker_security_opts_custom }}"+apprise_role_docker_networks_alias: "{{ apprise_name }}"+apprise_role_docker_networks_default: []+apprise_role_docker_networks_custom: []+apprise_role_docker_networks: "{{ docker_networks_common+                                  + lookup('role_var', '_docker_networks_default', role='apprise')+                                  + lookup('role_var', '_docker_networks_custom', role='apprise') }}"  # Restart Policy-apprise_docker_restart_policy: unless-stopped+apprise_role_docker_restart_policy: unless-stopped  # State-apprise_docker_state: started+apprise_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,125 +17,82 @@ # Paths ################################ -archivebox_paths_folder: "{{ archivebox_name }}"-archivebox_paths_location: "{{ server_appdata_path }}/{{ archivebox_paths_folder }}"-archivebox_paths_folders_list:-  - "{{ archivebox_paths_location }}"+archivebox_role_paths_folder: "{{ archivebox_name }}"+archivebox_role_paths_location: "{{ server_appdata_path }}/{{ archivebox_role_paths_folder }}"+archivebox_role_paths_folders_list:+  - "{{ archivebox_role_paths_location }}"  ################################ # Web ################################ -archivebox_web_subdomain: "{{ archivebox_name }}"-archivebox_web_domain: "{{ user.domain }}"-archivebox_web_port: "8000"-archivebox_web_url: "{{ 'https://' + (archivebox_web_subdomain + '.' + archivebox_web_domain-                     if (archivebox_web_subdomain | length > 0)-                     else archivebox_web_domain) }}"+archivebox_role_web_subdomain: "{{ archivebox_name }}"+archivebox_role_web_domain: "{{ user.domain }}"+archivebox_role_web_port: "8000"+archivebox_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='archivebox') + '.' + lookup('role_var', '_web_domain', role='archivebox')+                          if (lookup('role_var', '_web_subdomain', role='archivebox') | length > 0)+                          else lookup('role_var', '_web_domain', role='archivebox')) }}"  ################################ # DNS ################################ -archivebox_dns_record: "{{ archivebox_web_subdomain }}"-archivebox_dns_zone: "{{ archivebox_web_domain }}"-archivebox_dns_proxy: "{{ dns.proxied }}"+archivebox_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='archivebox') }}"+archivebox_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='archivebox') }}"+archivebox_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -archivebox_traefik_sso_middleware: ""-archivebox_traefik_middleware_default: "{{ traefik_default_middleware }}"-archivebox_traefik_middleware_custom: ""-archivebox_traefik_certresolver: "{{ traefik_default_certresolver }}"-archivebox_traefik_enabled: true+archivebox_role_traefik_sso_middleware: ""+archivebox_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+archivebox_role_traefik_middleware_custom: ""+archivebox_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+archivebox_role_traefik_enabled: true  ################################ # Docker ################################  # Container-archivebox_docker_container: "{{ archivebox_name }}"+archivebox_role_docker_container: "{{ archivebox_name }}"  # Image-archivebox_docker_image_pull: true-archivebox_docker_image_tag: "latest"-archivebox_docker_image: "archivebox/archivebox:{{ archivebox_docker_image_tag }}"--# Ports-archivebox_docker_ports_defaults: []-archivebox_docker_ports_custom: []-archivebox_docker_ports: "{{ archivebox_docker_ports_defaults-                             + archivebox_docker_ports_custom }}"+archivebox_role_docker_image_pull: true+archivebox_role_docker_image_repo: "archivebox/archivebox"+archivebox_role_docker_image_tag: "latest"+archivebox_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='archivebox') }}:{{ lookup('role_var', '_docker_image_tag', role='archivebox') }}"  # Envs-archivebox_docker_envs_default:+archivebox_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"-archivebox_docker_envs_custom: {}-archivebox_docker_envs: "{{ archivebox_docker_envs_default-                            | combine(archivebox_docker_envs_custom) }}"--# Commands-archivebox_docker_commands_default: []-archivebox_docker_commands_custom: []-archivebox_docker_commands: "{{ archivebox_docker_commands_default-                                + archivebox_docker_commands_custom }}"+archivebox_role_docker_envs_custom: {}+archivebox_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='archivebox')+                                 | combine(lookup('role_var', '_docker_envs_custom', role='archivebox')) }}"  # Volumes-archivebox_docker_volumes_default:-  - "{{ archivebox_paths_location }}:/data"-archivebox_docker_volumes_custom: []-archivebox_docker_volumes: "{{ archivebox_docker_volumes_default-                               + archivebox_docker_volumes_custom }}"--# Devices-archivebox_docker_devices_default: []-archivebox_docker_devices_custom: []-archivebox_docker_devices: "{{ archivebox_docker_devices_default-                               + archivebox_docker_devices_custom }}"--# Hosts-archivebox_docker_hosts_default: {}-archivebox_docker_hosts_custom: {}-archivebox_docker_hosts: "{{ docker_hosts_common-                             | combine(archivebox_docker_hosts_default)-                             | combine(archivebox_docker_hosts_custom) }}"--# Labels-archivebox_docker_labels_default: {}-archivebox_docker_labels_custom: {}-archivebox_docker_labels: "{{ docker_labels_common-                              | combine(archivebox_docker_labels_default)-                              | combine(archivebox_docker_labels_custom) }}"+archivebox_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='archivebox') }}:/data"+archivebox_role_docker_volumes_custom: []+archivebox_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='archivebox')+                                    + lookup('role_var', '_docker_volumes_custom', role='archivebox') }}"  # Hostname-archivebox_docker_hostname: "{{ archivebox_name }}"+archivebox_role_docker_hostname: "{{ archivebox_name }}"  # Networks-archivebox_docker_networks_alias: "{{ archivebox_name }}"-archivebox_docker_networks_default: []-archivebox_docker_networks_custom: []-archivebox_docker_networks: "{{ docker_networks_common-                                + archivebox_docker_networks_default-                                + archivebox_docker_networks_custom }}"--# Capabilities-archivebox_docker_capabilities_default: []-archivebox_docker_capabilities_custom: []-archivebox_docker_capabilities: "{{ archivebox_docker_capabilities_default-                                    + archivebox_docker_capabilities_custom }}"--# Security Opts-archivebox_docker_security_opts_default: []-archivebox_docker_security_opts_custom: []-archivebox_docker_security_opts: "{{ archivebox_docker_security_opts_default-                                     + archivebox_docker_security_opts_custom }}"+archivebox_role_docker_networks_alias: "{{ archivebox_name }}"+archivebox_role_docker_networks_default: []+archivebox_role_docker_networks_custom: []+archivebox_role_docker_networks: "{{ docker_networks_common+                                     + lookup('role_var', '_docker_networks_default', role='archivebox')+                                     + lookup('role_var', '_docker_networks_custom', role='archivebox') }}"  # Restart Policy-archivebox_docker_restart_policy: unless-stopped+archivebox_role_docker_restart_policy: unless-stopped  # State-archivebox_docker_state: started+archivebox_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,136 +17,91 @@ # Paths ################################ -audiobookshelf_paths_folder: "{{ audiobookshelf_name }}"-audiobookshelf_paths_location: "{{ server_appdata_path }}/{{ audiobookshelf_paths_folder }}"-audiobookshelf_paths_folders_list:-  - "{{ audiobookshelf_paths_location }}"-  - "{{ audiobookshelf_paths_location }}/config"-  - "{{ audiobookshelf_paths_location }}/metadata"+audiobookshelf_role_paths_folder: "{{ audiobookshelf_name }}"+audiobookshelf_role_paths_location: "{{ server_appdata_path }}/{{ audiobookshelf_role_paths_folder }}"+audiobookshelf_role_paths_folders_list:+  - "{{ audiobookshelf_role_paths_location }}"+  - "{{ audiobookshelf_role_paths_location }}/config"+  - "{{ audiobookshelf_role_paths_location }}/metadata"   - "/mnt/unionfs/Media/Audiobooks"   - "/mnt/unionfs/Media/Podcasts"-audiobookshelf_paths_recursive: true+audiobookshelf_role_paths_recursive: true  ################################ # Web ################################ -audiobookshelf_web_subdomain: "{{ audiobookshelf_name }}"-audiobookshelf_web_domain: "{{ user.domain }}"-audiobookshelf_web_port: "80"-audiobookshelf_web_url: "{{ 'https://' + (audiobookshelf_web_subdomain + '.' + audiobookshelf_web_domain-                         if (audiobookshelf_web_subdomain | length > 0)-                         else audiobookshelf_web_domain) }}"+audiobookshelf_role_web_subdomain: "{{ audiobookshelf_name }}"+audiobookshelf_role_web_domain: "{{ user.domain }}"+audiobookshelf_role_web_port: "80"+audiobookshelf_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='audiobookshelf') + '.' + lookup('role_var', '_web_domain', role='audiobookshelf')+                              if (lookup('role_var', '_web_subdomain', role='audiobookshelf') | length > 0)+                              else lookup('role_var', '_web_domain', role='audiobookshelf')) }}"  ################################ # DNS ################################ -audiobookshelf_dns_record: "{{ lookup('vars', audiobookshelf_name + '_web_subdomain', default=audiobookshelf_web_subdomain) }}"-audiobookshelf_dns_zone: "{{ lookup('vars', audiobookshelf_name + '_web_domain', default=audiobookshelf_web_domain) }}"-audiobookshelf_dns_proxy: "{{ dns.proxied }}"+audiobookshelf_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='audiobookshelf') }}"+audiobookshelf_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='audiobookshelf') }}"+audiobookshelf_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -audiobookshelf_traefik_sso_middleware: ""-audiobookshelf_traefik_middleware_default: "{{ traefik_default_middleware }}"-audiobookshelf_traefik_middleware_custom: ""-audiobookshelf_traefik_certresolver: "{{ traefik_default_certresolver }}"-audiobookshelf_traefik_enabled: true+audiobookshelf_role_traefik_sso_middleware: ""+audiobookshelf_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+audiobookshelf_role_traefik_middleware_custom: ""+audiobookshelf_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+audiobookshelf_role_traefik_enabled: true  ################################ # Docker ################################  # Container-audiobookshelf_docker_container: "{{ audiobookshelf_name }}"+audiobookshelf_role_docker_container: "{{ audiobookshelf_name }}"  # Image-audiobookshelf_docker_image_pull: true-audiobookshelf_docker_image_repo: "ghcr.io/advplyr/audiobookshelf"-audiobookshelf_docker_image_tag: "latest"-audiobookshelf_docker_image: "{{ lookup('vars', audiobookshelf_name + '_docker_image_repo', default=audiobookshelf_docker_image_repo)-                                 + ':' + lookup('vars', audiobookshelf_name + '_docker_image_tag', default=audiobookshelf_docker_image_tag) }}"--# Ports-audiobookshelf_docker_ports_defaults: []-audiobookshelf_docker_ports_custom: []-audiobookshelf_docker_ports: "{{ lookup('vars', audiobookshelf_name + '_docker_ports_defaults', default=audiobookshelf_docker_ports_defaults)-                                 + lookup('vars', audiobookshelf_name + '_docker_ports_custom', default=audiobookshelf_docker_ports_custom) }}"+audiobookshelf_role_docker_image_pull: true+audiobookshelf_role_docker_image_repo: "ghcr.io/advplyr/audiobookshelf"+audiobookshelf_role_docker_image_tag: "latest"+audiobookshelf_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='audiobookshelf') }}:{{ lookup('role_var', '_docker_image_tag', role='audiobookshelf') }}"  # Envs-audiobookshelf_docker_envs_default:+audiobookshelf_role_docker_envs_default:   TZ: "{{ tz }}"-audiobookshelf_docker_envs_custom: {}-audiobookshelf_docker_envs: "{{ lookup('vars', audiobookshelf_name + '_docker_envs_default', default=audiobookshelf_docker_envs_default)-                                | combine(lookup('vars', audiobookshelf_name + '_docker_envs_custom', default=audiobookshelf_docker_envs_custom)) }}"--# Commands-audiobookshelf_docker_commands_default: []-audiobookshelf_docker_commands_custom: []-audiobookshelf_docker_commands: "{{ lookup('vars', audiobookshelf_name + '_docker_commands_default', default=audiobookshelf_docker_commands_default)-                                    + lookup('vars', audiobookshelf_name + '_docker_commands_custom', default=audiobookshelf_docker_commands_custom) }}"+audiobookshelf_role_docker_envs_custom: {}+audiobookshelf_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='audiobookshelf')+                                     | combine(lookup('role_var', '_docker_envs_custom', role='audiobookshelf')) }}"  # Volumes-audiobookshelf_docker_volumes_default:-  - "{{ audiobookshelf_paths_location }}/config:/config"-  - "{{ audiobookshelf_paths_location }}/metadata:/metadata"+audiobookshelf_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='audiobookshelf') }}/config:/config"+  - "{{ lookup('role_var', '_paths_location', role='audiobookshelf') }}/metadata:/metadata"   - "/mnt/unionfs/Media/Audiobooks:/audiobooks"   - "/mnt/unionfs/Media/Podcasts:/podcasts"-audiobookshelf_docker_volumes_custom: []-audiobookshelf_docker_volumes: "{{ lookup('vars', audiobookshelf_name + '_docker_volumes_default', default=audiobookshelf_docker_volumes_default)-                                   + lookup('vars', audiobookshelf_name + '_docker_volumes_custom', default=audiobookshelf_docker_volumes_custom) }}"--# Devices-audiobookshelf_docker_devices_default: []-audiobookshelf_docker_devices_custom: []-audiobookshelf_docker_devices: "{{ lookup('vars', audiobookshelf_name + '_docker_devices_default', default=audiobookshelf_docker_devices_default)-                                   + lookup('vars', audiobookshelf_name + '_docker_devices_custom', default=audiobookshelf_docker_devices_custom) }}"--# Hosts-audiobookshelf_docker_hosts_default: {}-audiobookshelf_docker_hosts_custom: {}-audiobookshelf_docker_hosts: "{{ docker_hosts_common-                                 | combine(lookup('vars', audiobookshelf_name + '_docker_hosts_default', default=audiobookshelf_docker_hosts_default))-                                 | combine(lookup('vars', audiobookshelf_name + '_docker_hosts_custom', default=audiobookshelf_docker_hosts_custom)) }}"--# Labels-audiobookshelf_docker_labels_default: {}-audiobookshelf_docker_labels_custom: {}-audiobookshelf_docker_labels: "{{ docker_labels_common-                                  | combine(lookup('vars', audiobookshelf_name + '_docker_labels_default', default=audiobookshelf_docker_labels_default))-                                  | combine(lookup('vars', audiobookshelf_name + '_docker_labels_custom', default=audiobookshelf_docker_labels_custom)) }}"+audiobookshelf_role_docker_volumes_custom: []+audiobookshelf_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='audiobookshelf')+                                        + lookup('role_var', '_docker_volumes_custom', role='audiobookshelf') }}"  # Hostname-audiobookshelf_docker_hostname: "{{ audiobookshelf_name }}"+audiobookshelf_role_docker_hostname: "{{ audiobookshelf_name }}"  # Networks-audiobookshelf_docker_networks_alias: "{{ audiobookshelf_name }}"-audiobookshelf_docker_networks_default: []-audiobookshelf_docker_networks_custom: []-audiobookshelf_docker_networks: "{{ docker_networks_common-                                    + lookup('vars', audiobookshelf_name + '_docker_networks_default', default=audiobookshelf_docker_networks_default)-                                    + lookup('vars', audiobookshelf_name + '_docker_networks_custom', default=audiobookshelf_docker_networks_custom) }}"--# Capabilities-audiobookshelf_docker_capabilities_default: []-audiobookshelf_docker_capabilities_custom: []-audiobookshelf_docker_capabilities: "{{ lookup('vars', audiobookshelf_name + '_docker_capabilities_default', default=audiobookshelf_docker_capabilities_default)-                                        + lookup('vars', audiobookshelf_name + '_docker_capabilities_custom', default=audiobookshelf_docker_capabilities_custom) }}"--# Security Opts-audiobookshelf_docker_security_opts_default: []-audiobookshelf_docker_security_opts_custom: []-audiobookshelf_docker_security_opts: "{{ lookup('vars', audiobookshelf_name + '_docker_security_opts_default', default=audiobookshelf_docker_security_opts_default)-                                         + lookup('vars', audiobookshelf_name + '_docker_security_opts_custom', default=audiobookshelf_docker_security_opts_custom) }}"+audiobookshelf_role_docker_networks_alias: "{{ audiobookshelf_name }}"+audiobookshelf_role_docker_networks_default: []+audiobookshelf_role_docker_networks_custom: []+audiobookshelf_role_docker_networks: "{{ docker_networks_common+                                         + lookup('role_var', '_docker_networks_default', role='audiobookshelf')+                                         + lookup('role_var', '_docker_networks_custom', role='audiobookshelf') }}"  # Restart Policy-audiobookshelf_docker_restart_policy: unless-stopped+audiobookshelf_role_docker_restart_policy: unless-stopped  # State-audiobookshelf_docker_state: started+audiobookshelf_role_docker_state: started  # User-audiobookshelf_docker_user: "{{ uid }}:{{ gid }}"+audiobookshelf_role_docker_user: "{{ uid }}:{{ gid }}"

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,125 +17,82 @@ # Paths ################################ -barcodebuddy_paths_folder: "{{ barcodebuddy_name }}"-barcodebuddy_paths_location: "{{ server_appdata_path }}/{{ barcodebuddy_paths_folder }}"-barcodebuddy_paths_folders_list:-  - "{{ barcodebuddy_paths_location }}"+barcodebuddy_role_paths_folder: "{{ barcodebuddy_name }}"+barcodebuddy_role_paths_location: "{{ server_appdata_path }}/{{ barcodebuddy_role_paths_folder }}"+barcodebuddy_role_paths_folders_list:+  - "{{ barcodebuddy_role_paths_location }}"  ################################ # Web ################################ -barcodebuddy_web_subdomain: "{{ barcodebuddy_name }}"-barcodebuddy_web_domain: "{{ user.domain }}"-barcodebuddy_web_port: "80"-barcodebuddy_web_url: "{{ 'https://' + (barcodebuddy_web_subdomain + '.' + barcodebuddy_web_domain-                       if (barcodebuddy_web_subdomain | length > 0)-                       else barcodebuddy_web_domain) }}"+barcodebuddy_role_web_subdomain: "{{ barcodebuddy_name }}"+barcodebuddy_role_web_domain: "{{ user.domain }}"+barcodebuddy_role_web_port: "80"+barcodebuddy_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='barcodebuddy') + '.' + lookup('role_var', '_web_domain', role='barcodebuddy')+                            if (lookup('role_var', '_web_subdomain', role='barcodebuddy') | length > 0)+                            else lookup('role_var', '_web_domain', role='barcodebuddy')) }}"  ################################ # DNS ################################ -barcodebuddy_dns_record: "{{ barcodebuddy_web_subdomain }}"-barcodebuddy_dns_zone: "{{ barcodebuddy_web_domain }}"-barcodebuddy_dns_proxy: "{{ dns.proxied }}"+barcodebuddy_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='barcodebuddy') }}"+barcodebuddy_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='barcodebuddy') }}"+barcodebuddy_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -barcodebuddy_traefik_sso_middleware: ""-barcodebuddy_traefik_middleware_default: "{{ traefik_default_middleware }}"-barcodebuddy_traefik_middleware_custom: ""-barcodebuddy_traefik_certresolver: "{{ traefik_default_certresolver }}"-barcodebuddy_traefik_enabled: true+barcodebuddy_role_traefik_sso_middleware: ""+barcodebuddy_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+barcodebuddy_role_traefik_middleware_custom: ""+barcodebuddy_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+barcodebuddy_role_traefik_enabled: true  ################################ # Docker ################################  # Container-barcodebuddy_docker_container: "{{ barcodebuddy_name }}"+barcodebuddy_role_docker_container: "{{ barcodebuddy_name }}"  # Image-barcodebuddy_docker_image_pull: true-barcodebuddy_docker_image_tag: "latest"-barcodebuddy_docker_image: "f0rc3/barcodebuddy:{{ barcodebuddy_docker_image_tag }}"--# Ports-barcodebuddy_docker_ports_defaults: []-barcodebuddy_docker_ports_custom: []-barcodebuddy_docker_ports: "{{ barcodebuddy_docker_ports_defaults-                               + barcodebuddy_docker_ports_custom }}"+barcodebuddy_role_docker_image_pull: true+barcodebuddy_role_docker_image_repo: "f0rc3/barcodebuddy"+barcodebuddy_role_docker_image_tag: "latest"+barcodebuddy_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='barcodebuddy') }}:{{ lookup('role_var', '_docker_image_tag', role='barcodebuddy') }}"  # Envs-barcodebuddy_docker_envs_default:+barcodebuddy_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"-barcodebuddy_docker_envs_custom: {}-barcodebuddy_docker_envs: "{{ barcodebuddy_docker_envs_default-                              | combine(barcodebuddy_docker_envs_custom) }}"--# Commands-barcodebuddy_docker_commands_default: []-barcodebuddy_docker_commands_custom: []-barcodebuddy_docker_commands: "{{ barcodebuddy_docker_commands_default-                                  + barcodebuddy_docker_commands_custom }}"+barcodebuddy_role_docker_envs_custom: {}+barcodebuddy_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='barcodebuddy')+                                   | combine(lookup('role_var', '_docker_envs_custom', role='barcodebuddy')) }}"  # Volumes-barcodebuddy_docker_volumes_default:-  - "{{ barcodebuddy_paths_location }}:/config"-barcodebuddy_docker_volumes_custom: []-barcodebuddy_docker_volumes: "{{ barcodebuddy_docker_volumes_default-                                 + barcodebuddy_docker_volumes_custom }}"--# Devices-barcodebuddy_docker_devices_default: []-barcodebuddy_docker_devices_custom: []-barcodebuddy_docker_devices: "{{ barcodebuddy_docker_devices_default-                                 + barcodebuddy_docker_devices_custom }}"--# Hosts-barcodebuddy_docker_hosts_default: {}-barcodebuddy_docker_hosts_custom: {}-barcodebuddy_docker_hosts: "{{ docker_hosts_common-                               | combine(barcodebuddy_docker_hosts_default)-                               | combine(barcodebuddy_docker_hosts_custom) }}"--# Labels-barcodebuddy_docker_labels_default: {}-barcodebuddy_docker_labels_custom: {}-barcodebuddy_docker_labels: "{{ docker_labels_common-                                | combine(barcodebuddy_docker_labels_default)-                                | combine(barcodebuddy_docker_labels_custom) }}"+barcodebuddy_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='barcodebuddy') }}:/config"+barcodebuddy_role_docker_volumes_custom: []+barcodebuddy_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='barcodebuddy')+                                      + lookup('role_var', '_docker_volumes_custom', role='barcodebuddy') }}"  # Hostname-barcodebuddy_docker_hostname: "{{ barcodebuddy_name }}"+barcodebuddy_role_docker_hostname: "{{ barcodebuddy_name }}"  # Networks-barcodebuddy_docker_networks_alias: "{{ barcodebuddy_name }}"-barcodebuddy_docker_networks_default: []-barcodebuddy_docker_networks_custom: []-barcodebuddy_docker_networks: "{{ docker_networks_common-                                  + barcodebuddy_docker_networks_default-                                  + barcodebuddy_docker_networks_custom }}"--# Capabilities-barcodebuddy_docker_capabilities_default: []-barcodebuddy_docker_capabilities_custom: []-barcodebuddy_docker_capabilities: "{{ barcodebuddy_docker_capabilities_default-                                      + barcodebuddy_docker_capabilities_custom }}"--# Security Opts-barcodebuddy_docker_security_opts_default: []-barcodebuddy_docker_security_opts_custom: []-barcodebuddy_docker_security_opts: "{{ barcodebuddy_docker_security_opts_default-                                       + barcodebuddy_docker_security_opts_custom }}"+barcodebuddy_role_docker_networks_alias: "{{ barcodebuddy_name }}"+barcodebuddy_role_docker_networks_default: []+barcodebuddy_role_docker_networks_custom: []+barcodebuddy_role_docker_networks: "{{ docker_networks_common+                                       + lookup('role_var', '_docker_networks_default', role='barcodebuddy')+                                       + lookup('role_var', '_docker_networks_custom', role='barcodebuddy') }}"  # Restart Policy-barcodebuddy_docker_restart_policy: unless-stopped+barcodebuddy_role_docker_restart_policy: unless-stopped  # State-barcodebuddy_docker_state: started+barcodebuddy_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,127 +17,84 @@ # Paths ################################ -beets_paths_folder: "{{ beets_name }}"-beets_paths_location: "{{ server_appdata_path }}/{{ beets_paths_folder }}"-beets_paths_folders_list:-  - "{{ beets_paths_location }}"-  - "/mnt/local/downloads/music"+beets_role_paths_folder: "{{ beets_name }}"+beets_role_paths_location: "{{ server_appdata_path }}/{{ beets_role_paths_folder }}"+beets_role_paths_folders_list:+  - "{{ beets_role_paths_location }}"+  - "{{ server_local_folder_path }}/downloads/music"  ################################ # Web ################################ -beets_web_subdomain: "{{ beets_name }}"-beets_web_domain: "{{ user.domain }}"-beets_web_port: "8337"-beets_web_url: "{{ 'https://' + (beets_web_subdomain + '.' + beets_web_domain-                if (beets_web_subdomain | length > 0)-                else beets_web_domain) }}"+beets_role_web_subdomain: "{{ beets_name }}"+beets_role_web_domain: "{{ user.domain }}"+beets_role_web_port: "8337"+beets_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='beets') + '.' + lookup('role_var', '_web_domain', role='beets')+                     if (lookup('role_var', '_web_subdomain', role='beets') | length > 0)+                     else lookup('role_var', '_web_domain', role='beets')) }}"  ################################ # DNS ################################ -beets_dns_record: "{{ beets_web_subdomain }}"-beets_dns_zone: "{{ beets_web_domain }}"-beets_dns_proxy: "{{ dns.proxied }}"+beets_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='beets') }}"+beets_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='beets') }}"+beets_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -beets_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-beets_traefik_middleware_default: "{{ traefik_default_middleware }}"-beets_traefik_middleware_custom: ""-beets_traefik_certresolver: "{{ traefik_default_certresolver }}"-beets_traefik_enabled: true+beets_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+beets_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+beets_role_traefik_middleware_custom: ""+beets_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+beets_role_traefik_enabled: true  ################################ # Docker ################################  # Container-beets_docker_container: "{{ beets_name }}"+beets_role_docker_container: "{{ beets_name }}"  # Image-beets_docker_image_pull: true-beets_docker_image_tag: "latest"-beets_docker_image: "lscr.io/linuxserver/beets:{{ beets_docker_image_tag }}"--# Ports-beets_docker_ports_defaults: []-beets_docker_ports_custom: []-beets_docker_ports: "{{ beets_docker_ports_defaults-                        + beets_docker_ports_custom }}"+beets_role_docker_image_pull: true+beets_role_docker_image_repo: "lscr.io/linuxserver/beets"+beets_role_docker_image_tag: "latest"+beets_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='beets') }}:{{ lookup('role_var', '_docker_image_tag', role='beets') }}"  # Envs-beets_docker_envs_default:+beets_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"-beets_docker_envs_custom: {}-beets_docker_envs: "{{ beets_docker_envs_default-                       | combine(beets_docker_envs_custom) }}"--# Commands-beets_docker_commands_default: []-beets_docker_commands_custom: []-beets_docker_commands: "{{ beets_docker_commands_default-                           + beets_docker_commands_custom }}"+beets_role_docker_envs_custom: {}+beets_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='beets')+                            | combine(lookup('role_var', '_docker_envs_custom', role='beets')) }}"  # Volumes-beets_docker_volumes_default:-  - "{{ beets_paths_location }}:/config"+beets_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='beets') }}:/config"   - "/mnt/unionfs/Media/Music:/music"-beets_docker_volumes_custom: []-beets_docker_volumes: "{{ beets_docker_volumes_default-                          + beets_docker_volumes_custom }}"--# Devices-beets_docker_devices_default: []-beets_docker_devices_custom: []-beets_docker_devices: "{{ beets_docker_devices_default-                          + beets_docker_devices_custom }}"--# Hosts-beets_docker_hosts_default: {}-beets_docker_hosts_custom: {}-beets_docker_hosts: "{{ docker_hosts_common-                        | combine(beets_docker_hosts_default)-                        | combine(beets_docker_hosts_custom) }}"--# Labels-beets_docker_labels_default: {}-beets_docker_labels_custom: {}-beets_docker_labels: "{{ docker_labels_common-                         | combine(beets_docker_labels_default)-                         | combine(beets_docker_labels_custom) }}"+beets_role_docker_volumes_custom: []+beets_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='beets')+                               + lookup('role_var', '_docker_volumes_custom', role='beets') }}"  # Hostname-beets_docker_hostname: "{{ beets_name }}"+beets_role_docker_hostname: "{{ beets_name }}"  # Networks-beets_docker_networks_alias: "{{ beets_name }}"-beets_docker_networks_default: []-beets_docker_networks_custom: []-beets_docker_networks: "{{ docker_networks_common-                           + beets_docker_networks_default-                           + beets_docker_networks_custom }}"--# Capabilities-beets_docker_capabilities_default: []-beets_docker_capabilities_custom: []-beets_docker_capabilities: "{{ beets_docker_capabilities_default-                               + beets_docker_capabilities_custom }}"--# Security Opts-beets_docker_security_opts_default: []-beets_docker_security_opts_custom: []-beets_docker_security_opts: "{{ beets_docker_security_opts_default-                                + beets_docker_security_opts_custom }}"+beets_role_docker_networks_alias: "{{ beets_name }}"+beets_role_docker_networks_default: []+beets_role_docker_networks_custom: []+beets_role_docker_networks: "{{ docker_networks_common+                                + lookup('role_var', '_docker_networks_default', role='beets')+                                + lookup('role_var', '_docker_networks_custom', role='beets') }}"  # Restart Policy-beets_docker_restart_policy: unless-stopped+beets_role_docker_restart_policy: unless-stopped  # State-beets_docker_state: started+beets_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"@@ -28,12 +28,12 @@     name: "Beets Import"     user: "{{ user.name }}"     special_time: hourly-    job: "docker exec -u abc {{ lookup('vars', role_name + '_name') }} /bin/bash -c 'beet import -q /downloads'"+    job: "docker exec -u abc {{ lookup('role_var', '_docker_container', role='beets') }} /bin/bash -c 'beet import -q /downloads'"     state: present  - name: Wait for config.yaml to be created   ansible.builtin.wait_for:-    path: "/opt/{{ lookup('vars', role_name + '_name') }}/config.yaml"+    path: "{{ lookup('role_var', '_paths_location', role='beets') }}/config.yaml"     state: present  - name: Stop Docker container@@ -41,7 +41,7 @@  - name: Set filename length   ansible.builtin.lineinfile:-    path: "/opt/{{ lookup('vars', role_name + '_name') }}/config.yaml"+    path: "{{ lookup('role_var', '_paths_location', role='beets') }}/config.yaml"     line: "max_filename_length: 255"     insertafter: per_disc*     state: present

@@ -17,129 +17,92 @@ # Paths ################################ -booksonic_paths_folder: "{{ booksonic_name }}"-booksonic_paths_location: "{{ server_appdata_path }}/{{ booksonic_paths_folder }}"-booksonic_paths_folders_list:-  - "{{ booksonic_paths_location }}"+booksonic_role_paths_folder: "{{ booksonic_name }}"+booksonic_role_paths_location: "{{ server_appdata_path }}/{{ booksonic_role_paths_folder }}"+booksonic_role_paths_folders_list:+  - "{{ booksonic_role_paths_location }}"  ################################ # Web ################################ -booksonic_web_subdomain: "{{ booksonic_name }}"-booksonic_web_domain: "{{ user.domain }}"-booksonic_web_port: "4040"-booksonic_web_url: "{{ 'https://' + (booksonic_web_subdomain + '.' + booksonic_web_domain-                    if (booksonic_web_subdomain | length > 0)-                    else booksonic_web_domain) }}"+booksonic_role_web_subdomain: "{{ booksonic_name }}"+booksonic_role_web_domain: "{{ user.domain }}"+booksonic_role_web_port: "4040"+booksonic_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='booksonic') + '.' + lookup('role_var', '_web_domain', role='booksonic')+                         if (lookup('role_var', '_web_subdomain', role='booksonic') | length > 0)+                         else lookup('role_var', '_web_domain', role='booksonic')) }}"  ################################ # DNS ################################ -booksonic_dns_record: "{{ booksonic_web_subdomain }}"-booksonic_dns_zone: "{{ booksonic_web_domain }}"-booksonic_dns_proxy: "{{ dns.proxied }}"+booksonic_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='booksonic') }}"+booksonic_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='booksonic') }}"+booksonic_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -booksonic_traefik_sso_middleware: ""-booksonic_traefik_middleware_default: "{{ traefik_default_middleware }}"-booksonic_traefik_middleware_custom: ""-booksonic_traefik_certresolver: "{{ traefik_default_certresolver }}"-booksonic_traefik_enabled: true+booksonic_role_traefik_sso_middleware: ""+booksonic_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+booksonic_role_traefik_middleware_custom: ""+booksonic_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+booksonic_role_traefik_enabled: true  ################################ # Docker ################################  # Container-booksonic_docker_container: "{{ booksonic_name }}"+booksonic_role_docker_container: "{{ booksonic_name }}"  # Image-booksonic_docker_image_pull: true-booksonic_docker_image_tag: "2201.1.0"-booksonic_docker_image: "lscr.io/linuxserver/booksonic-air:{{ booksonic_docker_image_tag }}"+booksonic_role_docker_image_pull: true+booksonic_role_docker_image_repo: "lscr.io/linuxserver/booksonic-air"+booksonic_role_docker_image_tag: "2201.1.0"+booksonic_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='booksonic') }}:{{ lookup('role_var', '_docker_image_tag', role='booksonic') }}"  # Ports-booksonic_docker_ports_defaults: []-booksonic_docker_ports_custom: []-booksonic_docker_ports: "{{ booksonic_docker_ports_defaults-                            + booksonic_docker_ports_custom }}"+booksonic_role_docker_ports_default: []+booksonic_role_docker_ports_custom: []+booksonic_role_docker_ports: "{{ lookup('role_var', '_docker_ports_default', role='booksonic')+                                 + lookup('role_var', '_docker_ports_custom', role='booksonic') }}"  # Envs-booksonic_docker_envs_default:+booksonic_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"   JAVA_OPTS: "-Dserver.use-forward-headers=true"-booksonic_docker_envs_custom: {}-booksonic_docker_envs: "{{ booksonic_docker_envs_default-                           | combine(booksonic_docker_envs_custom) }}"--# Commands-booksonic_docker_commands_default: []-booksonic_docker_commands_custom: []-booksonic_docker_commands: "{{ booksonic_docker_commands_default-                               + booksonic_docker_commands_custom }}"+booksonic_role_docker_envs_custom: {}+booksonic_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='booksonic')+                                | combine(lookup('role_var', '_docker_envs_custom', role='booksonic')) }}"  # Volumes-booksonic_docker_volumes_default:-  - "{{ booksonic_paths_location }}:/config"+booksonic_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='booksonic') }}:/config"   - "/mnt/unionfs/Media/Audiobooks:/audiobooks"   - "/mnt/unionfs/Media/Podcasts:/podcasts"   - "/mnt/unionfs/Media:/othermedia"-booksonic_docker_volumes_custom: []-booksonic_docker_volumes: "{{ booksonic_docker_volumes_default-                              + booksonic_docker_volumes_custom }}"--# Devices-booksonic_docker_devices_default: []-booksonic_docker_devices_custom: []-booksonic_docker_devices: "{{ booksonic_docker_devices_default-                              + booksonic_docker_devices_custom }}"--# Hosts-booksonic_docker_hosts_default: {}-booksonic_docker_hosts_custom: {}-booksonic_docker_hosts: "{{ docker_hosts_common-                            | combine(booksonic_docker_hosts_default)-                            | combine(booksonic_docker_hosts_custom) }}"--# Labels-booksonic_docker_labels_default: {}-booksonic_docker_labels_custom: {}-booksonic_docker_labels: "{{ docker_labels_common-                             | combine(booksonic_docker_labels_default)-                             | combine(booksonic_docker_labels_custom) }}"+booksonic_role_docker_volumes_custom: []+booksonic_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='booksonic')+                                   + lookup('role_var', '_docker_volumes_custom', role='booksonic') }}"  # Hostname-booksonic_docker_hostname: "{{ booksonic_name }}"+booksonic_role_docker_hostname: "{{ booksonic_name }}"  # Networks-booksonic_docker_networks_alias: "{{ booksonic_name }}"-booksonic_docker_networks_default: []-booksonic_docker_networks_custom: []-booksonic_docker_networks: "{{ docker_networks_common-                               + booksonic_docker_networks_default-                               + booksonic_docker_networks_custom }}"--# Capabilities-booksonic_docker_capabilities_default: []-booksonic_docker_capabilities_custom: []-booksonic_docker_capabilities: "{{ booksonic_docker_capabilities_default-                                   + booksonic_docker_capabilities_custom }}"--# Security Opts-booksonic_docker_security_opts_default: []-booksonic_docker_security_opts_custom: []-booksonic_docker_security_opts: "{{ booksonic_docker_security_opts_default-                                    + booksonic_docker_security_opts_custom }}"+booksonic_role_docker_networks_alias: "{{ booksonic_name }}"+booksonic_role_docker_networks_default: []+booksonic_role_docker_networks_custom: []+booksonic_role_docker_networks: "{{ docker_networks_common+                                    + lookup('role_var', '_docker_networks_default', role='booksonic')+                                    + lookup('role_var', '_docker_networks_custom', role='booksonic') }}"  # Restart Policy-booksonic_docker_restart_policy: unless-stopped+booksonic_role_docker_restart_policy: unless-stopped  # State-booksonic_docker_state: started+booksonic_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,137 +17,94 @@ # Paths ################################ -bookstack_paths_folder: "{{ bookstack_name }}"-bookstack_paths_location: "{{ server_appdata_path }}/{{ bookstack_paths_folder }}"-bookstack_paths_folders_list:-  - "{{ bookstack_paths_location }}"+bookstack_role_paths_folder: "{{ bookstack_name }}"+bookstack_role_paths_location: "{{ server_appdata_path }}/{{ bookstack_role_paths_folder }}"+bookstack_role_paths_folders_list:+  - "{{ bookstack_role_paths_location }}"  ################################ # Web ################################ -bookstack_web_subdomain: "{{ bookstack_name }}"-bookstack_web_domain: "{{ user.domain }}"-bookstack_web_port: "80"-bookstack_web_url: "{{ 'https://' + (bookstack_web_subdomain + '.' + bookstack_web_domain-                    if (bookstack_web_subdomain | length > 0)-                    else bookstack_web_domain) }}"+bookstack_role_web_subdomain: "{{ bookstack_name }}"+bookstack_role_web_domain: "{{ user.domain }}"+bookstack_role_web_port: "80"+bookstack_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='bookstack') + '.' + lookup('role_var', '_web_domain', role='bookstack')+                         if (lookup('role_var', '_web_subdomain', role='bookstack') | length > 0)+                         else lookup('role_var', '_web_domain', role='bookstack')) }}"  ################################ # DNS ################################ -bookstack_dns_record: "{{ bookstack_web_subdomain }}"-bookstack_dns_zone: "{{ bookstack_web_domain }}"-bookstack_dns_proxy: "{{ dns.proxied }}"+bookstack_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='bookstack') }}"+bookstack_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='bookstack') }}"+bookstack_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -bookstack_traefik_sso_middleware: ""-bookstack_traefik_middleware_default: "{{ traefik_default_middleware }}"-bookstack_traefik_middleware_custom: ""-bookstack_traefik_certresolver: "{{ traefik_default_certresolver }}"-bookstack_traefik_enabled: true+bookstack_role_traefik_sso_middleware: ""+bookstack_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+bookstack_role_traefik_middleware_custom: ""+bookstack_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+bookstack_role_traefik_enabled: true  ################################ # Docker ################################  # Container-bookstack_docker_container: "{{ bookstack_name }}"+bookstack_role_docker_container: "{{ bookstack_name }}"  # Image-bookstack_docker_image_pull: true-bookstack_docker_image_tag: "latest"-bookstack_docker_image: "lscr.io/linuxserver/bookstack:{{ bookstack_docker_image_tag }}"--# Ports-bookstack_docker_ports_defaults: []-bookstack_docker_ports_custom: []-bookstack_docker_ports: "{{ bookstack_docker_ports_defaults-                            + bookstack_docker_ports_custom }}"+bookstack_role_docker_image_pull: true+bookstack_role_docker_image_repo: "lscr.io/linuxserver/bookstack"+bookstack_role_docker_image_tag: "latest"+bookstack_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='bookstack') }}:{{ lookup('role_var', '_docker_image_tag', role='bookstack') }}"  # Envs-bookstack_docker_envs_default:+bookstack_role_docker_envs_default:   TZ: "{{ tz }}"   PUID: "{{ uid }}"   PGID: "{{ gid }}"   APP_KEY: "{{ bookstack_saltbox_facts.facts.app_key }}"-  APP_URL: "https://{{ bookstack_web_subdomain + '.' + bookstack_web_domain }}"+  APP_URL: "{{ lookup('role_var', '_web_url', role='bookstack') }}"   DB_HOST: "mariadb"   DB_PORT: "3306"   DB_USERNAME: "root"-  DB_PASSWORD: "{{ mariadb_docker_env_password }}"+  DB_PASSWORD: "{{ lookup('role_var', '_docker_env_password', role='mariadb') }}"   DB_DATABASE: bookstackapp-bookstack_docker_envs_custom: {}-bookstack_docker_envs: "{{ bookstack_docker_envs_default-                           | combine(bookstack_docker_envs_custom) }}"--# Commands-bookstack_docker_commands_default: []-bookstack_docker_commands_custom: []-bookstack_docker_commands: "{{ bookstack_docker_commands_default-                               + bookstack_docker_commands_custom }}"+bookstack_role_docker_envs_custom: {}+bookstack_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='bookstack')+                                | combine(lookup('role_var', '_docker_envs_custom', role='bookstack')) }}"  # Volumes-bookstack_docker_volumes_default:-  - "{{ bookstack_paths_location }}:/config"-bookstack_docker_volumes_custom: []-bookstack_docker_volumes: "{{ bookstack_docker_volumes_default-                              + bookstack_docker_volumes_custom }}"--# Devices-bookstack_docker_devices_default: []-bookstack_docker_devices_custom: []-bookstack_docker_devices: "{{ bookstack_docker_devices_default-                              + bookstack_docker_devices_custom }}"--# Hosts-bookstack_docker_hosts_default: {}-bookstack_docker_hosts_custom: {}-bookstack_docker_hosts: "{{ docker_hosts_common-                            | combine(bookstack_docker_hosts_default)-                            | combine(bookstack_docker_hosts_custom) }}"--# Labels-bookstack_docker_labels_default: {}-bookstack_docker_labels_custom: {}-bookstack_docker_labels: "{{ docker_labels_common-                             | combine(bookstack_docker_labels_default)-                             | combine(bookstack_docker_labels_custom) }}"+bookstack_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='bookstack') }}:/config"+bookstack_role_docker_volumes_custom: []+bookstack_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='bookstack')+                                   + lookup('role_var', '_docker_volumes_custom', role='bookstack') }}"  # Hostname-bookstack_docker_hostname: "{{ bookstack_name }}"+bookstack_role_docker_hostname: "{{ bookstack_name }}"  # Networks-bookstack_docker_networks_alias: "{{ bookstack_name }}"-bookstack_docker_networks_default: []-bookstack_docker_networks_custom: []-bookstack_docker_networks: "{{ docker_networks_common-                               + bookstack_docker_networks_default-                               + bookstack_docker_networks_custom }}"--# Capabilities-bookstack_docker_capabilities_default: []-bookstack_docker_capabilities_custom: []-bookstack_docker_capabilities: "{{ bookstack_docker_capabilities_default-                                   + bookstack_docker_capabilities_custom }}"--# Security Opts-bookstack_docker_security_opts_default: []-bookstack_docker_security_opts_custom: []-bookstack_docker_security_opts: "{{ bookstack_docker_security_opts_default-                                    + bookstack_docker_security_opts_custom }}"+bookstack_role_docker_networks_alias: "{{ bookstack_name }}"+bookstack_role_docker_networks_default: []+bookstack_role_docker_networks_custom: []+bookstack_role_docker_networks: "{{ docker_networks_common+                                    + lookup('role_var', '_docker_networks_default', role='bookstack')+                                    + lookup('role_var', '_docker_networks_custom', role='bookstack') }}"  # Restart Policy-bookstack_docker_restart_policy: unless-stopped+bookstack_role_docker_restart_policy: unless-stopped  # State-bookstack_docker_state: started+bookstack_role_docker_state: started  # Dependencies-bookstack_depends_on: "mariadb"-bookstack_depends_on_delay: "0"-bookstack_depends_on_healthchecks: "false"+bookstack_role_depends_on: "mariadb"+bookstack_role_depends_on_delay: "0"+bookstack_role_depends_on_healthchecks: "false"

@@ -10,13 +10,13 @@ - name: Bookstack | Generate App Key   community.docker.docker_container:     name: bookstack-app-key-    image: "{{ bookstack_docker_image }}"+    image: "{{ lookup('role_var', '_docker_image', role='bookstack') }}"     command: "appkey"-    detach: no+    detach: false     entrypoint: "/bin/bash"     networks:       - name: saltbox-    cleanup: yes+    cleanup: true     state: started     container_default_behavior: compatibility     tls_hostname: localhost@@ -31,14 +31,15 @@       app_key: "{{ bookstack_generated_app_key.container.Output }}"     owner: "{{ user.name }}"     group: "{{ user.name }}"+    base_path: "{{ server_appdata_path }}"   register: bookstack_saltbox_facts  - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: MariaDB Role   ansible.builtin.include_role:@@ -49,7 +50,7 @@     name: "bookstackapp"     login_host: "mariadb"     login_user: "root"-    login_password: "{{ mariadb_docker_env_password }}"+    login_password: "{{ lookup('role_var', '_docker_env_password', role='mariadb') }}"     state: present  - name: Remove existing Docker container

@@ -17,171 +17,133 @@ # Paths ################################ -calibre_paths_folder: "{{ calibre_name }}"-calibre_paths_location: "{{ server_appdata_path }}/{{ calibre_paths_folder }}"-calibre_paths_folders_list:-  - "{{ calibre_paths_location }}"-  - /mnt/local/Media/Books+calibre_role_paths_folder: "{{ calibre_name }}"+calibre_role_paths_location: "{{ server_appdata_path }}/{{ calibre_role_paths_folder }}"+calibre_role_paths_folders_list:+  - "{{ calibre_role_paths_location }}"+  - "{{ server_local_folder_path }}/Media/Books"  ################################ # Web ################################ -calibre_web_subdomain: "{{ calibre_name }}"-calibre_web_domain: "{{ user.domain }}"-calibre_web_port: "8080"-calibre_web_url: "{{ 'https://' + (lookup('vars', calibre_name + '_web_subdomain', default=calibre_web_subdomain) + '.' + lookup('vars', calibre_name + '_web_domain', default=calibre_web_domain)-                  if (lookup('vars', calibre_name + '_web_subdomain', default=calibre_web_subdomain) | length > 0)-                  else lookup('vars', calibre_name + '_web_domain', default=calibre_web_domain)) }}"+calibre_role_web_subdomain: "{{ calibre_name }}"+calibre_role_web_domain: "{{ user.domain }}"+calibre_role_web_port: "8080"+calibre_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='calibre') + '.' + lookup('role_var', '_web_domain', role='calibre')+                       if (lookup('role_var', '_web_subdomain', role='calibre') | length > 0)+                       else lookup('role_var', '_web_domain', role='calibre')) }}" -calibre_web2_subdomain: "{{ calibre_name }}books"-calibre_web2_domain: "{{ user.domain }}"-calibre_web2_port: "8081"-calibre_web2_web_url: "{{ 'https://' + (lookup('vars', calibre_name + '_web2_subdomain', default=calibre_web2_subdomain) + '.' + lookup('vars', calibre_name + '_web2_domain', default=calibre_web2_domain)-                       if (lookup('vars', calibre_name + '_web2_subdomain', default=calibre_web2_subdomain) | length > 0)-                       else lookup('vars', calibre_name + '_web2_domain', default=calibre_web2_domain)) }}"+calibre_role_web2_subdomain: "{{ calibre_name }}books"+calibre_role_web2_domain: "{{ user.domain }}"+calibre_role_web2_port: "8081"+calibre_role_web2_role_web_url: "{{ 'https://' + (lookup('role_var', '_web2_subdomain', role='calibre') + '.' + lookup('role_var', '_web2_domain', role='calibre')+                                 if (lookup('role_var', '_web2_subdomain', role='calibre') | length > 0)+                                 else lookup('role_var', '_web2_domain', role='calibre')) }}"  ################################ # DNS ################################ -calibre_dns_record: "{{ lookup('vars', calibre_name + '_web_subdomain', default=calibre_web_subdomain) }}"-calibre_dns_zone: "{{ lookup('vars', calibre_name + '_web_domain', default=calibre_web_domain) }}"-calibre_dns_proxy: "{{ dns.proxied }}"-calibre_dns2_record: "{{ lookup('vars', calibre_name + '_web2_subdomain', default=calibre_web2_subdomain) }}"-calibre_dns2_zone: "{{ lookup('vars', calibre_name + '_web2_domain', default=calibre_web2_domain) }}"-calibre_dns2_proxy: "{{ dns.proxied }}"+calibre_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='calibre') }}"+calibre_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='calibre') }}"+calibre_role_dns_proxy: "{{ dns_proxied }}"+calibre_role_dns2_record: "{{ lookup('role_var', '_web2_subdomain', role='calibre') }}"+calibre_role_dns2_zone: "{{ lookup('role_var', '_web2_domain', role='calibre') }}"+calibre_role_dns2_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -calibre_traefik_sso_middleware: ""-calibre_traefik_middleware_default: "{{ traefik_default_middleware }}"-calibre_traefik_middleware_custom: ""-calibre_traefik_certresolver: "{{ traefik_default_certresolver }}"-calibre_traefik_enabled: true-calibre_books_traefik_sso_middleware: ""-calibre_books_traefik_middleware_default: "{{ traefik_default_middleware-                                              + (',' + lookup('vars', calibre_name + '_books_traefik_sso_middleware', default=calibre_books_traefik_sso_middleware)-                                                if (lookup('vars', calibre_name + '_books_traefik_sso_middleware', default=calibre_books_traefik_sso_middleware) | length > 0)-                                                else '') }}"-calibre_books_traefik_middleware_custom: ""-calibre_books_traefik_middleware: "{{ calibre_books_traefik_middleware_default-                                      + (',' + calibre_books_traefik_middleware_custom-                                        if (not calibre_books_traefik_middleware_custom.startswith(',') and calibre_books_traefik_middleware_custom | length > 0)-                                        else calibre_books_traefik_middleware_custom) }}"-calibre_books_traefik_router: "{{ lookup('vars', calibre_name + '_web2_subdomain', default=calibre_web2_subdomain) }}"+calibre_role_traefik_sso_middleware: ""+calibre_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+calibre_role_traefik_middleware_custom: ""+calibre_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+calibre_role_traefik_enabled: true+calibre_role_books_traefik_sso_middleware: ""+calibre_role_books_traefik_middleware_default: "{{ traefik_default_middleware+                                                   + (',' + lookup('role_var', '_books_traefik_sso_middleware', role='calibre')+                                                     if (lookup('role_var', '_books_traefik_sso_middleware', role='calibre') | length > 0)+                                                     else '') }}"+calibre_role_books_traefik_middleware_custom: ""+calibre_role_books_traefik_middleware: "{{ lookup('role_var', '_books_traefik_middleware_default', role='calibre')+                                           + (',' + lookup('role_var', '_books_traefik_middleware_custom', role='calibre')+                                             if (not lookup('role_var', '_books_traefik_middleware_custom', role='calibre').startswith(',') and lookup('role_var', '_books_traefik_middleware_custom', role='calibre') | length > 0)+                                             else lookup('role_var', '_books_traefik_middleware_custom', role='calibre')) }}"  ################################ # Docker ################################  # Container-calibre_docker_container: "{{ calibre_name }}"+calibre_role_docker_container: "{{ calibre_name }}"  # Image-calibre_docker_image_pull: true-calibre_docker_image_repo: "lscr.io/linuxserver/calibre"-calibre_docker_image_tag: "latest"-calibre_docker_image: "{{ lookup('vars', calibre_name + '_docker_image_repo', default=calibre_docker_image_repo)-                          + ':' + lookup('vars', calibre_name + '_docker_image_tag', default=calibre_docker_image_tag) }}"--# Ports-calibre_docker_ports_defaults: []-calibre_docker_ports_custom: []-calibre_docker_ports: "{{ lookup('vars', calibre_name + '_docker_ports_defaults', default=calibre_docker_ports_defaults)-                          + lookup('vars', calibre_name + '_docker_ports_custom', default=calibre_docker_ports_custom) }}"+calibre_role_docker_image_pull: true+calibre_role_docker_image_repo: "lscr.io/linuxserver/calibre"+calibre_role_docker_image_tag: "latest"+calibre_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='calibre') }}:{{ lookup('role_var', '_docker_image_tag', role='calibre') }}"  # Envs-calibre_docker_envs_default:+calibre_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"   CUSTOM_USER: "{{ user.name }}"   PASSWORD: "{{ user.pass }}"   LIBRARYINTERNALPATH: "/library"-calibre_docker_envs_custom: {}-calibre_docker_envs: "{{ lookup('vars', calibre_name + '_docker_envs_default', default=calibre_docker_envs_default)-                         | combine(lookup('vars', calibre_name + '_docker_envs_custom', default=calibre_docker_envs_custom)) }}"--# Commands-calibre_docker_commands_default: []-calibre_docker_commands_custom: []-calibre_docker_commands: "{{ lookup('vars', calibre_name + '_docker_commands_default', default=calibre_docker_commands_default)-                             + lookup('vars', calibre_name + '_docker_commands_custom', default=calibre_docker_commands_custom) }}"+calibre_role_docker_envs_custom: {}+calibre_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='calibre')+                              | combine(lookup('role_var', '_docker_envs_custom', role='calibre')) }}"  # Volumes-calibre_docker_volumes_default:-  - "{{ calibre_paths_location }}:/config"+calibre_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='calibre') }}:/config"   - "/mnt/unionfs/Media/Books:/library"-calibre_docker_volumes_custom: []-calibre_docker_volumes: "{{ lookup('vars', calibre_name + '_docker_volumes_default', default=calibre_docker_volumes_default)-                            + lookup('vars', calibre_name + '_docker_volumes_custom', default=calibre_docker_volumes_custom) }}"--# Devices-calibre_docker_devices_default: []-calibre_docker_devices_custom: []-calibre_docker_devices: "{{ lookup('vars', calibre_name + '_docker_devices_default', default=calibre_docker_devices_default)-                            + lookup('vars', calibre_name + '_docker_devices_custom', default=calibre_docker_devices_custom) }}"--# Hosts-calibre_docker_hosts_default: {}-calibre_docker_hosts_custom: {}-calibre_docker_hosts: "{{ docker_hosts_common-                          | combine(lookup('vars', calibre_name + '_docker_hosts_default', default=calibre_docker_hosts_default))-                          | combine(lookup('vars', calibre_name + '_docker_hosts_custom', default=calibre_docker_hosts_custom)) }}"+calibre_role_docker_volumes_custom: []+calibre_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='calibre')+                                 + lookup('role_var', '_docker_volumes_custom', role='calibre') }}"  # Labels-calibre_docker_labels_default:-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}-http.entrypoints": "web" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}-http.service": "{{ lookup("vars", calibre_name + "_web2_subdomain", default=calibre_web2_subdomain) }}" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}-http.rule": "Host(`{{ lookup("vars", calibre_name + "_web2_subdomain", default=calibre_web2_subdomain) + "." + lookup("vars", calibre_name + "_web2_domain", default=calibre_web2_domain) }}`)" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}-http.middlewares": "{{ traefik_default_middleware_http }}" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}-http.priority": "20" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.entrypoints": "websecure" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.service": "{{ lookup("vars", calibre_name + "_web2_subdomain", default=calibre_web2_subdomain) }}" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.rule": "Host(`{{ lookup("vars", calibre_name + "_web2_subdomain", default=calibre_web2_subdomain) + "." + lookup("vars", calibre_name + "_web2_domain", default=calibre_web2_domain) }}`)" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.middlewares": "{{ calibre_books_traefik_middleware }}" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.tls.options": "securetls@file" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.tls.certresolver": "{{ calibre_traefik_certresolver }}" }'-  - '{ "traefik.http.routers.{{ calibre_books_traefik_router }}.priority": "20" }'-  - '{ "traefik.http.services.{{ calibre_books_traefik_router }}.loadbalancer.server.port": "{{ calibre_web2_port }}" }'-calibre_docker_labels_custom: {}-calibre_docker_labels: "{{ docker_labels_common-                           | combine(lookup('vars', calibre_name + '_docker_labels_default', default=calibre_docker_labels_default))-                           | combine(lookup('vars', calibre_name + '_docker_labels_custom', default=calibre_docker_labels_custom)) }}"+calibre_role_docker_labels_default:+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}-http.entrypoints": "web" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}-http.service": "{{ lookup("role_var", "_web2_subdomain", role="calibre") }}" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}-http.rule": "Host(`{{ lookup("role_var", "_web2_subdomain", role="calibre") + "." + lookup("role_var", "_web2_domain", role="calibre") }}`)" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}-http.middlewares": "{{ traefik_default_middleware_http }}" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}-http.priority": "20" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.entrypoints": "websecure" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.service": "{{ lookup("role_var", "_web2_subdomain", role="calibre") }}" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.rule": "Host(`{{ lookup("role_var", "_web2_subdomain", role="calibre") + "." + lookup("role_var", "_web2_domain", role="calibre") }}`)" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.middlewares": "{{ lookup("role_var", "_books_traefik_middleware", role="calibre") }}" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.tls.options": "securetls@file" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.tls.certresolver": "{{ lookup("role_var", "_traefik_certresolver", role="calibre") }}" }'+  - '{ "traefik.http.routers.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.priority": "20" }'+  - '{ "traefik.http.services.{{ lookup("role_var", "_web2_subdomain", role="calibre") }}.loadbalancer.server.port": "{{ lookup("role_var", "_web2_port", role="calibre") }}" }'+calibre_role_docker_labels_custom: {}+calibre_role_docker_labels: "{{ lookup('role_var', '_docker_labels_default', role='calibre')+                                | combine(lookup('role_var', '_docker_labels_custom', role='calibre')) }}"  # Hostname-calibre_docker_hostname: "{{ calibre_name }}"--# Network Mode-calibre_docker_network_mode_default: "{{ docker_networks_name_common }}"-calibre_docker_network_mode: "{{ lookup('vars', calibre_name + '_docker_network_mode_default', default=calibre_docker_network_mode_default) }}"+calibre_role_docker_hostname: "{{ calibre_name }}"  # Networks-calibre_docker_networks_alias: "{{ calibre_name }}"-calibre_docker_networks_default: []-calibre_docker_networks_custom: []-calibre_docker_networks: "{{ docker_networks_common-                             + lookup('vars', calibre_name + '_docker_networks_default', default=calibre_docker_networks_default)-                             + lookup('vars', calibre_name + '_docker_networks_custom', default=calibre_docker_networks_custom) }}"--# Capabilities-calibre_docker_capabilities_default: []-calibre_docker_capabilities_custom: []-calibre_docker_capabilities: "{{ lookup('vars', calibre_name + '_docker_capabilities_default', default=calibre_docker_capabilities_default)-                                 + lookup('vars', calibre_name + '_docker_capabilities_custom', default=calibre_docker_capabilities_custom) }}"+calibre_role_docker_networks_alias: "{{ calibre_name }}"+calibre_role_docker_networks_default: []+calibre_role_docker_networks_custom: []+calibre_role_docker_networks: "{{ docker_networks_common+                                  + lookup('role_var', '_docker_networks_default', role='calibre')+                                  + lookup('role_var', '_docker_networks_custom', role='calibre') }}"  # Security Opts-calibre_docker_security_opts_default:+calibre_role_docker_security_opts_default:   - seccomp=unconfined-calibre_docker_security_opts_custom: []-calibre_docker_security_opts: "{{ lookup('vars', calibre_name + '_docker_security_opts_default', default=calibre_docker_security_opts_default)-                                  + lookup('vars', calibre_name + '_docker_security_opts_custom', default=calibre_docker_security_opts_custom) }}"+calibre_role_docker_security_opts_custom: []+calibre_role_docker_security_opts: "{{ lookup('role_var', '_docker_security_opts_default', role='calibre')+                                       + lookup('role_var', '_docker_security_opts_custom', role='calibre') }}"  # Restart Policy-calibre_docker_restart_policy: unless-stopped+calibre_role_docker_restart_policy: unless-stopped  # State-calibre_docker_state: started+calibre_role_docker_state: started

@@ -10,16 +10,16 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns2_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns2_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns2_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns2_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns2_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns2_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -11,156 +11,116 @@ # Basics ################################ -calibre_web_name: calibre-web+calibre_web_role_name: calibre-web  ################################ # Paths ################################ -calibre_web_paths_folder: "{{ calibre_web_name }}"-calibre_web_paths_location: "{{ server_appdata_path }}/{{ calibre_web_paths_folder }}"-calibre_web_paths_folders_list:-  - "{{ calibre_web_paths_location }}"-  - "{{ calibre_web_paths_location }}/cache"+calibre_web_role_paths_folder: "{{ calibre_web_role_name }}"+calibre_web_role_paths_location: "{{ server_appdata_path }}/{{ calibre_web_role_paths_folder }}"+calibre_web_role_paths_folders_list:+  - "{{ calibre_web_role_paths_location }}"+  - "{{ calibre_web_role_paths_location }}/cache"  ################################ # Web ################################ -calibre_web_web_subdomain: "{{ calibre_web_name }}"-calibre_web_web_domain: "{{ user.domain }}"-calibre_web_web_port: "8083"-calibre_web_web_url: "{{ 'https://' + (calibre_web_web_subdomain + '.' + calibre_web_web_domain-                      if (calibre_web_web_subdomain | length > 0)-                      else calibre_web_web_domain) }}"+calibre_web_role_web_subdomain: "{{ calibre_web_role_name }}"+calibre_web_role_web_domain: "{{ user.domain }}"+calibre_web_role_web_port: "8083"+calibre_web_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='calibre_web') + '.' + lookup('role_var', '_web_domain', role='calibre_web')+                           if (lookup('role_var', '_web_subdomain', role='calibre_web') | length > 0)+                           else lookup('role_var', '_web_domain', role='calibre_web')) }}"  ################################ # DNS ################################ -calibre_web_dns_record: "{{ calibre_web_web_subdomain }}"-calibre_web_dns_zone: "{{ calibre_web_web_domain }}"-calibre_web_dns_proxy: "{{ dns.proxied }}"+calibre_web_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='calibre_web') }}"+calibre_web_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='calibre_web') }}"+calibre_web_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -calibre_web_traefik_sso_middleware: ""-calibre_web_traefik_middleware_default: "{{ traefik_default_middleware }},kobo-sync-headers"-calibre_web_traefik_middleware_custom: ""-calibre_web_traefik_certresolver: "{{ traefik_default_certresolver }}"-calibre_web_traefik_enabled: true+calibre_web_role_traefik_sso_middleware: ""+calibre_web_role_traefik_middleware_default: "{{ traefik_default_middleware }},kobo-sync-headers"+calibre_web_role_traefik_middleware_custom: ""+calibre_web_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+calibre_web_role_traefik_enabled: true  ################################-# THEME+# Theme ################################  # Options can be found at https://github.com/themepark-dev/theme.park-calibre_web_themepark_enabled: false-calibre_web_themepark_theme: "{{ global_themepark_theme }}"-calibre_web_themepark_domain: "{{ global_themepark_domain }}"+calibre_web_role_themepark_enabled: false+calibre_web_role_themepark_theme: "{{ global_themepark_theme }}"+calibre_web_role_themepark_domain: "{{ global_themepark_domain }}"  ################################ # Docker ################################  # Container-calibre_web_docker_container: "{{ calibre_web_name }}"+calibre_web_role_docker_container: "{{ calibre_web_role_name }}"  # Image-calibre_web_docker_image_pull: true-calibre_web_docker_image_tag: "latest"-calibre_web_docker_image: "lscr.io/linuxserver/calibre-web:{{ calibre_web_docker_image_tag }}"--# Ports-calibre_web_docker_ports_defaults: []-calibre_web_docker_ports_custom: []-calibre_web_docker_ports: "{{ calibre_web_docker_ports_defaults-                              + calibre_web_docker_ports_custom }}"+calibre_web_role_docker_image_pull: true+calibre_web_role_docker_image_repo: "lscr.io/linuxserver/calibre-web"+calibre_web_role_docker_image_tag: "latest"+calibre_web_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='calibre_web') }}:{{ lookup('role_var', '_docker_image_tag', role='calibre_web') }}"  # Envs-calibre_web_docker_envs_default:+calibre_web_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"   CACHE_DIR: "/cache/"   USE_CONFIG_DIR: "true"   DOCKER_MODS: linuxserver/mods:universal-calibre-calibre_web_docker_envs_custom: {}-calibre_web_docker_envs_theme:+calibre_web_role_docker_envs_theme:   DOCKER_MODS: "linuxserver/mods:universal-calibre|ghcr.io/themepark-dev/theme.park:calibre-web"-  TP_DOMAIN: "{{ calibre_web_themepark_domain }}"-  TP_THEME: "{{ calibre_web_themepark_theme }}"-calibre_web_docker_envs: "{{ calibre_web_docker_envs_default-                             | combine(calibre_web_docker_envs_custom)-                          if not (calibre_web_themepark_enabled)-                          else calibre_web_docker_envs_default-                             | combine(calibre_web_docker_envs_custom)-                             | combine(calibre_web_docker_envs_theme) }}"--# Commands-calibre_web_docker_commands_default: []-calibre_web_docker_commands_custom: []-calibre_web_docker_commands: "{{ calibre_web_docker_commands_default-                                 + calibre_web_docker_commands_custom }}"+  TP_DOMAIN: "{{ lookup('role_var', '_themepark_domain', role='calibre_web') }}"+  TP_THEME: "{{ lookup('role_var', '_themepark_theme', role='calibre_web') }}"+calibre_web_role_docker_envs_custom: {}+calibre_web_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='calibre_web')+                                  | combine(lookup('role_var', '_docker_envs_theme', role='calibre_web') if lookup('role_var', '_themepark_enabled', role='calibre_web') else {})+                                  | combine(lookup('role_var', '_docker_envs_custom', role='calibre_web')) }}"  # Volumes-calibre_web_docker_volumes_default:-  - "{{ calibre_web_paths_location }}:/calibre-web"-  - "{{ calibre_web_paths_location }}/config:/config"-  - "{{ calibre_web_paths_location }}/cache:/cache"+calibre_web_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='calibre_web') }}:/calibre-web"+  - "{{ lookup('role_var', '_paths_location', role='calibre_web') }}/config:/config"+  - "{{ lookup('role_var', '_paths_location', role='calibre_web') }}/cache:/cache"   - "/mnt/unionfs/Media/Books:/books"-calibre_web_docker_volumes_custom: []-calibre_web_docker_volumes: "{{ calibre_web_docker_volumes_default-                                + calibre_web_docker_volumes_custom }}"--# Devices-calibre_web_docker_devices_default: []-calibre_web_docker_devices_custom: []-calibre_web_docker_devices: "{{ calibre_web_docker_devices_default-                                + calibre_web_docker_devices_custom }}"--# Hosts-calibre_web_docker_hosts_default: {}-calibre_web_docker_hosts_custom: {}-calibre_web_docker_hosts: "{{ docker_hosts_common-                              | combine(calibre_web_docker_hosts_default)-                              | combine(calibre_web_docker_hosts_custom) }}"+calibre_web_role_docker_volumes_custom: []+calibre_web_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='calibre_web')+                                     + lookup('role_var', '_docker_volumes_custom', role='calibre_web') }}"  # Labels-calibre_web_docker_labels_default:+calibre_web_role_docker_labels_default:   traefik.http.middlewares.kobo-sync-headers.headers.customrequestheaders.X-Scheme: "https"-calibre_web_docker_labels_custom: {}-calibre_web_docker_labels: "{{ docker_labels_common-                               | combine(calibre_web_docker_labels_default)-                               | combine(calibre_web_docker_labels_custom) }}"+calibre_web_role_docker_labels_custom: {}+calibre_web_role_docker_labels: "{{ lookup('role_var', '_docker_labels_default', role='calibre_web')+                                    | combine(lookup('role_var', '_docker_labels_custom', role='calibre_web')) }}"  # Hostname-calibre_web_docker_hostname: "{{ calibre_web_name }}"+calibre_web_role_docker_hostname: "{{ calibre_web_role_name }}"  # Networks-calibre_web_docker_networks_alias: "{{ calibre_web_name }}"-calibre_web_docker_networks_default: []-calibre_web_docker_networks_custom: []-calibre_web_docker_networks: "{{ docker_networks_common-                                 + calibre_web_docker_networks_default-                                 + calibre_web_docker_networks_custom }}"--# Capabilities-calibre_web_docker_capabilities_default: []-calibre_web_docker_capabilities_custom: []-calibre_web_docker_capabilities: "{{ calibre_web_docker_capabilities_default-                                     + calibre_web_docker_capabilities_custom }}"--# Security Opts-calibre_web_docker_security_opts_default: []-calibre_web_docker_security_opts_custom: []-calibre_web_docker_security_opts: "{{ calibre_web_docker_security_opts_default-                                      + calibre_web_docker_security_opts_custom }}"+calibre_web_role_docker_networks_alias: "{{ calibre_web_role_name }}"+calibre_web_role_docker_networks_default: []+calibre_web_role_docker_networks_custom: []+calibre_web_role_docker_networks: "{{ docker_networks_common+                                      + lookup('role_var', '_docker_networks_default', role='calibre_web')+                                      + lookup('role_var', '_docker_networks_custom', role='calibre_web') }}"  # Restart Policy-calibre_web_docker_restart_policy: unless-stopped+calibre_web_role_docker_restart_policy: unless-stopped  # State-calibre_web_docker_state: started+calibre_web_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,128 +17,85 @@ # Paths ################################ -changedetection_paths_folder: "{{ changedetection_name }}"-changedetection_paths_location: "{{ server_appdata_path }}/{{ changedetection_paths_folder }}"-changedetection_paths_folders_list:-  - "{{ changedetection_paths_location }}"+changedetection_role_paths_folder: "{{ changedetection_name }}"+changedetection_role_paths_location: "{{ server_appdata_path }}/{{ changedetection_role_paths_folder }}"+changedetection_role_paths_folders_list:+  - "{{ changedetection_role_paths_location }}"  ################################ # Web ################################ -changedetection_web_subdomain: "{{ changedetection_name }}"-changedetection_web_domain: "{{ user.domain }}"-changedetection_web_port: "5000"-changedetection_web_url: "{{ 'https://' + (changedetection_web_subdomain + '.' + changedetection_web_domain-                          if (changedetection_web_subdomain | length > 0)-                          else changedetection_web_domain) }}"+changedetection_role_web_subdomain: "{{ changedetection_name }}"+changedetection_role_web_domain: "{{ user.domain }}"+changedetection_role_web_port: "5000"+changedetection_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='changedetection') + '.' + lookup('role_var', '_web_domain', role='changedetection')+                               if (lookup('role_var', '_web_subdomain', role='changedetection') | length > 0)+                               else lookup('role_var', '_web_domain', role='changedetection')) }}"  ################################ # DNS ################################ -changedetection_dns_record: "{{ changedetection_web_subdomain }}"-changedetection_dns_zone: "{{ changedetection_web_domain }}"-changedetection_dns_proxy: "{{ dns.proxied }}"+changedetection_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='changedetection') }}"+changedetection_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='changedetection') }}"+changedetection_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -changedetection_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-changedetection_traefik_middleware_default: "{{ traefik_default_middleware }}"-changedetection_traefik_middleware_custom: ""-changedetection_traefik_certresolver: "{{ traefik_default_certresolver }}"-changedetection_traefik_enabled: true-changedetection_traefik_api_enabled: true-changedetection_traefik_api_endpoint: "PathPrefix(`/api`)"+changedetection_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+changedetection_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+changedetection_role_traefik_middleware_custom: ""+changedetection_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+changedetection_role_traefik_enabled: true+changedetection_role_traefik_api_enabled: true+changedetection_role_traefik_api_endpoint: "PathPrefix(`/api`)"  ################################ # Docker ################################  # Container-changedetection_docker_container: "{{ changedetection_name }}"+changedetection_role_docker_container: "{{ changedetection_name }}"  # Image-changedetection_docker_image_pull: true-changedetection_docker_image_tag: "latest"-changedetection_docker_image: "lscr.io/linuxserver/changedetection.io:{{ changedetection_docker_image_tag }}"--# Ports-changedetection_docker_ports_defaults: []-changedetection_docker_ports_custom: []-changedetection_docker_ports: "{{ changedetection_docker_ports_defaults-                                  + changedetection_docker_ports_custom }}"+changedetection_role_docker_image_pull: true+changedetection_role_docker_image_repo: "lscr.io/linuxserver/changedetection.io"+changedetection_role_docker_image_tag: "latest"+changedetection_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='changedetection') }}:{{ lookup('role_var', '_docker_image_tag', role='changedetection') }}"  # Envs-changedetection_docker_envs_default:+changedetection_role_docker_envs_default:   TZ: "{{ tz }}"   PUID: "{{ uid }}"   PGID: "{{ gid }}"-  BASE_URL: "{{ changedetection_web_url }}"-changedetection_docker_envs_custom: {}-changedetection_docker_envs: "{{ changedetection_docker_envs_default-                                 | combine(changedetection_docker_envs_custom) }}"--# Commands-changedetection_docker_commands_default: []-changedetection_docker_commands_custom: []-changedetection_docker_commands: "{{ changedetection_docker_commands_default-                                     + changedetection_docker_commands_custom }}"+  BASE_URL: "{{ lookup('role_var', '_web_url', role='changedetection') }}"+changedetection_role_docker_envs_custom: {}+changedetection_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='changedetection')+                                      | combine(lookup('role_var', '_docker_envs_custom', role='changedetection')) }}"  # Volumes-changedetection_docker_volumes_default:-  - "{{ changedetection_paths_location }}:/config"-changedetection_docker_volumes_custom: []-changedetection_docker_volumes: "{{ changedetection_docker_volumes_default-                                    + changedetection_docker_volumes_custom }}"--# Devices-changedetection_docker_devices_default: []-changedetection_docker_devices_custom: []-changedetection_docker_devices: "{{ changedetection_docker_devices_default-                                    + changedetection_docker_devices_custom }}"--# Hosts-changedetection_docker_hosts_default: {}-changedetection_docker_hosts_custom: {}-changedetection_docker_hosts: "{{ docker_hosts_common-                                  | combine(changedetection_docker_hosts_default)-                                  | combine(changedetection_docker_hosts_custom) }}"--# Labels-changedetection_docker_labels_default: {}-changedetection_docker_labels_custom: {}-changedetection_docker_labels: "{{ docker_labels_common-                                   | combine(changedetection_docker_labels_default)-                                   | combine(changedetection_docker_labels_custom) }}"+changedetection_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='changedetection') }}:/config"+changedetection_role_docker_volumes_custom: []+changedetection_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='changedetection')+                                         + lookup('role_var', '_docker_volumes_custom', role='changedetection') }}"  # Hostname-changedetection_docker_hostname: "{{ changedetection_name }}"+changedetection_role_docker_hostname: "{{ changedetection_name }}"  # Networks-changedetection_docker_networks_alias: "{{ changedetection_name }}"-changedetection_docker_networks_default: []-changedetection_docker_networks_custom: []-changedetection_docker_networks: "{{ docker_networks_common-                                     + changedetection_docker_networks_default-                                     + changedetection_docker_networks_custom }}"--# Capabilities-changedetection_docker_capabilities_default: []-changedetection_docker_capabilities_custom: []-changedetection_docker_capabilities: "{{ changedetection_docker_capabilities_default-                                         + changedetection_docker_capabilities_custom }}"--# Security Opts-changedetection_docker_security_opts_default: []-changedetection_docker_security_opts_custom: []-changedetection_docker_security_opts: "{{ changedetection_docker_security_opts_default-                                          + changedetection_docker_security_opts_custom }}"+changedetection_role_docker_networks_alias: "{{ changedetection_name }}"+changedetection_role_docker_networks_default: []+changedetection_role_docker_networks_custom: []+changedetection_role_docker_networks: "{{ docker_networks_common+                                          + lookup('role_var', '_docker_networks_default', role='changedetection')+                                          + lookup('role_var', '_docker_networks_custom', role='changedetection') }}"  # Restart Policy-changedetection_docker_restart_policy: unless-stopped+changedetection_role_docker_restart_policy: unless-stopped  # State-changedetection_docker_state: started+changedetection_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,133 +17,90 @@ # Paths ################################ -cherry_paths_folder: "{{ cherry_name }}"-cherry_paths_location: "{{ server_appdata_path }}/{{ cherry_paths_folder }}"-cherry_paths_folders_list:-  - "{{ cherry_paths_location }}"+cherry_role_paths_folder: "{{ cherry_name }}"+cherry_role_paths_location: "{{ server_appdata_path }}/{{ cherry_role_paths_folder }}"+cherry_role_paths_folders_list:+  - "{{ cherry_role_paths_location }}"  ################################ # Web ################################ -cherry_web_subdomain: "{{ cherry_name }}"-cherry_web_domain: "{{ user.domain }}"-cherry_web_port: "8000"-charry_web_url: "{{ 'https://' + (charry_web_subdomain + '.' + charry_web_domain-                 if (charry_web_subdomain | length > 0)-                 else charry_web_domain) }}"+cherry_role_web_subdomain: "{{ cherry_name }}"+cherry_role_web_domain: "{{ user.domain }}"+cherry_role_web_port: "8000"+cherry_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='cherry') + '.' + lookup('role_var', '_web_domain', role='cherry')+                      if (lookup('role_var', '_web_subdomain', role='cherry') | length > 0)+                      else lookup('role_var', '_web_domain', role='cherry')) }}"  ################################ # DNS ################################ -cherry_dns_record: "{{ cherry_web_subdomain }}"-cherry_dns_zone: "{{ cherry_web_domain }}"-cherry_dns_proxy: "{{ dns.proxied }}"+cherry_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='cherry') }}"+cherry_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='cherry') }}"+cherry_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -cherry_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-cherry_traefik_middleware_default: "{{ traefik_default_middleware }}"-cherry_traefik_middleware_custom: ""-cherry_traefik_certresolver: "{{ traefik_default_certresolver }}"-cherry_traefik_enabled: true-cherry_traefik_api_enabled: true-cherry_traefik_api_endpoint: "PathPrefix(`/api`)"+cherry_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+cherry_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+cherry_role_traefik_middleware_custom: ""+cherry_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+cherry_role_traefik_enabled: true+cherry_role_traefik_api_enabled: true+cherry_role_traefik_api_endpoint: "PathPrefix(`/api`)"  ################################ # Docker ################################  # Container-cherry_docker_container: "{{ cherry_name }}"+cherry_role_docker_container: "{{ cherry_name }}"  # Image-cherry_docker_image_pull: true-cherry_docker_image_tag: "latest"-cherry_docker_image: "haishanh/cherry:{{ cherry_docker_image_tag }}"--# Ports-cherry_docker_ports_defaults: []-cherry_docker_ports_custom: []-cherry_docker_ports: "{{ cherry_docker_ports_defaults-                         + cherry_docker_ports_custom }}"+cherry_role_docker_image_pull: true+cherry_role_docker_image_repo: "haishanh/cherry"+cherry_role_docker_image_tag: "latest"+cherry_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='cherry') }}:{{ lookup('role_var', '_docker_image_tag', role='cherry') }}"  # Envs-cherry_docker_envs_default:+cherry_role_docker_envs_default:   TZ: "{{ tz }}"   PUID: "{{ uid }}"   PGID: "{{ gid }}"   JWT_SECRET: "{{ cherry_secret_key.stdout }}"   ENABLE_HTTP_REMOTE_USER: "1"-cherry_docker_envs_custom: {}-cherry_docker_envs: "{{ cherry_docker_envs_default-                        | combine(cherry_docker_envs_custom) }}"--# Commands-cherry_docker_commands_default: []-cherry_docker_commands_custom: []-cherry_docker_commands: "{{ cherry_docker_commands_default-                            + cherry_docker_commands_custom }}"+cherry_role_docker_envs_custom: {}+cherry_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='cherry')+                             | combine(lookup('role_var', '_docker_envs_custom', role='cherry')) }}"  # Volumes-cherry_docker_volumes_default:-  - "{{ cherry_paths_location }}:/data"-cherry_docker_volumes_custom: []-cherry_docker_volumes: "{{ cherry_docker_volumes_default-                           + cherry_docker_volumes_custom }}"--# Devices-cherry_docker_devices_default: []-cherry_docker_devices_custom: []-cherry_docker_devices: "{{ cherry_docker_devices_default-                           + cherry_docker_devices_custom }}"--# Hosts-cherry_docker_hosts_default: {}-cherry_docker_hosts_custom: {}-cherry_docker_hosts: "{{ docker_hosts_common-                         | combine(cherry_docker_hosts_default)-                         | combine(cherry_docker_hosts_custom) }}"--# Labels-cherry_docker_labels_default: {}-cherry_docker_labels_custom: {}-cherry_docker_labels: "{{ docker_labels_common-                          | combine(cherry_docker_labels_default)-                          | combine(cherry_docker_labels_custom) }}"+cherry_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='cherry') }}:/data"+cherry_role_docker_volumes_custom: []+cherry_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='cherry')+                                + lookup('role_var', '_docker_volumes_custom', role='cherry') }}"  # Hostname-cherry_docker_hostname: "{{ cherry_name }}"+cherry_role_docker_hostname: "{{ cherry_name }}"  # Networks-cherry_docker_networks_alias: "{{ cherry_name }}"-cherry_docker_networks_default: []-cherry_docker_networks_custom: []-cherry_docker_networks: "{{ docker_networks_common-                            + cherry_docker_networks_default-                            + cherry_docker_networks_custom }}"--# Capabilities-cherry_docker_capabilities_default: []-cherry_docker_capabilities_custom: []-cherry_docker_capabilities: "{{ cherry_docker_capabilities_default-                                + cherry_docker_capabilities_custom }}"--# Security Opts-cherry_docker_security_opts_default: []-cherry_docker_security_opts_custom: []-cherry_docker_security_opts: "{{ cherry_docker_security_opts_default-                                 + cherry_docker_security_opts_custom }}"+cherry_role_docker_networks_alias: "{{ cherry_name }}"+cherry_role_docker_networks_default: []+cherry_role_docker_networks_custom: []+cherry_role_docker_networks: "{{ docker_networks_common+                                 + lookup('role_var', '_docker_networks_default', role='cherry')+                                 + lookup('role_var', '_docker_networks_custom', role='cherry') }}"  # Restart Policy-cherry_docker_restart_policy: unless-stopped+cherry_role_docker_restart_policy: unless-stopped  # State-cherry_docker_state: started+cherry_role_docker_state: started  # Healthcheck-cherry_docker_healthcheck:+cherry_role_docker_healthcheck:   test: ["NONE"]

@@ -15,9 +15,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,102 +17,58 @@ # Paths ################################ -chrome_paths_folder: "{{ chrome_name }}"-chrome_paths_location: "{{ server_appdata_path }}/{{ chrome_paths_folder }}"-chrome_paths_folders_list:-  - "{{ chrome_paths_location }}"+chrome_role_paths_folder: "{{ chrome_name }}"+chrome_role_paths_location: "{{ server_appdata_path }}/{{ chrome_role_paths_folder }}"+chrome_role_paths_folders_list:+  - "{{ chrome_role_paths_location }}"  ################################ # Docker ################################  # Container-chrome_docker_container: "{{ chrome_name }}"+chrome_role_docker_container: "{{ chrome_name }}"  # Image-chrome_docker_image_pull: true-chrome_docker_image: "gcr.io/zenika-hub/alpine-chrome"-chrome_docker_image_tag: "123"--# Ports-chrome_docker_ports_defaults:-  - "9222:9222"-chrome_docker_ports_custom: []-chrome_docker_ports: "{{ chrome_docker_ports_defaults-                          + chrome_docker_ports_custom }}"+chrome_role_docker_image_pull: true+chrome_role_docker_image_repo: "gcr.io/zenika-hub/alpine-chrome"+chrome_role_docker_image_tag: "124"+chrome_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='chrome') }}:{{ lookup('role_var', '_docker_image_tag', role='chrome') }}"  # Envs-chrome_docker_envs_default:+chrome_role_docker_envs_default:   TZ: "{{ tz }}"   PUID: "{{ uid }}"   PGID: "{{ gid }}"-chrome_docker_envs_custom: {}-chrome_docker_envs: "{{ chrome_docker_envs_default-                         | combine(chrome_docker_envs_custom) }}"+chrome_role_docker_envs_custom: {}+chrome_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='chrome')+                             | combine(lookup('role_var', '_docker_envs_custom', role='chrome')) }}"  # Commands-chrome_docker_commands_default:+chrome_role_docker_commands_default:   - "--no-sandbox"   - "--disable-gpu"   - "--disable-dev-shm-usage"   - "--remote-debugging-address=0.0.0.0"   - "--remote-debugging-port=9222"   - "--hide-scrollbars"-chrome_docker_commands_custom: []-chrome_docker_commands: "{{ chrome_docker_commands_default-                             + chrome_docker_commands_custom }}"--# Volumes-chrome_docker_volumes_default: []-chrome_docker_volumes_custom: []-chrome_docker_volumes: "{{ chrome_docker_volumes_default-                            + chrome_docker_volumes_custom }}"--# Devices-chrome_docker_devices_default: []-chrome_docker_devices_custom: []-chrome_docker_devices: "{{ chrome_docker_devices_default-                            + chrome_docker_devices_custom }}"--# Hosts-chrome_docker_hosts_default: {}-chrome_docker_hosts_custom: {}-chrome_docker_hosts: "{{ docker_hosts_common-                          | combine(chrome_docker_hosts_default)-                          | combine(chrome_docker_hosts_custom) }}"--# Labels-chrome_docker_labels_default: {}-chrome_docker_labels_custom: {}-chrome_docker_labels: "{{ docker_labels_common-                           | combine(chrome_docker_labels_default)-                           | combine(chrome_docker_labels_custom) }}"+chrome_role_docker_commands_custom: []+chrome_role_docker_commands: "{{ lookup('role_var', '_docker_commands_default', role='chrome')+                                 + lookup('role_var', '_docker_commands_custom', role='chrome') }}"  # Hostname-chrome_docker_hostname: "{{ chrome_name }}"+chrome_role_docker_hostname: "{{ chrome_name }}"  # Networks-chrome_docker_networks_alias: "{{ chrome_name }}"-chrome_docker_networks_default: []-chrome_docker_networks_custom: []-chrome_docker_networks: "{{ docker_networks_common-                             + chrome_docker_networks_default-                             + chrome_docker_networks_custom }}"--# Capabilities-chrome_docker_capabilities_default: []-chrome_docker_capabilities_custom: []-chrome_docker_capabilities: "{{ chrome_docker_capabilities_default-                                 + chrome_docker_capabilities_custom }}"--# Security Opts-chrome_docker_security_opts_default: []-chrome_docker_security_opts_custom: []-chrome_docker_security_opts: "{{ chrome_docker_security_opts_default-                                  + chrome_docker_security_opts_custom }}"+chrome_role_docker_networks_alias: "{{ chrome_name }}"+chrome_role_docker_networks_default: []+chrome_role_docker_networks_custom: []+chrome_role_docker_networks: "{{ docker_networks_common+                                 + lookup('role_var', '_docker_networks_default', role='chrome')+                                 + lookup('role_var', '_docker_networks_custom', role='chrome') }}"  # Restart Policy-chrome_docker_restart_policy: unless-stopped+chrome_role_docker_restart_policy: unless-stopped  # State-chrome_docker_state: started+chrome_role_docker_state: started

@@ -17,23 +17,22 @@ # Settings ################################ -cockpit_traefik_enabled: true-cockpit_vm_enabled: false-cockpit_service_after: docker.service-put_cockpit_dpkg_into_hold: true-put_cockpit_machines_dpkg_into_hold: true+cockpit_role_vm_enabled: false+cockpit_role_service_after: docker.service+cockpit_role_put_dpkg_into_hold: true+cockpit_role_put_machines_dpkg_into_hold: true  ################################ # Paths ################################ -cockpit_paths_socket_location: "/etc/systemd/system/cockpit.socket.d/listen.conf"-cockpit_paths_socket_override_location: "/etc/systemd/system/cockpit.socket.d/override.conf"-cockpit_paths_config_location: "/etc/cockpit/cockpit.conf"-cockpit_paths_traefik_location: "/opt/traefik/cockpit.yml"-cockpit_paths_service_location: "/lib/systemd/system/cockpit.service"-cockpit_paths_override_location: "/etc/systemd/system/cockpit.service.d/override.conf"-cockpit_paths_folders_list:+cockpit_role_paths_socket_location: "/etc/systemd/system/cockpit.socket.d/listen.conf"+cockpit_role_paths_socket_override_location: "/etc/systemd/system/cockpit.socket.d/override.conf"+cockpit_role_paths_config_location: "/etc/cockpit/cockpit.conf"+cockpit_role_paths_traefik_location: "{{ server_appdata_path }}/traefik/cockpit.yml"+cockpit_role_paths_service_location: "/lib/systemd/system/cockpit.service"+cockpit_role_paths_override_location: "/etc/systemd/system/cockpit.service.d/override.conf"+cockpit_role_paths_folders_list:   - "/etc/systemd/system/cockpit.socket.d"   - "/etc/systemd/system/cockpit.service.d"   - "/etc/cockpit"@@ -42,27 +41,28 @@ # Web ################################ -cockpit_web_subdomain: "{{ cockpit_name }}"-cockpit_web_domain: "{{ user.domain }}"-cockpit_web_port: "1337"-cockpit_web_url: "{{ 'https://' + (cockpit_web_subdomain + '.' + cockpit_web_domain-                  if (cockpit_web_subdomain | length > 0)-                  else cockpit_web_domain) }}"+cockpit_role_web_subdomain: "{{ cockpit_name }}"+cockpit_role_web_domain: "{{ user.domain }}"+cockpit_role_web_port: "1337"+cockpit_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='cockpit') + '.' + lookup('role_var', '_web_domain', role='cockpit')+                       if (lookup('role_var', '_web_subdomain', role='cockpit') | length > 0)+                       else lookup('role_var', '_web_domain', role='cockpit')) }}"  ################################ # DNS ################################ -cockpit_dns_record: "{{ cockpit_web_subdomain }}"-cockpit_dns_zone: "{{ cockpit_web_domain }}"-cockpit_dns_proxy: "{{ dns.proxied }}"+cockpit_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='cockpit') }}"+cockpit_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='cockpit') }}"+cockpit_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -cockpit_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-cockpit_traefik_middleware_default: "{{ traefik_default_middleware }}"-cockpit_traefik_middleware_custom: ""-cockpit_traefik_certresolver: "{{ traefik_default_certresolver }}"-cockpit_traefik_api_enabled: false+cockpit_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+cockpit_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+cockpit_role_traefik_middleware_custom: ""+cockpit_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+cockpit_role_traefik_enabled: true+cockpit_role_traefik_api_enabled: false

@@ -10,14 +10,14 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"-  when: cockpit_traefik_enabled+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"+  when: lookup('role_var', '_traefik_enabled', role='cockpit')  - name: Check if 'cockpit_socket' exists   ansible.builtin.stat:-    path: "{{ cockpit_paths_socket_location }}"+    path: "{{ lookup('role_var', '_paths_socket_location', role='cockpit') }}"   register: cockpit_socket  - name: Stop existing 'cockpit_socket'@@ -28,7 +28,7 @@  - name: Check if 'cockpit_service' exists   ansible.builtin.stat:-    path: "{{ cockpit_paths_service_location }}"+    path: "{{ lookup('role_var', '_paths_service_location', role='cockpit') }}"   register: cockpit_service  - name: Stop existing 'cockpit_service'@@ -39,14 +39,14 @@  - name: Check if 'cockpit_traefik' exists   ansible.builtin.stat:-    path: "{{ cockpit_paths_traefik_location }}"+    path: "{{ lookup('role_var', '_paths_traefik_location', role='cockpit') }}"   register: cockpit_traefik  - name: Remove cockpit_traefik template   ansible.builtin.file:-    path: "{{ cockpit_paths_traefik_location }}"+    path: "{{ lookup('role_var', '_paths_traefik_location', role='cockpit') }}"     state: absent-  when: not cockpit_traefik_enabled+  when: (not lookup('role_var', '_traefik_enabled', role='cockpit'))  - name: Create directories   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/directories/create_directories.yml"@@ -54,12 +54,12 @@ - name: Import 'cockpit_traefik' Traefik Template   ansible.builtin.template:     src: cockpit.yml.j2-    dest: "{{ cockpit_paths_traefik_location }}"+    dest: "{{ lookup('role_var', '_paths_traefik_location', role='cockpit') }}"     mode: "664"     owner: "{{ user.name }}"     group: "{{ user.name }}"     force: true-  when: cockpit_traefik_enabled+  when: lookup('role_var', '_traefik_enabled', role='cockpit')  - name: "Import Systemd Tasks"   ansible.builtin.include_tasks: "subtasks/systemd.yml"@@ -69,10 +69,10 @@  - name: "Import VM Tasks"   ansible.builtin.include_tasks: "subtasks/vm.yml"-  when: cockpit_vm_enabled+  when: lookup('role_var', '_vm_enabled', role='cockpit')  - name: Systemd services-  when: not continuous_integration+  when: (not continuous_integration)   block:     - name: Reload systemd       ansible.builtin.systemd_service:@@ -82,10 +82,10 @@       ansible.builtin.systemd:         name: cockpit.socket         state: started-        enabled: yes+        enabled: true      - name: Load 'cockpit_service'       ansible.builtin.systemd:         name: cockpit.service         state: started-        enabled: yes+        enabled: true

@@ -14,19 +14,19 @@   ansible.builtin.dpkg_selections:     name: "cockpit"     selection: install-  when: ("cockpit" in ansible_facts.packages)+  when: ("cockpit" in ansible_facts['packages'])  - name: Package | Install 'cockpit' from backports   ansible.builtin.apt:     name: "cockpit"-    default_release: "{{ ansible_distribution_release }}-backports"+    default_release: "{{ ansible_facts['distribution_release'] }}-backports"     state: latest  - name: Package | Put 'cockpit' into hold   ansible.builtin.dpkg_selections:     name: "cockpit"     selection: hold-  when: put_cockpit_dpkg_into_hold+  when: lookup('role_var', '_put_dpkg_into_hold', role='cockpit')  - name: Package | Get 'cockpit' version   ansible.builtin.command: "cockpit-bridge --version"@@ -37,4 +37,4 @@ - name: Package | Display 'cockpit' version   ansible.builtin.debug:     msg: "Cockpit version {{ cockpit_version.stdout.split()[1] }} installed."-  when: cockpit_version is defined and cockpit_version.stdout is defined+  when: (cockpit_version is defined) and (cockpit_version.stdout is defined)

@@ -10,7 +10,7 @@ - name: System | Import 'cockpit_config'   ansible.builtin.template:     src: cockpit.conf.j2-    dest: "{{ cockpit_paths_config_location }}"+    dest: "{{ lookup('role_var', '_paths_config_location', role='cockpit') }}"     mode: "0664"     owner: root     group: root@@ -19,7 +19,7 @@ - name: System | Import 'cockpit_socket'   ansible.builtin.template:     src: listen.conf.j2-    dest: "{{ cockpit_paths_socket_location }}"+    dest: "{{ lookup('role_var', '_paths_socket_location', role='cockpit') }}"     mode: "0664"     owner: root     group: root@@ -28,7 +28,7 @@ - name: System | Import 'socket_override'   ansible.builtin.template:     src: override.conf.j2-    dest: "{{ cockpit_paths_socket_override_location }}"+    dest: "{{ lookup('role_var', '_paths_socket_override_location', role='cockpit') }}"     mode: "0664"     owner: root     group: root@@ -37,7 +37,7 @@ - name: System | Import 'service_override'   ansible.builtin.template:     src: override.conf.j2-    dest: "{{ cockpit_paths_override_location }}"+    dest: "{{ lookup('role_var', '_paths_override_location', role='cockpit') }}"     mode: "0664"     owner: root     group: root

@@ -14,19 +14,19 @@   ansible.builtin.dpkg_selections:     name: "cockpit-machines"     selection: install-  when: ("cockpit-machines" in ansible_facts.packages)+  when: ("cockpit-machines" in ansible_facts['packages'])  - name: VM | Install 'cockpit-machines' from backports   ansible.builtin.apt:     name: "cockpit-machines"-    default_release: "{{ ansible_distribution_release }}-backports"+    default_release: "{{ ansible_facts['distribution_release'] }}-backports"     state: latest  - name: VM | Put 'cockpit-machines' into hold   ansible.builtin.dpkg_selections:     name: "cockpit-machines"     selection: hold-  when: put_cockpit_machines_dpkg_into_hold+  when: lookup('role_var', '_put_machines_dpkg_into_hold', role='cockpit')  - name: VM | Install necessary packages for Cockpit Machines   ansible.builtin.package:

@@ -1,5 +1,5 @@ [WebService]-Origins = {{ cockpit_web_url }}+Origins = {{ lookup('role_var', '_web_url', role='cockpit') }} ProtocolHeader = X-Forwarded-Proto ForwardedForHeader = X-Forwarded-For AllowUnencrypted = true

@@ -16,10 +16,10 @@       service: "{{ cockpit_name }}"       tls:         options: securetls@file-        certResolver: {{ cockpit_traefik_certresolver }}+        certResolver: {{ lookup('role_var', '_traefik_certresolver', role='cockpit') }}    services:     {{ cockpit_name }}:       loadBalancer:         servers:-          - url: "http://172.19.0.1:{{ cockpit_web_port }}"+          - url: "http://172.19.0.1:{{ lookup('role_var', '_web_port', role='cockpit') }}"

@@ -1,4 +1,4 @@ [Socket] ListenStream=-ListenStream=172.19.0.1:{{ cockpit_web_port }}+ListenStream=172.19.0.1:{{ lookup('role_var', '_web_port', role='cockpit') }} FreeBind=yes

@@ -9,5 +9,5 @@ #########################################################################  [Unit]-After={{ cockpit_service_after }}-Requires={{ cockpit_service_after }}+After={{ lookup('role_var', '_service_after', role='cockpit') }}+Requires={{ lookup('role_var', '_service_after', role='cockpit') }}

@@ -17,135 +17,92 @@ # Paths ################################ -code_server_paths_folder: "{{ code_server_name }}"-code_server_paths_location: "{{ server_appdata_path }}/{{ code_server_paths_folder }}"-code_server_paths_folders_list:-  - "{{ code_server_paths_location }}"-  - "{{ code_server_paths_location }}/project"-  - "{{ code_server_paths_location }}/.config"-  - "{{ code_server_paths_location }}/.local"+code_server_role_paths_folder: "{{ code_server_name }}"+code_server_role_paths_location: "{{ server_appdata_path }}/{{ code_server_role_paths_folder }}"+code_server_role_paths_folders_list:+  - "{{ code_server_role_paths_location }}"+  - "{{ code_server_role_paths_location }}/project"+  - "{{ code_server_role_paths_location }}/.config"+  - "{{ code_server_role_paths_location }}/.local"  ################################ # Web ################################ -code_server_web_subdomain: "{{ code_server_name }}"-code_server_web_domain: "{{ user.domain }}"-code_server_web_port: "8080"-code_server_web_url: "{{ 'https://' + (code_server_web_subdomain + '.' + code_server_web_domain-                      if (code_server_web_subdomain | length > 0)-                      else code_server_web_domain) }}"+code_server_role_web_subdomain: "{{ code_server_name }}"+code_server_role_web_domain: "{{ user.domain }}"+code_server_role_web_port: "8080"+code_server_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='code_server') + '.' + lookup('role_var', '_web_domain', role='code_server')+                           if (lookup('role_var', '_web_subdomain', role='code_server') | length > 0)+                           else lookup('role_var', '_web_domain', role='code_server')) }}"  ################################ # DNS ################################ -code_server_dns_record: "{{ code_server_web_subdomain }}"-code_server_dns_zone: "{{ code_server_web_domain }}"-code_server_dns_proxy: "{{ dns.proxied }}"+code_server_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='code_server') }}"+code_server_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='code_server') }}"+code_server_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -code_server_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"-code_server_traefik_middleware_default: "{{ traefik_default_middleware }}"-code_server_traefik_middleware_custom: ""-code_server_traefik_certresolver: "{{ traefik_default_certresolver }}"-code_server_traefik_enabled: true+code_server_role_traefik_sso_middleware: "{{ traefik_default_sso_middleware }}"+code_server_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+code_server_role_traefik_middleware_custom: ""+code_server_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+code_server_role_traefik_enabled: true  ################################ # Docker ################################  # Container-code_server_docker_container: "{{ code_server_name }}"+code_server_role_docker_container: "{{ code_server_name }}"  # Image-code_server_docker_image_pull: true-code_server_docker_image_tag: "latest"-code_server_docker_image: "codercom/code-server:{{ code_server_docker_image_tag }}"--# Ports-code_server_docker_ports_defaults: []-code_server_docker_ports_custom: []-code_server_docker_ports: "{{ code_server_docker_ports_defaults-                              + code_server_docker_ports_custom }}"+code_server_role_docker_image_pull: true+code_server_role_docker_image_repo: "codercom/code-server"+code_server_role_docker_image_tag: "latest"+code_server_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='code_server') }}:{{ lookup('role_var', '_docker_image_tag', role='code_server') }}"  # Envs-code_server_docker_envs_default:+code_server_role_docker_envs_default:   UMASK: "002"   TZ: "{{ tz }}"   PASSWORD: "{{ user.pass }}"   DOCKER_USER: "{{ user.name }}"-code_server_docker_envs_custom: {}-code_server_docker_envs: "{{ code_server_docker_envs_default-                             | combine(code_server_docker_envs_custom) }}"--# Commands-code_server_docker_commands_default: []-code_server_docker_commands_custom: []-code_server_docker_commands: "{{ code_server_docker_commands_default-                                 + code_server_docker_commands_custom }}"+code_server_role_docker_envs_custom: {}+code_server_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='code_server')+                                  | combine(lookup('role_var', '_docker_envs_custom', role='code_server')) }}"  # Volumes-code_server_docker_volumes_default:-  - "{{ code_server_paths_location }}/project:/home/coder/project"-  - "{{ code_server_paths_location }}/.config:/home/coder/.config"-  - "{{ code_server_paths_location }}/.local:/home/coder/.local"+code_server_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='code_server') }}/project:/home/coder/project"+  - "{{ lookup('role_var', '_paths_location', role='code_server') }}/.config:/home/coder/.config"+  - "{{ lookup('role_var', '_paths_location', role='code_server') }}/.local:/home/coder/.local"   - "{{ server_appdata_path }}:/host_opt"-code_server_docker_volumes_custom: []-code_server_docker_volumes: "{{ code_server_docker_volumes_default-                                + code_server_docker_volumes_custom }}"--# Devices-code_server_docker_devices_default: []-code_server_docker_devices_custom: []-code_server_docker_devices: "{{ code_server_docker_devices_default-                                + code_server_docker_devices_custom }}"--# Hosts-code_server_docker_hosts_default: {}-code_server_docker_hosts_custom: {}-code_server_docker_hosts: "{{ docker_hosts_common-                              | combine(code_server_docker_hosts_default)-                              | combine(code_server_docker_hosts_custom) }}"--# Labels-code_server_docker_labels_default: {}-code_server_docker_labels_custom: {}-code_server_docker_labels: "{{ docker_labels_common-                               | combine(code_server_docker_labels_default)-                               | combine(code_server_docker_labels_custom) }}"+code_server_role_docker_volumes_custom: []+code_server_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='code_server')+                                     + lookup('role_var', '_docker_volumes_custom', role='code_server') }}"  # Hostname-code_server_docker_hostname: "{{ code_server_name }}"+code_server_role_docker_hostname: "{{ code_server_name }}"  # Networks-code_server_docker_networks_alias: "{{ code_server_name }}"-code_server_docker_networks_default: []-code_server_docker_networks_custom: []-code_server_docker_networks: "{{ docker_networks_common-                                 + code_server_docker_networks_default-                                 + code_server_docker_networks_custom }}"--# Capabilities-code_server_docker_capabilities_default: []-code_server_docker_capabilities_custom: []-code_server_docker_capabilities: "{{ code_server_docker_capabilities_default-                                     + code_server_docker_capabilities_custom }}"--# Security Opts-code_server_docker_security_opts_default: []-code_server_docker_security_opts_custom: []-code_server_docker_security_opts: "{{ code_server_docker_security_opts_default-                                      + code_server_docker_security_opts_custom }}"+code_server_role_docker_networks_alias: "{{ code_server_name }}"+code_server_role_docker_networks_default: []+code_server_role_docker_networks_custom: []+code_server_role_docker_networks: "{{ docker_networks_common+                                      + lookup('role_var', '_docker_networks_default', role='code_server')+                                      + lookup('role_var', '_docker_networks_custom', role='code_server') }}"  # Restart Policy-code_server_docker_restart_policy: unless-stopped+code_server_role_docker_restart_policy: unless-stopped  # State-code_server_docker_state: started+code_server_role_docker_state: started  # User-code_server_docker_user: "{{ uid }}:{{ gid }}"+code_server_role_docker_user: "{{ uid }}:{{ gid }}"

@@ -14,9 +14,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -7,24 +7,24 @@ #                   GNU General Public License v3.0                     # ######################################################################### ----- name: Legacy | Check if '/opt/coder' folder exists+- name: Legacy | Check if '{{ server_appdata_path }}/coder' folder exists   ansible.builtin.stat:-    path: "/opt/coder"+    path: "{{ server_appdata_path }}/coder"   register: code_server_oldfolder -- name: Legacy | Check if {{ code_server_paths_location }} folder exists+- name: Legacy | Check if {{ lookup('role_var', '_paths_location', role='code_server') }} folder exists   ansible.builtin.stat:-    path: "{{ code_server_paths_location }}"+    path: "{{ lookup('role_var', '_paths_location', role='code_server') }}"   register: code_server_newfolder -- name: "Fail when '/opt/coder' does not exist"+- name: "Legacy | Fail when '{{ server_appdata_path }}/coder' does not exist"   ansible.builtin.fail:-    msg: "A migration has been attempted, but the /opt/coder folder is missing. If you have already run the migration once, you don't need to pass the -e 'code_server_migrate_coder=true' argument anymore. If this is your first time running the migration but you're using a custom folder, move the folder manually to '/opt/code-server', remove the old 'coder' subdomain then run the tag normally."+    msg: "A migration has been attempted, but the {{ server_appdata_path }}/coder folder is missing. If you have already run the migration once, you don't need to pass the -e 'code_server_migrate_coder=true' argument anymore. If this is your first time running the migration but you're using a custom folder, move the folder manually to '{{ server_appdata_path }}/code-server', remove the old 'coder' subdomain then run the tag normally."   when: (not code_server_oldfolder.stat.exists) -- name: "Fail when {{ code_server_paths_location }} already exists"+- name: "Legacy | Fail when {{ lookup('role_var', '_paths_location', role='code_server') }} already exists"   ansible.builtin.fail:-    msg: "A migration has been attempted, but the {{ code_server_paths_location }} folder already exists. If you have already run the migration once, you don't need to pass the -e 'code_server_migrate_coder=true' argument anymore. If this is your first time running the migration, then you have created a folder manually or have already a container using the {{ code_server_paths_location }} folder. In order for the migration to actually run, an '/opt/coder' folder must exists, while {{ code_server_paths_location }} must not."+    msg: "A migration has been attempted, but the {{ lookup('role_var', '_paths_location', role='code_server') }} folder already exists. If you have already run the migration once, you don't need to pass the -e 'code_server_migrate_coder=true' argument anymore. If this is your first time running the migration, then you have created a folder manually or have already a container using the {{ lookup('role_var', '_paths_location', role='code_server') }} folder. In order for the migration to actually run, an '{{ server_appdata_path }}/coder' folder must exists, while {{ lookup('role_var', '_paths_location', role='code_server') }} must not."   when: (code_server_newfolder.stat.exists)  - name: Legacy | Delete old DNS record@@ -40,11 +40,11 @@  - name: Legacy | Move opt folder 'coder' to 'code-server'   ansible.builtin.shell: |-    mv /opt/coder "{{ code_server_paths_location }}"+    mv {{ server_appdata_path }}/coder "{{ lookup('role_var', '_paths_location', role='code_server') }}"  - name: Legacy | Set permissions on 'code_server'   ansible.builtin.file:-    path: "{{ code_server_paths_location }}"+    path: "{{ lookup('role_var', '_paths_location', role='code_server') }}"     state: directory     recurse: true     owner: "{{ user.name }}"

@@ -1,5 +1,5 @@ ##########################################################################-# Title:            Sandbox: Codex            | Default Variables        #+# Title:            Sandbox: Codex | Default Variables                   # # Author(s):        CHAIR/Raneydazed                                     # # URL:              https://github.com/saltyorg/Sandbox                  # # --                                                                     #@@ -17,130 +17,85 @@ # Paths ################################ -codex_paths_folder: "{{ codex_name }}"-codex_paths_location: "{{ server_appdata_path }}/{{ codex_paths_folder }}"-codex_paths_folders_list:-  - "{{ codex_paths_location }}"-  - "{{ codex_paths_location }}/config"+codex_role_paths_folder: "{{ codex_name }}"+codex_role_paths_location: "{{ server_appdata_path }}/{{ codex_role_paths_folder }}"+codex_role_paths_folders_list:+  - "{{ codex_role_paths_location }}"+  - "{{ codex_role_paths_location }}/config"  ################################ # Web ################################ -codex_web_subdomain: "{{ codex_name }}"-codex_web_domain: "{{ user.domain }}"-codex_web_port: "9810"-codex_web_url: "{{ 'https://' + (codex_web_subdomain + '.' + codex_web_domain-                if (codex_web_subdomain | length > 0)-                else codex_web_domain) }}"+codex_role_web_subdomain: "{{ codex_name }}"+codex_role_web_domain: "{{ user.domain }}"+codex_role_web_port: "9810"+codex_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='codex') + '.' + lookup('role_var', '_web_domain', role='codex')+                     if (lookup('role_var', '_web_subdomain', role='codex') | length > 0)+                     else lookup('role_var', '_web_domain', role='codex')) }}"  ################################ # DNS ################################ -codex_dns_record: "{{ lookup('vars', codex_name + '_web_subdomain', default=codex_web_subdomain) }}"-codex_dns_zone: "{{ lookup('vars', codex_name + '_web_domain', default=codex_web_domain) }}"-codex_dns_proxy: "{{ dns.proxied }}"+codex_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='codex') }}"+codex_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='codex') }}"+codex_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -codex_traefik_sso_middleware: ""-codex_traefik_middleware_default: "{{ traefik_default_middleware }}"-codex_traefik_middleware_custom: ""-codex_traefik_certresolver: "{{ traefik_default_certresolver }}"-codex_traefik_enabled: true-codex_traefik_api_enabled: false-codex_traefik_api_endpoint: ""+codex_role_traefik_sso_middleware: ""+codex_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+codex_role_traefik_middleware_custom: ""+codex_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+codex_role_traefik_enabled: true+codex_role_traefik_api_enabled: false+codex_role_traefik_api_endpoint: ""  ################################ # Docker ################################  # Container-codex_docker_container: "{{ codex_name }}"+codex_role_docker_container: "{{ codex_name }}"  # Image-codex_docker_image_pull: true-codex_docker_image_repo: "docker.io/ajslater/codex"-codex_docker_image_tag: "latest"-codex_docker_image: "{{ lookup('vars', codex_name + '_docker_image_repo', default=codex_docker_image_repo)-                        + ':' + lookup('vars', codex_name + '_docker_image_tag', default=codex_docker_image_tag) }}"--# Ports-codex_docker_ports_defaults: []-codex_docker_ports_custom: []-codex_docker_ports: "{{ lookup('vars', codex_name + '_docker_ports_defaults', default=codex_docker_ports_defaults)-                        + lookup('vars', codex_name + '_docker_ports_custom', default=codex_docker_ports_custom) }}"+codex_role_docker_image_pull: true+codex_role_docker_image_repo: "docker.io/ajslater/codex"+codex_role_docker_image_tag: "latest"+codex_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='codex') }}:{{ lookup('role_var', '_docker_image_tag', role='codex') }}"  # Envs-codex_docker_envs_default:+codex_role_docker_envs_default:   PUID: "{{ uid }}"   PGID: "{{ gid }}"   TZ: "{{ tz }}"-codex_docker_envs_custom: {}-codex_docker_envs: "{{ lookup('vars', codex_name + '_docker_envs_default', default=codex_docker_envs_default)-                       | combine(lookup('vars', codex_name + '_docker_envs_custom', default=codex_docker_envs_custom)) }}"--# Commands-codex_docker_commands_default: []-codex_docker_commands_custom: []-codex_docker_commands: "{{ lookup('vars', codex_name + '_docker_commands_default', default=codex_docker_commands_default)-                           + lookup('vars', codex_name + '_docker_docker_commands_custom', default=codex_docker_commands_custom) }}"+codex_role_docker_envs_custom: {}+codex_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='codex')+                            | combine(lookup('role_var', '_docker_envs_custom', role='codex')) }}"  # Volumes-codex_docker_volumes_default:-  - "{{ codex_paths_location }}:/config"-codex_docker_volumes_custom: []-codex_docker_volumes: "{{ lookup('vars', codex_name + '_docker_volumes_default', default=codex_docker_volumes_default)-                          + lookup('vars', codex_name + '_docker_volumes_custom', default=codex_docker_volumes_custom) }}"--# Devices-codex_docker_devices_default: []-codex_docker_devices_custom: []-codex_docker_devices: "{{ lookup('vars', codex_name + '_docker_devices_default', default=codex_docker_devices_default)-                          + lookup('vars', codex_name + '_docker_devices_custom', default=codex_docker_devices_custom) }}"--# Hosts-codex_docker_hosts_default: {}-codex_docker_hosts_custom: {}-codex_docker_hosts: "{{ docker_hosts_common-                        | combine(lookup('vars', codex_name + '_docker_hosts_default', default=codex_docker_hosts_default))-                        | combine(lookup('vars', codex_name + '_docker_hosts_custom', default=codex_docker_hosts_custom)) }}"--# Labels-codex_docker_labels_default: {}-codex_docker_labels_custom: {}-codex_docker_labels: "{{ docker_labels_common-                         | combine(lookup('vars', codex_name + '_docker_labels_default', default=codex_docker_labels_default))-                         | combine(lookup('vars', codex_name + '_docker_labels_custom', default=codex_docker_labels_custom)) }}"+codex_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='codex') }}:/config"+codex_role_docker_volumes_custom: []+codex_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='codex')+                               + lookup('role_var', '_docker_volumes_custom', role='codex') }}"  # Hostname-codex_docker_hostname: "{{ codex_name }}"+codex_role_docker_hostname: "{{ codex_name }}"  # Networks-codex_docker_networks_alias: "{{ codex_name }}"-codex_docker_networks_default: []-codex_docker_networks_custom: []-codex_docker_networks: "{{ docker_networks_common-                           + lookup('vars', codex_name + '_docker_networks_default', default=codex_docker_networks_default)-                           + lookup('vars', codex_name + '_docker_networks_custom', default=codex_docker_networks_custom) }}"--# Capabilities-codex_docker_capabilities_default: []-codex_docker_capabilities_custom: []-codex_docker_capabilities: "{{ lookup('vars', codex_name + '_docker_capabilities_default', default=codex_docker_capabilities_default)-                               + lookup('vars', codex_name + '_docker_capabilities_custom', default=codex_docker_capabilities_custom) }}"--# Security Opts-codex_docker_security_opts_default: []-codex_docker_security_opts_custom: []-codex_docker_security_opts: "{{ lookup('vars', codex_name + '_docker_security_opts_default', default=codex_docker_security_opts_default)-                                + lookup('vars', codex_name + '_docker_security_opts_custom', default=codex_docker_security_opts_custom) }}"+codex_role_docker_networks_alias: "{{ codex_name }}"+codex_role_docker_networks_default: []+codex_role_docker_networks_custom: []+codex_role_docker_networks: "{{ docker_networks_common+                                + lookup('role_var', '_docker_networks_default', role='codex')+                                + lookup('role_var', '_docker_networks_custom', role='codex') }}"  # Restart Policy-codex_docker_restart_policy: unless-stopped+codex_role_docker_restart_policy: unless-stopped  # State-codex_docker_state: started+codex_role_docker_state: started

@@ -10,9 +10,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -18,124 +18,75 @@ # Paths ################################ -comixed_paths_folder: "{{ comixed_name }}"-comixed_paths_location: "{{ server_appdata_path }}/{{ comixed_paths_folder }}"-comixed_paths_folders_list:-  - "{{ comixed_paths_location }}"-  - "/mnt/local/Media/Comics"+comixed_role_paths_folder: "{{ comixed_name }}"+comixed_role_paths_location: "{{ server_appdata_path }}/{{ comixed_role_paths_folder }}"+comixed_role_paths_folders_list:+  - "{{ comixed_role_paths_location }}"+  - "{{ server_local_folder_path }}/Media/Comics"  ################################ # Web ################################ -comixed_web_subdomain: "{{ comixed_name }}"-comixed_web_domain: "{{ user.domain }}"-comixed_web_port: "7171"-comixed_web_url: "{{ 'https://' + (comixed_web_subdomain + '.' + comixed_web_domain-                  if (comixed_web_subdomain | length > 0)-                  else comixed_web_domain) }}"+comixed_role_web_subdomain: "{{ comixed_name }}"+comixed_role_web_domain: "{{ user.domain }}"+comixed_role_web_port: "7171"+comixed_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='comixed') + '.' + lookup('role_var', '_web_domain', role='comixed')+                       if (lookup('role_var', '_web_subdomain', role='comixed') | length > 0)+                       else lookup('role_var', '_web_domain', role='comixed')) }}"  ################################ # DNS ################################ -comixed_dns_record: "{{ comixed_web_subdomain }}"-comixed_dns_zone: "{{ comixed_web_domain }}"-comixed_dns_proxy: "{{ dns.proxied }}"+comixed_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='comixed') }}"+comixed_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='comixed') }}"+comixed_role_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -comixed_traefik_sso_middleware: ""-comixed_traefik_middleware_default: "{{ traefik_default_middleware }}"-comixed_traefik_middleware_custom: ""-comixed_traefik_certresolver: "{{ traefik_default_certresolver }}"-comixed_traefik_enabled: true+comixed_role_traefik_sso_middleware: ""+comixed_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+comixed_role_traefik_middleware_custom: ""+comixed_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+comixed_role_traefik_enabled: true  ################################ # Docker ################################  # Container-comixed_docker_container: "{{ comixed_name }}"+comixed_role_docker_container: "{{ comixed_name }}"  # Image-comixed_docker_image_pull: true-comixed_docker_image_tag: "latest"-comixed_docker_image: "comixed/comixed:{{ comixed_docker_image_tag }}"--# Ports-comixed_docker_ports_defaults: []-comixed_docker_ports_custom: []-comixed_docker_ports: "{{ comixed_docker_ports_defaults-                          + comixed_docker_ports_custom }}"--# Envs-comixed_docker_envs_default: {}-comixed_docker_envs_custom: {}-comixed_docker_envs: "{{ comixed_docker_envs_default-                         | combine(comixed_docker_envs_custom) }}"--# Commands-comixed_docker_commands_default: []-comixed_docker_commands_custom: []-comixed_docker_commands: "{{ comixed_docker_commands_default-                             + comixed_docker_commands_custom }}"+comixed_role_docker_image_pull: true+comixed_role_docker_image_repo: "comixed/comixed"+comixed_role_docker_image_tag: "latest"+comixed_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='comixed') }}:{{ lookup('role_var', '_docker_image_tag', role='comixed') }}"  # Volumes-comixed_docker_volumes_default:-  - "{{ comixed_paths_location }}:/root/.comixed"+comixed_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='comixed') }}:/root/.comixed"   - "/mnt/unionfs/Media/Comics:/comic_dir"-comixed_docker_volumes_custom: []-comixed_docker_volumes: "{{ comixed_docker_volumes_default-                            + comixed_docker_volumes_custom }}"--# Devices-comixed_docker_devices_default: []-comixed_docker_devices_custom: []-comixed_docker_devices: "{{ comixed_docker_devices_default-                            + comixed_docker_devices_custom }}"--# Hosts-comixed_docker_hosts_default: {}-comixed_docker_hosts_custom: {}-comixed_docker_hosts: "{{ docker_hosts_common-                          | combine(comixed_docker_hosts_default)-                          | combine(comixed_docker_hosts_custom) }}"--# Labels-comixed_docker_labels_default: {}-comixed_docker_labels_custom: {}-comixed_docker_labels: "{{ docker_labels_common-                           | combine(comixed_docker_labels_default)-                           | combine(comixed_docker_labels_custom) }}"+comixed_role_docker_volumes_custom: []+comixed_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='comixed')+                                 + lookup('role_var', '_docker_volumes_custom', role='comixed') }}"  # Hostname-comixed_docker_hostname: "{{ comixed_name }}"+comixed_role_docker_hostname: "{{ comixed_name }}"  # Networks-comixed_docker_networks_alias: "{{ comixed_name }}"-comixed_docker_networks_default: []-comixed_docker_networks_custom: []-comixed_docker_networks: "{{ docker_networks_common-                             + comixed_docker_networks_default-                             + comixed_docker_networks_custom }}"--# Capabilities-comixed_docker_capabilities_default: []-comixed_docker_capabilities_custom: []-comixed_docker_capabilities: "{{ comixed_docker_capabilities_default-                                 + comixed_docker_capabilities_custom }}"--# Security Opts-comixed_docker_security_opts_default: []-comixed_docker_security_opts_custom: []-comixed_docker_security_opts: "{{ comixed_docker_security_opts_default-                                  + comixed_docker_security_opts_custom }}"+comixed_role_docker_networks_alias: "{{ comixed_name }}"+comixed_role_docker_networks_default: []+comixed_role_docker_networks_custom: []+comixed_role_docker_networks: "{{ docker_networks_common+                                  + lookup('role_var', '_docker_networks_default', role='comixed')+                                  + lookup('role_var', '_docker_networks_custom', role='comixed') }}"  # Restart Policy-comixed_docker_restart_policy: unless-stopped+comixed_role_docker_restart_policy: unless-stopped  # State-comixed_docker_state: started+comixed_role_docker_state: started

@@ -11,9 +11,9 @@ - name: Add DNS record   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml"   vars:-    dns_record: "{{ lookup('vars', role_name + '_dns_record') }}"-    dns_zone: "{{ lookup('vars', role_name + '_dns_zone') }}"-    dns_proxy: "{{ lookup('vars', role_name + '_dns_proxy') }}"+    dns_record: "{{ lookup('role_var', '_dns_record') }}"+    dns_zone: "{{ lookup('role_var', '_dns_zone') }}"+    dns_proxy: "{{ lookup('role_var', '_dns_proxy') }}"  - name: Remove existing Docker container   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"

@@ -17,163 +17,132 @@ # Paths ################################ -crafty_paths_folder: "{{ crafty_name }}"-crafty_paths_group: "root"-crafty_paths_location: "{{ server_appdata_path }}/{{ crafty_paths_folder }}"-crafty_paths_folders_list:-  - "{{ crafty_paths_location }}"-  - "{{ crafty_paths_location }}/backups"-  - "{{ crafty_paths_location }}/logs"-  - "{{ crafty_paths_location }}/servers"-  - "{{ crafty_paths_location }}/config"-  - "{{ crafty_paths_location }}/import"-crafty_paths_recurse: true+crafty_role_paths_folder: "{{ crafty_name }}"+crafty_role_paths_group: "root"+crafty_role_paths_location: "{{ server_appdata_path }}/{{ crafty_role_paths_folder }}"+crafty_role_paths_folders_list:+  - "{{ crafty_role_paths_location }}"+  - "{{ crafty_role_paths_location }}/backups"+  - "{{ crafty_role_paths_location }}/logs"+  - "{{ crafty_role_paths_location }}/servers"+  - "{{ crafty_role_paths_location }}/config"+  - "{{ crafty_role_paths_location }}/import"+crafty_role_paths_recurse: true  ################################ # Web ################################ -crafty_web_subdomain: "{{ crafty_name }}"-crafty_web_domain: "{{ user.domain }}"-crafty_web_port: "8443"-crafty_web_scheme: "https"-crafty_web_serverstransport: "skipverify@file"-crafty_web_url: "{{ 'https://' + (crafty_web_subdomain + '.' + crafty_web_domain-                 if (crafty_web_subdomain | length > 0)-                 else crafty_web_domain) }}"+crafty_role_web_subdomain: "{{ crafty_name }}"+crafty_role_web_domain: "{{ user.domain }}"+crafty_role_web_port: "8443"+crafty_role_web_scheme: "https"+crafty_role_web_serverstransport: "skipverify@file"+crafty_role_web_url: "{{ 'https://' + (lookup('role_var', '_web_subdomain', role='crafty') + '.' + lookup('role_var', '_web_domain', role='crafty')+                      if (lookup('role_var', '_web_subdomain', role='crafty') | length > 0)+                      else lookup('role_var', '_web_domain', role='crafty')) }}" -crafty_dynmap_web_subdomain: "{{ crafty_name }}-map"-crafty_dynmap_web_domain: "{{ user.domain }}"-crafty_dynmap_web_port: "8123"-crafty_dynmap_host: "{{ crafty_dynmap_web_subdomain-                        + '.' + crafty_dynmap_web_domain }}"+crafty_role_dynmap_web_subdomain: "{{ crafty_name }}-map"+crafty_role_dynmap_web_domain: "{{ user.domain }}"+crafty_role_dynmap_web_port: "8123"+crafty_role_dynmap_host: "{{ lookup('role_var', '_dynmap_web_subdomain', role='crafty')+                             + '.' + lookup('role_var', '_dynmap_web_domain', role='crafty') }}"  ################################ # DNS ################################ -crafty_dns_record: "{{ crafty_web_subdomain }}"-crafty_dns_zone: "{{ crafty_web_domain }}"-crafty_dns_proxy: "{{ dns.proxied }}"-crafty_dynmap_dns_record: "{{ crafty_dynmap_web_subdomain }}"-crafty_dynmap_dns_zone: "{{ crafty_web_domain }}"-crafty_dynmap_dns_proxy: "{{ dns.proxied }}"+crafty_role_dns_record: "{{ lookup('role_var', '_web_subdomain', role='crafty') }}"+crafty_role_dns_zone: "{{ lookup('role_var', '_web_domain', role='crafty') }}"+crafty_role_dns_proxy: "{{ dns_proxied }}"+crafty_role_dynmap_dns_record: "{{ lookup('role_var', '_dynmap_web_subdomain', role='crafty') }}"+crafty_role_dynmap_dns_zone: "{{ lookup('role_var', '_web_domain', role='crafty') }}"+crafty_role_dynmap_dns_proxy: "{{ dns_proxied }}"  ################################ # Traefik ################################ -crafty_traefik_sso_middleware: ""-crafty_traefik_middleware_default: "{{ traefik_default_middleware }}"-crafty_traefik_middleware_custom: ""-crafty_traefik_certresolver: "{{ traefik_default_certresolver }}"-crafty_traefik_enabled: true+crafty_role_traefik_sso_middleware: ""+crafty_role_traefik_middleware_default: "{{ traefik_default_middleware }}"+crafty_role_traefik_middleware_custom: ""+crafty_role_traefik_certresolver: "{{ traefik_default_certresolver }}"+crafty_role_traefik_enabled: true  ################################ # Docker ################################  # Container-crafty_docker_container: "{{ crafty_name }}"+crafty_role_docker_container: "{{ crafty_name }}"  # Image-crafty_docker_image_pull: true-crafty_docker_image_tag: "latest"-crafty_docker_image: "arcadiatechnology/crafty-4:{{ crafty_docker_image_tag }}"+crafty_role_docker_image_pull: true+crafty_role_docker_image_repo: "arcadiatechnology/crafty-4"+crafty_role_docker_image_tag: "latest"+crafty_role_docker_image: "{{ lookup('role_var', '_docker_image_repo', role='crafty') }}:{{ lookup('role_var', '_docker_image_tag', role='crafty') }}"  # Ports-crafty_docker_ports_defaults:+crafty_role_docker_ports_default:   - "19132:19132/udp"   - "25500-25600:25500-25600"-crafty_docker_ports_custom: []-crafty_docker_ports: "{{ crafty_docker_ports_defaults-                         + crafty_docker_ports_custom }}"+crafty_role_docker_ports_custom: []+crafty_role_docker_ports: "{{ lookup('role_var', '_docker_ports_default', role='crafty')+                              + lookup('role_var', '_docker_ports_custom', role='crafty') }}"  # Envs-crafty_docker_envs_default:+crafty_role_docker_envs_default:   TZ: "{{ tz }}"-crafty_docker_envs_custom: {}-crafty_docker_envs: "{{ crafty_docker_envs_default-                        | combine(crafty_docker_envs_custom) }}"--# Commands-crafty_docker_commands_default: []-crafty_docker_commands_custom: []-crafty_docker_commands: "{{ crafty_docker_commands_default-                            + crafty_docker_commands_custom }}"+crafty_role_docker_envs_custom: {}+crafty_role_docker_envs: "{{ lookup('role_var', '_docker_envs_default', role='crafty')+                             | combine(lookup('role_var', '_docker_envs_custom', role='crafty')) }}"  # Volumes-crafty_docker_volumes_default:-  - "{{ crafty_paths_location }}/backups:/crafty/backups"-  - "{{ crafty_paths_location }}/logs:/crafty/logs"-  - "{{ crafty_paths_location }}/servers:/crafty/servers"-  - "{{ crafty_paths_location }}/config:/crafty/app/config"-  - "{{ crafty_paths_location }}/import:/crafty/import"-crafty_docker_volumes_custom: []-crafty_docker_volumes: "{{ crafty_docker_volumes_default-                           + crafty_docker_volumes_custom }}"--# Devices-crafty_docker_devices_default: []-crafty_docker_devices_custom: []-crafty_docker_devices: "{{ crafty_docker_devices_default-                           + crafty_docker_devices_custom }}"--# Hosts-crafty_docker_hosts_default: {}-crafty_docker_hosts_custom: {}-crafty_docker_hosts: "{{ docker_hosts_common-                         | combine(crafty_docker_hosts_default)-                         | combine(crafty_docker_hosts_custom) }}"+crafty_role_docker_volumes_default:+  - "{{ lookup('role_var', '_paths_location', role='crafty') }}/backups:/crafty/backups"+  - "{{ lookup('role_var', '_paths_location', role='crafty') }}/logs:/crafty/logs"+  - "{{ lookup('role_var', '_paths_location', role='crafty') }}/servers:/crafty/servers"+  - "{{ lookup('role_var', '_paths_location', role='crafty') }}/config:/crafty/app/config"+  - "{{ lookup('role_var', '_paths_location', role='crafty') }}/import:/crafty/import"+crafty_role_docker_volumes_custom: []+crafty_role_docker_volumes: "{{ lookup('role_var', '_docker_volumes_default', role='crafty')+                                + lookup('role_var', '_docker_volumes_custom', role='crafty') }}"  # Labels-crafty_docker_labels_default:+crafty_role_docker_labels_default:   - '{ "traefik.http.routers.{{ crafty_name }}-map-http.entrypoints": "web" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map-http.service": "{{ crafty_name }}-map" }'-  - '{ "traefik.http.routers.{{ crafty_name }}-map-http.rule": "Host(`{{ crafty_dynmap_host }}`)" }'+  - '{ "traefik.http.routers.{{ crafty_name }}-map-http.rule": "Host(`{{ lookup("role_var", "_dynmap_host", role="crafty") }}`)" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map-http.middlewares": "{{ traefik_default_middleware_http }}" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map-http.priority": "20" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map.entrypoints": "websecure" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map.service": "{{ crafty_name }}-map" }'-  - '{ "traefik.http.routers.{{ crafty_name }}-map.rule": "Host(`{{ crafty_dynmap_host }}`)" }'+  - '{ "traefik.http.routers.{{ crafty_name }}-map.rule": "Host(`{{ lookup("role_var", "_dynmap_host", role="crafty") }}`)" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map.tls.options": "securetls@file" }'-  - '{ "traefik.http.routers.{{ crafty_name }}-map.tls.certresolver": "{{ crafty_traefik_certresolver }}" }'+  - '{ "traefik.http.routers.{{ crafty_name }}-map.tls.certresolver": "{{ lookup("role_var", "_traefik_certresolver", role="crafty") }}" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map.middlewares": "{{ traefik_default_middleware }}" }'   - '{ "traefik.http.routers.{{ crafty_name }}-map.priority": "20" }'-  - '{ "traefik.http.services.{{ crafty_name }}-map.loadbalancer.server.port": "{{ crafty_dynmap_web_port }}" }'-crafty_docker_labels_custom: {}-crafty_docker_labels: "{{ docker_labels_common-                          | combine(crafty_docker_labels_default)-                          | combine(crafty_docker_labels_custom) }}"+  - '{ "traefik.http.services.{{ crafty_name }}-map.loadbalancer.server.port": "{{ lookup("role_var", "_dynmap_web_port", role="crafty") }}" }'+crafty_role_docker_labels_custom: {}+crafty_role_docker_labels: "{{ lookup('role_var', '_docker_labels_default', role='crafty')+                               | combine(lookup('role_var', '_docker_labels_custom', role='crafty')) }}"  # Hostname-crafty_docker_hostname: "{{ crafty_name }}"+crafty_role_docker_hostname: "{{ crafty_name }}"  # Networks-crafty_docker_networks_alias: "{{ crafty_name }}"-crafty_docker_networks_default: []-crafty_docker_networks_custom: []-crafty_docker_networks: "{{ docker_networks_common-                            + crafty_docker_networks_default-                            + crafty_docker_networks_custom }}"--# Capabilities-crafty_docker_capabilities_default: []-crafty_docker_capabilities_custom: []-crafty_docker_capabilities: "{{ crafty_docker_capabilities_default-                                + crafty_docker_capabilities_custom }}"--# Security Opts-crafty_docker_security_opts_default: []-crafty_docker_security_opts_custom: []-crafty_docker_security_opts: "{{ crafty_docker_security_opts_default-                                 + crafty_docker_security_opts_custom }}"+crafty_role_docker_networks_alias: "{{ crafty_name }}"+crafty_role_docker_networks_default: []+crafty_role_docker_networks_custom: []+crafty_role_docker_networks: "{{ docker_networks_common+                                 + lookup('role_var', '_docker_networks_default', role='crafty')+                                 + lookup('role_var', '_docker_networks_custom', role='crafty') }}"  # Restart Policy-crafty_docker_restart_policy: unless-stopped+crafty_role_docker_restart_policy: unless-stopped  # State-crafty_docker_state: started+crafty_role_docker_state: started  # Stop Timeout-crafty_docker_stop_timeout: 900+crafty_role_docker_stop_timeout: 900