diff options
| author | Olivier Blin <dev@blino.org> | 2015-11-22 02:09:53 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2015-11-30 01:32:43 +0100 |
| commit | 4ad008a4880c770205d0ee9afdf6c522c284788a (patch) | |
| tree | 1e0a3cde37b3d497f722e2a7d3fe550fd9ca07be /modules/puppet | |
| parent | 396da52d807c0e1d110ba60ba093d27c70234630 (diff) | |
| download | puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar.gz puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar.bz2 puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar.xz puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.zip | |
apache: use proper conf.d dir on Mageia >= 2
Diffstat (limited to 'modules/puppet')
| -rw-r--r-- | modules/puppet/manifests/thin.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/puppet/manifests/thin.pp b/modules/puppet/manifests/thin.pp index 0c6259e4..1ca03a7e 100644 --- a/modules/puppet/manifests/thin.pp +++ b/modules/puppet/manifests/thin.pp @@ -1,6 +1,7 @@ class puppet::thin { package { 'ruby-thin': } + include apache::base include apache::mod::ssl include apache::mod::proxy @@ -8,7 +9,7 @@ class puppet::thin { vhost_file => 'puppet/apache_proxy_vhost.conf', } - apache::config { '/etc/httpd/conf.d/puppet.conf': + apache::config { "${apache::base::conf_d}/puppet.conf": content => 'Listen 8140', } |