Skip to content

Commit

Permalink
various: linting
Browse files Browse the repository at this point in the history
  • Loading branch information
saltydk committed Feb 3, 2024
1 parent 6b67821 commit 8464f32
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion roles/pyload/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pyload_web_domain: "{{ user.domain }}"
pyload_web_port: "8000"
pyload_web_url: "{{ 'https://' + (pyload_web_subdomain + '.' + pyload_web_domain
if (pyload_web_subdomain | length > 0)
else pyload_web_domain) }}"
else pyload_web_domain) }}"

################################
# DNS
Expand Down
28 changes: 14 additions & 14 deletions roles/transmission/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ transmission_docker_image_pull: true
transmission_docker_image_repo: "lscr.io/linuxserver/transmission"
transmission_docker_image_tag: "latest"
transmission_docker_image: "{{ lookup('vars', transmission_name + '_docker_image_repo', default=transmission_docker_image_repo)
+ ':' + lookup('vars', transmission_name + '_docker_image_tag', default=transmission_docker_image_tag) }}"
+ ':' + lookup('vars', transmission_name + '_docker_image_tag', default=transmission_docker_image_tag) }}"

# Ports
# - Internal and External ports need to match for the next set of ports
Expand All @@ -85,7 +85,7 @@ transmission_docker_ports_defaults:
- "{{ transmission_docker_ports_51413 }}:{{ transmission_docker_ports_51413 }}/udp"
transmission_docker_ports_custom: []
transmission_docker_ports: "{{ lookup('vars', transmission_name + '_docker_ports_defaults', default=transmission_docker_ports_defaults)
+ lookup('vars', transmission_name + '_docker_ports_custom', default=transmission_docker_ports_custom) }}"
+ lookup('vars', transmission_name + '_docker_ports_custom', default=transmission_docker_ports_custom) }}"

# Envs
transmission_docker_envs_default:
Expand All @@ -97,13 +97,13 @@ transmission_docker_envs_default:
PASS: "{{ user.pass }}"
transmission_docker_envs_custom: {}
transmission_docker_envs: "{{ lookup('vars', transmission_name + '_docker_envs_default', default=transmission_docker_envs_default)
| combine(lookup('vars', transmission_name + '_docker_envs_custom', default=transmission_docker_envs_custom)) }}"
| combine(lookup('vars', transmission_name + '_docker_envs_custom', default=transmission_docker_envs_custom)) }}"

# Commands
transmission_docker_commands_default: []
transmission_docker_commands_custom: []
transmission_docker_commands: "{{ lookup('vars', transmission_name + '_docker_commands_default', default=transmission_docker_commands_default)
+ lookup('vars', transmission_name + '_docker_commands_custom', default=transmission_docker_commands_custom) }}"
+ lookup('vars', transmission_name + '_docker_commands_custom', default=transmission_docker_commands_custom) }}"

# Volumes
transmission_docker_volumes_default:
Expand All @@ -112,27 +112,27 @@ transmission_docker_volumes_default:
- "{{ transmission_paths_downloads_location }}/watched:/watch"
transmission_docker_volumes_custom: []
transmission_docker_volumes: "{{ lookup('vars', transmission_name + '_docker_volumes_default', default=transmission_docker_volumes_default)
+ lookup('vars', transmission_name + '_docker_volumes_custom', default=transmission_docker_volumes_custom) }}"
+ lookup('vars', transmission_name + '_docker_volumes_custom', default=transmission_docker_volumes_custom) }}"

# Devices
transmission_docker_devices_default: []
transmission_docker_devices_custom: []
transmission_docker_devices: "{{ lookup('vars', transmission_name + '_docker_devices_default', default=transmission_docker_devices_default)
+ lookup('vars', transmission_name + '_docker_devices_custom', default=transmission_docker_devices_custom) }}"
+ lookup('vars', transmission_name + '_docker_devices_custom', default=transmission_docker_devices_custom) }}"

# Hosts
transmission_docker_hosts_default: []
transmission_docker_hosts_custom: []
transmission_docker_hosts: "{{ docker_hosts_common
| combine(lookup('vars', transmission_name + '_docker_hosts_default', default=transmission_docker_hosts_default))
| combine(lookup('vars', transmission_name + '_docker_hosts_custom', default=transmission_docker_hosts_custom)) }}"
| combine(lookup('vars', transmission_name + '_docker_hosts_default', default=transmission_docker_hosts_default))
| combine(lookup('vars', transmission_name + '_docker_hosts_custom', default=transmission_docker_hosts_custom)) }}"

# Labels
transmission_docker_labels_default: {}
transmission_docker_labels_custom: {}
transmission_docker_labels: "{{ docker_labels_common
| combine(lookup('vars', transmission_name + '_docker_labels_default', default=transmission_docker_labels_default))
| combine(lookup('vars', transmission_name + '_docker_labels_custom', default=transmission_docker_labels_custom)) }}"
| combine(lookup('vars', transmission_name + '_docker_labels_default', default=transmission_docker_labels_default))
| combine(lookup('vars', transmission_name + '_docker_labels_custom', default=transmission_docker_labels_custom)) }}"

# Hostname
transmission_docker_hostname: "{{ transmission_name }}"
Expand All @@ -146,19 +146,19 @@ transmission_docker_networks_alias: "{{ transmission_name }}"
transmission_docker_networks_default: []
transmission_docker_networks_custom: []
transmission_docker_networks: "{{ docker_networks_common
+ lookup('vars', transmission_name + '_docker_networks_default', default=transmission_docker_networks_default)
+ lookup('vars', transmission_name + '_docker_networks_custom', default=transmission_docker_networks_custom) }}"
+ lookup('vars', transmission_name + '_docker_networks_default', default=transmission_docker_networks_default)
+ lookup('vars', transmission_name + '_docker_networks_custom', default=transmission_docker_networks_custom) }}"
# Capabilities
transmission_docker_capabilities_default: []
transmission_docker_capabilities_custom: []
transmission_docker_capabilities: "{{ lookup('vars', transmission_name + '_docker_capabilities_default', default=transmission_docker_capabilities_default)
+ lookup('vars', transmission_name + '_docker_capabilities_custom', default=transmission_docker_capabilities_custom) }}"
+ lookup('vars', transmission_name + '_docker_capabilities_custom', default=transmission_docker_capabilities_custom) }}"

# Security Opts
transmission_docker_security_opts_default: []
transmission_docker_security_opts_custom: []
transmission_docker_security_opts: "{{ lookup('vars', transmission_name + '_docker_security_opts_default', default=transmission_docker_security_opts_default)
+ lookup('vars', transmission_name + '_docker_security_opts_custom', default=transmission_docker_security_opts_custom) }}"
+ lookup('vars', transmission_name + '_docker_security_opts_custom', default=transmission_docker_security_opts_custom) }}"

# Restart Policy
transmission_docker_restart_policy: unless-stopped
Expand Down
30 changes: 15 additions & 15 deletions roles/unifi_network_application/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ unifi_network_application_web_port: "8443"
unifi_network_application_web_scheme: "https"
unifi_network_application_web_serverstransport: "skipverify@file"
unifi_network_application_web_url: "{{ 'https://' + (unifi_network_application_web_subdomain + '.' + unifi_network_application_web_domain
if (unifi_network_application_web_subdomain | length > 0)
else unifi_network_application_web_domain) }}"
if (unifi_network_application_web_subdomain | length > 0)
else unifi_network_application_web_domain) }}"

################################
# DNS
Expand Down Expand Up @@ -84,7 +84,7 @@ unifi_network_application_docker_ports_defaults:
- "10001:10001/udp"
unifi_network_application_docker_ports_custom: []
unifi_network_application_docker_ports: "{{ unifi_network_application_docker_ports_defaults
+ unifi_network_application_docker_ports_custom }}"
+ unifi_network_application_docker_ports_custom }}"

# Envs
unifi_network_application_docker_envs_default:
Expand All @@ -98,40 +98,40 @@ unifi_network_application_docker_envs_default:
MONGO_DBNAME: "{{ unifi_network_application_mongo_dbname }}"
unifi_network_application_docker_envs_custom: {}
unifi_network_application_docker_envs: "{{ unifi_network_application_docker_envs_default
| combine(unifi_network_application_docker_envs_custom) }}"
| combine(unifi_network_application_docker_envs_custom) }}"

# Commands
unifi_network_application_docker_commands_default: []
unifi_network_application_docker_commands_custom: []
unifi_network_application_docker_commands: "{{ unifi_network_application_docker_commands_default
+ unifi_network_application_docker_commands_custom }}"
+ unifi_network_application_docker_commands_custom }}"

# Volumes
unifi_network_application_docker_volumes_default:
- "{{ unifi_network_application_paths_location }}:/config"
unifi_network_application_docker_volumes_custom: []
unifi_network_application_docker_volumes: "{{ unifi_network_application_docker_volumes_default
+ unifi_network_application_docker_volumes_custom }}"
+ unifi_network_application_docker_volumes_custom }}"

# Devices
unifi_network_application_docker_devices_default: []
unifi_network_application_docker_devices_custom: []
unifi_network_application_docker_devices: "{{ unifi_network_application_docker_devices_default
+ unifi_network_application_docker_devices_custom }}"
+ unifi_network_application_docker_devices_custom }}"

# Hosts
unifi_network_application_docker_hosts_default: []
unifi_network_application_docker_hosts_custom: []
unifi_network_application_docker_hosts: "{{ docker_hosts_common
| combine(unifi_network_application_docker_hosts_default)
| combine(unifi_network_application_docker_hosts_custom) }}"
| combine(unifi_network_application_docker_hosts_default)
| combine(unifi_network_application_docker_hosts_custom) }}"

# Labels
unifi_network_application_docker_labels_default: {}
unifi_network_application_docker_labels_custom: {}
unifi_network_application_docker_labels: "{{ docker_labels_common
| combine(unifi_network_application_docker_labels_default)
| combine(unifi_network_application_docker_labels_custom) }}"
| combine(unifi_network_application_docker_labels_default)
| combine(unifi_network_application_docker_labels_custom) }}"

# Hostname
unifi_network_application_docker_hostname: "{{ unifi_network_application_name }}"
Expand All @@ -141,20 +141,20 @@ unifi_network_application_docker_networks_alias: "{{ unifi_network_application_n
unifi_network_application_docker_networks_default: []
unifi_network_application_docker_networks_custom: []
unifi_network_application_docker_networks: "{{ docker_networks_common
+ unifi_network_application_docker_networks_default
+ unifi_network_application_docker_networks_custom }}"
+ unifi_network_application_docker_networks_default
+ unifi_network_application_docker_networks_custom }}"

# Capabilities
unifi_network_application_docker_capabilities_default: []
unifi_network_application_docker_capabilities_custom: []
unifi_network_application_docker_capabilities: "{{ unifi_network_application_docker_capabilities_default
+ unifi_network_application_docker_capabilities_custom }}"
+ unifi_network_application_docker_capabilities_custom }}"

# Security Opts
unifi_network_application_docker_security_opts_default: []
unifi_network_application_docker_security_opts_custom: []
unifi_network_application_docker_security_opts: "{{ unifi_network_application_docker_security_opts_default
+ unifi_network_application_docker_security_opts_custom }}"
+ unifi_network_application_docker_security_opts_custom }}"

# Restart Policy
unifi_network_application_docker_restart_policy: unless-stopped
Expand Down

0 comments on commit 8464f32

Please sign in to comment.