Skip to content

Commit

Permalink
Implement ansible-lint hints.
Browse files Browse the repository at this point in the history
  • Loading branch information
robertdebock committed Jan 2, 2023
1 parent a35d3f2 commit 8030965
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ _httpd_packages:
- lynx
- w3m

httpd_packages: "{{ _httpd_packages[ansible_os_family] | default(_httpd_packages['default'] ) }}"
httpd_packages: "{{ _httpd_packages[ansible_os_family] | default(_httpd_packages['default']) }}"

_httpd_ssl_packages:
default:
Expand All @@ -29,7 +29,7 @@ _httpd_ssl_packages:
Debian:
- openssl

httpd_ssl_packages: "{{ _httpd_ssl_packages[ansible_os_family] | default(_httpd_ssl_packages['default'] ) }}"
httpd_ssl_packages: "{{ _httpd_ssl_packages[ansible_os_family] | default(_httpd_ssl_packages['default']) }}"

_httpd_service:
default: httpd
Expand All @@ -38,7 +38,7 @@ _httpd_service:
Suse: apache2
RedHat: httpd

httpd_service: "{{ _httpd_service[ansible_os_family] | default(_httpd_service['default'] ) }}"
httpd_service: "{{ _httpd_service[ansible_os_family] | default(_httpd_service['default']) }}"

_httpd_server_root:
default: /etc/httpd
Expand All @@ -48,15 +48,15 @@ _httpd_server_root:

# This variable is used to determine where other configurations can
# be found, like the `conf.d` directory.
httpd_server_root: "{{ _httpd_server_root[ansible_os_family] | default(_httpd_server_root['default'] ) }}"
httpd_server_root: "{{ _httpd_server_root[ansible_os_family] | default(_httpd_server_root['default']) }}"

_httpd_config_directory:
default: "{{ httpd_server_root }}/conf.d"
Alpine: "{{ httpd_server_root }}/conf.d"
Debian: "{{ httpd_server_root }}/conf-enabled"
Suse: "{{ httpd_server_root }}/conf.d"

httpd_config_directory: "{{ _httpd_config_directory[ansible_os_family] | default(_httpd_config_directory['default'] ) }}"
httpd_config_directory: "{{ _httpd_config_directory[ansible_os_family] | default(_httpd_config_directory['default']) }}"

# Every distribution has it's own configuration.
_httpd_config_src:
Expand Down Expand Up @@ -88,21 +88,21 @@ _httpd_data_directory:
Alpine: /var/www/{{ httpd_servername | default('localhost') }}/htdocs
Suse: /srv/www/htdocs

httpd_data_directory: "{{ _httpd_data_directory[ansible_os_family] | default(_httpd_data_directory['default'] ) }}"
httpd_data_directory: "{{ _httpd_data_directory[ansible_os_family] | default(_httpd_data_directory['default']) }}"

_httpd_modules_path:
default: modules
Debian: /usr/lib/apache2/modules
Suse: /usr/lib64/apache2-prefork

httpd_modules_path: "{{ _httpd_modules_path[ansible_os_family] | default(_httpd_modules_path['default'] ) }}"
httpd_modules_path: "{{ _httpd_modules_path[ansible_os_family] | default(_httpd_modules_path['default']) }}"

# This variable is used in handlers to test the configuration.
_httpd_binary:
default: httpd
Debian: apachectl

httpd_binary: "{{ _httpd_binary[ansible_os_family] | default(_httpd_binary['default'] ) }}"
httpd_binary: "{{ _httpd_binary[ansible_os_family] | default(_httpd_binary['default']) }}"

_httpd_openssl_key_directory:
default: /tmp
Expand All @@ -111,7 +111,7 @@ _httpd_openssl_key_directory:
RedHat: /etc/pki/tls/private
Suse: /etc/ssl/private

httpd_openssl_key_directory: "{{ _httpd_openssl_key_directory[ansible_os_family] | default(_httpd_openssl_key_directory['default'] ) }}"
httpd_openssl_key_directory: "{{ _httpd_openssl_key_directory[ansible_os_family] | default(_httpd_openssl_key_directory['default']) }}"

_httpd_openssl_crt_directory:
default: /tmp
Expand All @@ -120,4 +120,4 @@ _httpd_openssl_crt_directory:
RedHat: /etc/pki/tls/certs
Suse: /etc/ssl/certs

httpd_openssl_crt_directory: "{{ _httpd_openssl_crt_directory[ansible_os_family] | default(_httpd_openssl_crt_directory['default'] ) }}"
httpd_openssl_crt_directory: "{{ _httpd_openssl_crt_directory[ansible_os_family] | default(_httpd_openssl_crt_directory['default']) }}"

0 comments on commit 8030965

Please sign in to comment.