diff --git a/vars/centos-7.yml b/vars/centos-7.yml index ef534d0df..38feacf9e 100644 --- a/vars/centos-7.yml +++ b/vars/centos-7.yml @@ -7,7 +7,6 @@ proxy_user: squid apache_service: httpd apache_user: apache apache_config_dir: httpd/conf.d -apache_user: apache apache_log_dir: /var/log/httpd smb_service: smb nmb_service: nmb diff --git a/vars/fedora-18.yml b/vars/fedora-18.yml index 07965f8dc..c61cb28c9 100644 --- a/vars/fedora-18.yml +++ b/vars/fedora-18.yml @@ -6,7 +6,6 @@ proxy_user: squid apache_service: httpd apache_user: apache apache_config_dir: httpd/conf.d -apache_user: apache apache_log_dir: /var/log/httpd smb_service: smb nmb_service: nmb diff --git a/vars/fedora-22.yml b/vars/fedora-22.yml index de562bf22..0b3d33fa3 100644 --- a/vars/fedora-22.yml +++ b/vars/fedora-22.yml @@ -6,7 +6,6 @@ proxy_user: squid apache_service: httpd apache_user: apache apache_config_dir: httpd/conf.d -apache_user: apache apache_log_dir: /var/log/httpd smb_service: smb nmb_service: nmb diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index 0cd6ed138..52fc32276 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -8,7 +8,6 @@ dns_user: bind proxy: squid3 proxy_user: proxy apache_service: apache2 -apache_user: apache apache_config_dir: apache2/sites-available apache_user: www-data apache_log_dir: /var/log/apache2 diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index 6d9c851a7..087bfee30 100644 --- a/vars/ubuntu-16.yml +++ b/vars/ubuntu-16.yml @@ -5,9 +5,8 @@ dns_user: bind proxy: squid proxy_user: proxy apache_service: apache2 -apache_user: apache -apache_config_dir: apache2/sites-available apache_user: www-data +apache_config_dir: apache2/sites-available apache_log_dir: /var/log/apache2 smb_service: smbd nmb_service: nmbd