Merge pull request #10 from seschwar/master

Fix apache_mods_enabled and role defaults for Ubuntu.
This commit is contained in:
Jeff Geerling 2014-09-10 20:18:23 -05:00
commit a59400ef68
5 changed files with 3 additions and 33 deletions

View file

@ -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

View file

@ -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"}

View file

@ -3,6 +3,9 @@ apache_enablerepo: ""
apache_listen_port: 80 apache_listen_port: 80
apache_mods_enabled:
- rewrite.load
apache_create_vhosts: true apache_create_vhosts: true
apache_vhosts: apache_vhosts:

View file

@ -8,5 +8,3 @@ apache_packages:
- apache2-utils - apache2-utils
- apache2.2-bin - apache2.2-bin
- apache2.2-common - apache2.2-common
apache_mods_enabled:
- rewrite.load

View file

@ -1,6 +0,0 @@
---
apache_enablerepo: ""
apache_listen_port: 80
apache_create_vhosts: true