various: revert original name changes to instances

roles/alternatrr/tasks/main.yml

@@ -9,8 +9,7 @@
 ---
 - name: Set Default Sonarr instance
  ansible.builtin.set_fact:
- sonarr_original_name: "{{ sonarr_instances[0] }}"
- sonarr_name: "{{ sonarr_instances[0] if not '-' in sonarr_instances[0] else (sonarr_instances[0] | replace('-', '_')) }}"
+ sonarr_name: "{{ sonarr_instances[0] }}"
  when: not sonarr_name is defined
 
 - name: Add DNS record

roles/alternatrrx/tasks/main.yml

@@ -12,8 +12,7 @@
  name: alternatrr
  vars:
  alternatrr_name: "alternatrr{{ role }}"
- sonarr_original_name: "sonarr{{ role }}"
- sonarr_name: "{{ 'sonarr' + role if not '-' in role else ('sonarr' + role | replace('-', '_')) }}"
+ sonarr_name: "sonarr{{ role }}"
  with_items: "{{ alternatrrx.roles }}"
  loop_control:
  loop_var: role

roles/calibre/defaults/main.yml

@@ -17,7 +17,7 @@ calibre_instances: ["calibre"]
 # Paths
 ################################
 
-calibre_paths_folder: "{{ calibre_original_name }}"
+calibre_paths_folder: "{{ calibre_name }}"
 calibre_paths_location: "{{ server_appdata_path }}/{{ calibre_paths_folder }}"
 calibre_paths_folders_list:
  - "{{ calibre_paths_location }}"
@@ -27,13 +27,13 @@ calibre_paths_folders_list:
 # Web
 ################################
 
-calibre_web_subdomain: "{{ calibre_original_name }}"
+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) }}"
 
-calibre_web2_subdomain: "{{ calibre_original_name }}books"
+calibre_web2_subdomain: "{{ calibre_name }}books"
 calibre_web2_domain: "{{ user.domain }}"
 calibre_web2_port: "8081"
 calibre_web2_url: "{{ 'https://' + lookup('vars', calibre_name + '_web_subdomain', default=calibre_web_subdomain)
@@ -76,7 +76,7 @@ calibre_books_traefik_router: "{{ lookup('vars', calibre_name + '_web2_subdomain
 ################################
 
 # Container
-calibre_docker_container: "{{ calibre_original_name }}"
+calibre_docker_container: "{{ calibre_name }}"
 
 # Image
 calibre_docker_image_pull: true
@@ -150,10 +150,10 @@ calibre_docker_labels: "{{ docker_labels_common
  | combine(lookup('vars', calibre_name + '_docker_labels_custom', default=calibre_docker_labels_custom)) }}"
 
 # Hostname
-calibre_docker_hostname: "{{ calibre_original_name }}"
+calibre_docker_hostname: "{{ calibre_name }}"
 
 # Networks
-calibre_docker_networks_alias: "{{ calibre_original_name }}"
+calibre_docker_networks_alias: "{{ calibre_name }}"
 calibre_docker_networks_default: []
 calibre_docker_networks_custom: []
 calibre_docker_networks: "{{ docker_networks_common

roles/calibre/tasks/main.yml

@@ -10,8 +10,7 @@
 - name: "Execute Calibre roles"
  ansible.builtin.include_tasks: main2.yml
  vars:
- calibre_original_name: "{{ role }}"
- calibre_name: "{{ role | replace('-', '_') }}"
+ calibre_name: "{{ role }}"
  with_items: "{{ calibre_instances }}"
  loop_control:
  loop_var: role

roles/jellyseerr/defaults/main.yml

@@ -17,7 +17,7 @@ jellyseerr_instances: ["jellyseerr"]
 # Paths
 ################################
 
-jellyseerr_paths_folder: "{{ jellyseerr_original_name }}"
+jellyseerr_paths_folder: "{{ jellyseerr_name }}"
 jellyseerr_paths_location: "{{ server_appdata_path }}/{{ jellyseerr_paths_folder }}"
 jellyseerr_paths_folders_list:
  - "{{ jellyseerr_paths_location }}"
@@ -26,7 +26,7 @@ jellyseerr_paths_folders_list:
 # Web
 ################################
 
-jellyseerr_web_subdomain: "{{ jellyseerr_original_name }}"
+jellyseerr_web_subdomain: "{{ jellyseerr_name }}"
 jellyseerr_web_domain: "{{ user.domain }}"
 jellyseerr_web_port: "5055"
 jellyseerr_web_url: "{{ 'https://' + lookup('vars', jellyseerr_name + '_web_subdomain', default=jellyseerr_web_subdomain)
@@ -64,7 +64,7 @@ jellyseerr_traefik_api_endpoint: ""
 ################################
 
 # Container
-jellyseerr_docker_container: "{{ jellyseerr_original_name }}"
+jellyseerr_docker_container: "{{ jellyseerr_name }}"
 
 # Image
 jellyseerr_docker_image_pull: true
@@ -123,10 +123,10 @@ jellyseerr_docker_labels: "{{ docker_labels_common
  | combine(lookup('vars', jellyseerr_name + '_docker_labels_custom', default=jellyseerr_docker_labels_custom)) }}"
 
 # Hostname
-jellyseerr_docker_hostname: "{{ jellyseerr_original_name }}"
+jellyseerr_docker_hostname: "{{ jellyseerr_name }}"
 
 # Networks
-jellyseerr_docker_networks_alias: "{{ jellyseerr_original_name }}"
+jellyseerr_docker_networks_alias: "{{ jellyseerr_name }}"
 jellyseerr_docker_networks_default: []
 jellyseerr_docker_networks_custom: []
 jellyseerr_docker_networks: "{{ docker_networks_common

roles/jellyseerr/tasks/main.yml

@@ -10,8 +10,7 @@
 - name: "Execute Jellyseerr roles"
  ansible.builtin.include_tasks: main2.yml
  vars:
- jellyseerr_original_name: "{{ role }}"
- jellyseerr_name: "{{ role | replace('-', '_') }}"
+ jellyseerr_name: "{{ role }}"
  with_items: "{{ jellyseerr_instances }}"
  loop_control:
  loop_var: role

roles/minecraft/defaults/main.yml

@@ -20,14 +20,14 @@ minecraft_paths_folder: "minecraft"
 minecraft_paths_location: "{{ server_appdata_path }}/{{ minecraft_paths_folder }}"
 minecraft_paths_folders_list:
  - "{{ minecraft_paths_location }}/"
- - "{{ minecraft_paths_location }}/{{ minecraft_original_name }}"
- - "{{ minecraft_paths_location }}/{{ minecraft_original_name }}/data"
+ - "{{ minecraft_paths_location }}/{{ minecraft_name }}"
+ - "{{ minecraft_paths_location }}/{{ minecraft_name }}/data"
 
 ################################
 # Web
 ################################
 
-minecraft_web_subdomain: "{{ minecraft_original_name }}"
+minecraft_web_subdomain: "{{ minecraft_name }}"
 minecraft_web_domain: "{{ user.domain }}"
 
 ################################
@@ -43,7 +43,7 @@ minecraft_dns_proxy: false
 ################################
 
 # Container
-minecraft_docker_container: "{{ minecraft_original_name }}"
+minecraft_docker_container: "{{ minecraft_name }}"
 
 # Image
 minecraft_docker_image_pull: true
@@ -96,10 +96,10 @@ minecraft_docker_labels: "{{ docker_labels_common
  | combine(lookup('vars', minecraft_name + '_docker_labels_custom', default=minecraft_docker_labels_custom)) }}"
 
 # Hostname
-minecraft_docker_hostname: "{{ minecraft_original_name }}"
+minecraft_docker_hostname: "{{ minecraft_name }}"
 
 # Networks
-minecraft_docker_networks_alias: "{{ minecraft_original_name }}"
+minecraft_docker_networks_alias: "{{ minecraft_name }}"
 minecraft_docker_networks_default: []
 minecraft_docker_networks_custom: []
 minecraft_docker_networks: "{{ docker_networks_common

roles/minecraft/tasks/main.yml

@@ -10,8 +10,7 @@
 - name: "Execute minecraft roles"
  ansible.builtin.include_tasks: main2.yml
  vars:
- minecraft_original_name: "{{ role }}"
- minecraft_name: "{{ role | replace('-', '_') }}"
+ minecraft_name: "{{ role }}"
  with_items: "{{ minecraft_instances }}"
  loop_control:
  loop_var: role

roles/moviematch/tasks/main.yml

@@ -14,8 +14,7 @@
 
 - name: Check if Plex instance is defined
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
 - name: Run Role
  when: plex_account_is_enabled

roles/node_red/defaults/main.yml

@@ -17,7 +17,7 @@ node_red_instances: ["node-red"]
 # Paths
 ################################
 
-node_red_paths_folder: "{{ node_red_original_name }}"
+node_red_paths_folder: "{{ node_red_name }}"
 node_red_paths_location: "{{ server_appdata_path }}/{{ node_red_paths_folder }}"
 node_red_paths_folders_list:
  - "{{ node_red_paths_location }}"
@@ -26,7 +26,7 @@ node_red_paths_folders_list:
 # Web
 ################################
 
-node_red_web_subdomain: "{{ node_red_original_name }}"
+node_red_web_subdomain: "{{ node_red_name }}"
 node_red_web_domain: "{{ user.domain }}"
 node_red_web_port: "1880"
 node_red_web_url: "{{ 'https://' + lookup('vars', node_red_name + '_web_subdomain', default=node_red_web_subdomain)
@@ -57,7 +57,7 @@ node_red_traefik_api_endpoint: "PathPrefix(`/auth`) || PathPrefix(`/settings`) |
 ################################
 
 # Container
-node_red_docker_container: "{{ node_red_original_name }}"
+node_red_docker_container: "{{ node_red_name }}"
 
 # Image
 node_red_docker_image_pull: true
@@ -113,10 +113,10 @@ node_red_docker_labels: "{{ docker_labels_common
  | combine(lookup('vars', node_red_name + '_docker_labels_custom', default=node_red_docker_labels_custom)) }}"
 
 # Hostname
-node_red_docker_hostname: "{{ node_red_original_name }}"
+node_red_docker_hostname: "{{ node_red_name }}"
 
 # Networks
-node_red_docker_networks_alias: "{{ node_red_original_name }}"
+node_red_docker_networks_alias: "{{ node_red_name }}"
 node_red_docker_networks_default: []
 node_red_docker_networks_custom: []
 node_red_docker_networks: "{{ docker_networks_common

roles/node_red/tasks/main.yml

@@ -10,8 +10,7 @@
 - name: "Execute Node-RED roles"
  ansible.builtin.include_tasks: main2.yml
  vars:
- node_red_original_name: "{{ role }}"
- node_red_name: "{{ role | replace('-', '_') }}"
+ node_red_name: "{{ role }}"
  with_items: "{{ node_red_instances }}"
  loop_control:
  loop_var: role

roles/notifiarr/tasks/subtasks/settings.yml

@@ -9,14 +9,12 @@
 ---
 - name: Set Default Tautulli instance
  ansible.builtin.set_fact:
- tautulli_original_name: "{{ tautulli_instances[0] }}"
- tautulli_name: "{{ tautulli_instances[0] if not '-' in tautulli_instances[0] else (tautulli_instances[0] | replace('-', '_')) }}"
+ tautulli_name: "{{ tautulli_instances[0] }}"
  when: not tautulli_name is defined
 
 - name: Set Default Plex instance
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
  when: not plex_name is defined
 
 # Tautulli Tasks

roles/plex_auto_languages/tasks/main.yml

@@ -22,8 +22,7 @@
 
  - name: Set Default Plex instance
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
  - name: Import Plex Auth Token role
  ansible.builtin.include_role:

roles/plex_autoscan/tasks/main.yml

@@ -9,8 +9,7 @@
 ---
 - name: Check if Plex instance is defined
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
 - name: Import Services Task
  ansible.builtin.import_tasks: "subtasks/services.yml"

roles/plex_dupefinder/tasks/main.yml

@@ -9,8 +9,7 @@
 ---
 - name: Set Default Plex instance
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
 - name: Create plex_dupefinder directories
  ansible.builtin.file:

roles/plextraktsync/tasks/subtasks/pre-install/main.yml

@@ -9,8 +9,7 @@
 ---
 - name: Set default Plex instance
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
 - name: Check if {{ plex_paths_config_location | basename }} exists
  ansible.builtin.stat:

roles/python_plexlibrary/tasks/main.yml

@@ -9,8 +9,7 @@
 ---
 - name: Set Default Plex instance
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
 - name: Create python-plexlibrary directories
  ansible.builtin.file:

roles/qbittorrentvpn/defaults/main.yml

@@ -16,7 +16,7 @@ qbittorrentvpn_instances: ["qbittorrentvpn"]
 # Paths
 ################################
 
-qbittorrentvpn_paths_folder: "{{ qbittorrentvpn_original_name }}"
+qbittorrentvpn_paths_folder: "{{ qbittorrentvpn_name }}"
 qbittorrentvpn_paths_location: "{{ server_appdata_path }}/{{ qbittorrentvpn_paths_folder }}"
 qbittorrentvpn_paths_downloads_location: "{{ downloads_torrents_path }}/{{ qbittorrentvpn_paths_folder }}"
 qbittorrentvpn_paths_conf: "{{ qbittorrentvpn_paths_location }}/qBittorrent/config/qBittorrent.conf"
@@ -33,7 +33,7 @@ qbittorrentvpn_paths_folders_list:
 # Web
 ################################
 
-qbittorrentvpn_web_subdomain: "{{ qbittorrentvpn_original_name }}"
+qbittorrentvpn_web_subdomain: "{{ qbittorrentvpn_name }}"
 qbittorrentvpn_web_domain: "{{ user.domain }}"
 qbittorrentvpn_web_port: "8080"
 qbittorrentvpn_web_url: "{{ 'https://' + lookup('vars', qbittorrentvpn_name + '_web_subdomain', default=qbittorrentvpn_web_subdomain)
@@ -64,7 +64,7 @@ qbittorrentvpn_traefik_api_endpoint: "PathPrefix(`/api`) || PathPrefix(`/command
 ################################
 
 # Container
-qbittorrentvpn_docker_container: "{{ qbittorrentvpn_original_name }}"
+qbittorrentvpn_docker_container: "{{ qbittorrentvpn_name }}"
 
 # Image
 qbittorrentvpn_docker_image_pull: true
@@ -151,10 +151,10 @@ qbittorrentvpn_docker_labels: "{{ docker_labels_common
  | combine(lookup('vars', qbittorrentvpn_name + '_docker_labels_custom', default=qbittorrentvpn_docker_labels_custom)) }}"
 
 # Hostname
-qbittorrentvpn_docker_hostname: "{{ qbittorrentvpn_original_name }}"
+qbittorrentvpn_docker_hostname: "{{ qbittorrentvpn_name }}"
 
 # Networks
-qbittorrentvpn_docker_networks_alias: "{{ qbittorrentvpn_original_name }}"
+qbittorrentvpn_docker_networks_alias: "{{ qbittorrentvpn_name }}"
 qbittorrentvpn_docker_networks_default: []
 qbittorrentvpn_docker_networks_custom: []
 qbittorrentvpn_docker_networks: "{{ docker_networks_common

roles/qbittorrentvpn/tasks/main.yml

@@ -10,8 +10,7 @@
 - name: "Execute qBittorrent VPN roles"
  ansible.builtin.include_tasks: main2.yml
  vars:
- qbittorrentvpn_original_name: "{{ role }}"
- qbittorrentvpn_name: "{{ role | replace('-', '_') }}"
+ qbittorrentvpn_name: "{{ role }}"
  with_items: "{{ qbittorrentvpn_instances }}"
  loop_control:
  loop_var: role

roles/sabthrottle/tasks/subtasks/pre-install.yml

@@ -14,8 +14,7 @@
 
 - name: Pre-Install | Set Default Plex instance
  ansible.builtin.set_fact:
- plex_original_name: "{{ plex_name | default(plex_instances[0]) }}"
- plex_name: "{{ (plex_name | default(plex_instances[0])) if not '-' in (plex_name | default(plex_instances[0])) else ((plex_name | default(plex_instances[0])) | replace('-', '_')) }}"
+ plex_name: "{{ plex_name | default(plex_instances[0]) }}"
 
 - name: Pre-Install | New config tasks
  when: not sabthrottle_paths_config_location_stat.stat.exists

roles/varken/tasks/main.yml

@@ -9,20 +9,17 @@
 ---
 - name: Set Default Tautulli instance
  ansible.builtin.set_fact:
- tautulli_original_name: "{{ tautulli_instances[0] }}"
- tautulli_name: "{{ tautulli_instances[0] if not '-' in tautulli_instances[0] else (tautulli_instances[0] | replace('-', '_')) }}"
+ tautulli_name: "{{ tautulli_instances[0] }}"
  when: not tautulli_name is defined
 
 - name: Set Default Sonarr instance
  ansible.builtin.set_fact:
- sonarr_original_name: "{{ sonarr_instances[0] }}"
- sonarr_name: "{{ sonarr_instances[0] if not '-' in sonarr_instances[0] else (sonarr_instances[0] | replace('-', '_')) }}"
+ sonarr_name: "{{ sonarr_instances[0] }}"
  when: not sonarr_name is defined
 
 - name: Set Default Radarr instance
  ansible.builtin.set_fact:
- radarr_original_name: "{{ radarr_instances[0] }}"
- radarr_name: "{{ radarr_instances[0] if not '-' in radarr_instances[0] else (radarr_instances[0] | replace('-', '_')) }}"
+ radarr_name: "{{ radarr_instances[0] }}"
  when: not radarr_name is defined
 
 - name: InfluxDB Role