diff --git a/defaults/Debian.yml b/defaults/Debian.yml deleted file mode 100644 index e4e6e51..0000000 --- a/defaults/Debian.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apache_daemon: apache2 -apache_server_root: /etc/apache2 -apache_conf_path: /etc/apache2/sites-enabled -apache_packages: - - apache2 - - apache2-mpm-prefork - - apache2-utils - - apache2.2-bin - - apache2.2-common -apache_vhosts: - - {servername: "local.dev", documentroot: "/var/www"} -apache_mods_enabled: - - rewrite.load diff --git a/defaults/RedHat.yml b/defaults/RedHat.yml deleted file mode 100644 index 4dccbd6..0000000 --- a/defaults/RedHat.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apache_daemon: httpd -apache_server_root: /etc/httpd -apache_conf_path: /etc/httpd/conf.d -apache_packages: - - httpd - - httpd-devel - - mod_ssl - - openssh -apache_vhosts: - - {servername: "local.dev", documentroot: "/var/www/html"} diff --git a/defaults/main.yml b/defaults/main.yml index 3388292..4dfc8df 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,6 +3,9 @@ apache_enablerepo: "" apache_listen_port: 80 +apache_mods_enabled: + - rewrite.load + apache_create_vhosts: true apache_vhosts: diff --git a/vars/Debian.yml b/vars/Debian.yml index 8c40f38..d2d1706 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -8,5 +8,3 @@ apache_packages: - apache2-utils - apache2.2-bin - apache2.2-common -apache_mods_enabled: - - rewrite.load diff --git a/vars/main.yml b/vars/main.yml deleted file mode 100644 index 54c78ec..0000000 --- a/vars/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apache_enablerepo: "" - -apache_listen_port: 80 - -apache_create_vhosts: true