diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-15 13:52:26 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-15 13:52:26 +0000 |
| commit | b75ee224940c9b5f92b422de66b83d2a57f9b1f7 (patch) | |
| tree | e5a674ffb49c7b60f05cdbb38703586540255ab0 /modules/apache | |
| parent | 705ff403473c363337aa22fa33c63c98a96ac323 (diff) | |
| download | puppet-b75ee224940c9b5f92b422de66b83d2a57f9b1f7.tar puppet-b75ee224940c9b5f92b422de66b83d2a57f9b1f7.tar.gz puppet-b75ee224940c9b5f92b422de66b83d2a57f9b1f7.tar.bz2 puppet-b75ee224940c9b5f92b422de66b83d2a57f9b1f7.tar.xz puppet-b75ee224940c9b5f92b422de66b83d2a57f9b1f7.zip | |
reorder variable, and correct 'before', since this break on friteuse
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index 8485d97e..e6557211 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -112,6 +112,7 @@ class apache { $enable_public_html = false) { include apache::base $httpd_logdir = "/var/log/httpd" + $filename = "$name.conf" if ! $vhost { $real_vhost = $name @@ -135,7 +136,7 @@ class apache { if $wildcard_sslcert != 'true' { openssl::self_signed_cert{ "$real_vhost": directory => "/etc/ssl/apache/", - before => File["$filename"], + before => Apache::Config["/etc/httpd/conf/vhosts.d/$filename"], } } } @@ -144,7 +145,6 @@ class apache { include apache::mod_public_html } - $filename = "$name.conf" apache::config { "/etc/httpd/conf/vhosts.d/$filename": content => template("apache/vhost_base.conf") } |