Don't execute a2ensite if the vhost is already enabled
use test -f instead of ls
use test -f instead of ls in register_site.sls too
Merge pull request #26 from vincentfretin/patch-1

Don't execute a2ensite if the vhost is already enabled
Updated README with new formula conventions URL
Revert "Updated README with new formula conventions URL"

This reverts commit f7b14ec16908624edf878c61f3a6b555b126e9e0.
Added explanatory comment to the apache restart/reload module.wait states
fixed things seth mentioned in class
Merge pull request #27 from KennethWilke/master

fixed things seth mentioned in class
Adding support for Apache 2.4 on Ubuntu 14.04

- Adding confext to virtualhost names.
- Renaming the default config file for Ubuntu (000-default.conf).
- Adding ability to use "Require all granted".
Merge pull request #29 from berry-langerak/feature/adding-support-for-apache-2.4

Adding support for Apache 2.4 on Ubuntu 14.04
Fixed Apache 2.4 support and added support for Ubuntu 14.10.

Replace require_all with use_require in map.jinja, we want to be able
to use custom Require values.

Remove uneeded Directory in standard.tmpl and add conditional and
default value for Require.

Fix bad filenames in standard.sls
Fix default Options.
Merge pull request #31 from abrefort/master

Fix Apache 2.4 and add support for Ubuntu 14.10
Add ability to specify modules in pillar
Merge pull request #32 from openenvi-formulas/modules

Add ability to specify modules in pillar
Merge pull request #1 from saltstack-formulas/master

sync back fork