diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-23 16:06:45 -0500 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-23 16:06:45 -0500 |
commit | d2c4bdf792815f0a0f54d717bdec619f03d984ab (patch) | |
tree | b80bd6aa94eda96089ebb005763f9f39eb71d76c /manifests/ssl | |
parent | 9513cf4a201d0e7148aa5f0db490a29a02611b19 (diff) |
introduce config::global for global configs in conf.d and config::include for vhost snippets in include.d
Diffstat (limited to 'manifests/ssl')
-rw-r--r-- | manifests/ssl/base.pp | 2 | ||||
-rw-r--r-- | manifests/ssl/centos.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp index 72f61fd..4aabb40 100644 --- a/manifests/ssl/base.pp +++ b/manifests/ssl/base.pp @@ -1,4 +1,4 @@ class apache::ssl::base { - ::apache::config::file{ 'ssl_defaults.inc': } + ::apache::config::include{ 'ssl_defaults.inc': } ::apache::vhost::file{ '0-default_ssl': } } diff --git a/manifests/ssl/centos.pp b/manifests/ssl/centos.pp index a516f02..b2c8ad8 100644 --- a/manifests/ssl/centos.pp +++ b/manifests/ssl/centos.pp @@ -4,5 +4,5 @@ class apache::ssl::centos inherits apache::ssl::base { ensure => present, require => Package[apache], } - ::apache::config::file{ 'ssl.conf': } + ::apache::config::global{ 'ssl.conf': } } |