diff --git a/roles/apache2/defaults/main.yml b/roles/apache2/defaults/main.yml index ef4c82e..888eda1 100644 --- a/roles/apache2/defaults/main.yml +++ b/roles/apache2/defaults/main.yml @@ -1,6 +1,6 @@ --- -apache2_vhost_serveradmin: root@localhost +apache2_vhost_serveradmin: webmaster@localhost apache2_vhost_serveraliases: [] apache2_vhost_documentroot: /var/www/html apache2_vhost_loglevel: warn diff --git a/roles/apache2/tasks/config.yml b/roles/apache2/tasks/config.yml index 25eeb35..9a77e08 100644 --- a/roles/apache2/tasks/config.yml +++ b/roles/apache2/tasks/config.yml @@ -18,7 +18,7 @@ {%- if site.https_enabled | default(apache2_vhost_https_enabled) -%} {%- endif -%} {%- set _x = files.append(site.tls_certfile | default(apache2_tls_certfile)) -%} - {%- set _x = files.append(site.tls_keytfile | default(apache2_tls_keyfile)) -%} + {%- set _x = files.append(site.tls_keyfile | default(apache2_tls_keyfile)) -%} {%- endfor -%} {{- files | unique | list -}} register: apache2_register_stat_tls_keypairs