diff options
| author | varac <varacanero@zeromail.org> | 2012-11-08 22:24:25 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-11-08 22:24:25 +0100 |
| commit | 077d4d1508b9ff3355f73ff8597991043b3ba5d9 (patch) | |
| tree | d31c9e447740021e53afd295cd717674abd3912e /manifests | |
| parent | 104b2e09399e02a8aa9687df0de795644e4b83e0 (diff) | |
| parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
Merge branch 'master' of git://labs.riseup.net/shared-apache
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 4 | ||||
| -rw-r--r-- | manifests/ssl/base.pp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 5f2bac3..984dc32 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -43,5 +43,7 @@ class apache::base { apache::config::include{ 'defaults.inc': } apache::config::global{ 'git.conf': } - apache::vhost::file { '0-default': } + if !$apache_no_default_site { + apache::vhost::file { '0-default': } + } } diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp index 4aabb40..ff9baa5 100644 --- a/manifests/ssl/base.pp +++ b/manifests/ssl/base.pp @@ -1,4 +1,7 @@ class apache::ssl::base { - ::apache::config::include{ 'ssl_defaults.inc': } + ::apache::config::include{ 'ssl_defaults.inc': } + + if !$apache_no_default_site { ::apache::vhost::file{ '0-default_ssl': } + } } |