diff options
author | mh <mh@immerda.ch> | 2014-02-23 15:32:26 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-02-23 15:32:26 +0100 |
commit | 82c8317c66df1a491cad6dfd77495c1e8b0a0860 (patch) | |
tree | 14699101b9cc11f53b68d5cc28650a0532679a06 /manifests/ssl | |
parent | 06edce9d49b8d21e6bb47c70286fa4e6c4b9eb6e (diff) | |
parent | 1194d183efb1395b91c5433b2878f7908a24c78f (diff) |
Merge remote-tracking branch 'shared/master'
Conflicts:
manifests/debian.pp
Diffstat (limited to 'manifests/ssl')
-rw-r--r-- | manifests/ssl/base.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp index ff9baa5..7c17423 100644 --- a/manifests/ssl/base.pp +++ b/manifests/ssl/base.pp @@ -1,7 +1,7 @@ class apache::ssl::base { ::apache::config::include{ 'ssl_defaults.inc': } - if !$apache_no_default_site { + if !$apache::no_default_site { ::apache::vhost::file{ '0-default_ssl': } } } |