diff --git a/README.md b/README.md index fa5fa6a..c8e57f1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ apache_use_php: true apache_use_ssl: true apache_use_zabbix: true - wether we install script to monitor certificate expiry date apache_use_certbot: true -apache_stats: true +apache_use_stats: true apache_ssl_certificate: /etc/letsencrypt/live/{{ apache_server_name }}/cert.pem apache_ssl_chain: /etc/letsencrypt/live/{{ apache_server_name }}/fullchain.pem apache_ssl_key: /etc/letsencrypt/live/{{ apache_server_name }}/privkey.pem diff --git a/defaults/main.yml b/defaults/main.yml index a8d77d2..642e48f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,17 +1,17 @@ ---- # defaults file for apache_vhost +--- +apache_access_log: "{{ apache_base_dir}}/logs/access_log" +apache_allowoverride: all apache_base_dir: "/srv/{{ apache_server_name }}" apache_document_root: "{{ apache_base_dir }}/www" -apache_access_log: "{{ apache_base_dir}}/logs/access_log" apache_php_socket: "{{ apache_base_dir }}/php-fpm.sock" -apache_use_php: true -apache_use_ssl: true -apache_use_zabbix: true -apache_use_certbot: true +apache_restart: false apache_ssl_certificate: "/etc/letsencrypt/live/{{ apache_server_name }}/cert.pem" apache_ssl_chain: "/etc/letsencrypt/live/{{ apache_server_name }}/fullchain.pem" apache_ssl_key: "/etc/letsencrypt/live/{{ apache_server_name }}/privkey.pem " +apache_use_certbot: true +apache_use_php: true +apache_use_ssl: true +apache_use_stats: true +apache_use_zabbix: true apache_user: "{{ apache_server_name | regex_search( '([^.]+)' ) }} }}" -apache_allowoverride: all -apache_restart: false -apache_stats: true diff --git a/tasks/main.yml b/tasks/main.yml index 44510ae..61c2459 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -64,7 +64,7 @@ - name: goaccess import_tasks: goaccess.yml - when: apache_stats + when: apache_use_stats tags: stats - name: zabbix setup