diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:07:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:07:55 -0400 |
| commit | 6844258b567b5065f5488a12f3f18208ff36ecb0 (patch) | |
| tree | 57dc2fd942ca81584f85ea7f25ec77a6b845f88e /manifests/centos/itk.pp | |
| parent | dafb060fc57957dbe9e5e90698537e781cebeaf6 (diff) | |
| parent | 2f6d7891e115f921c157567e2aa5afd6199c310e (diff) | |
Merge remote-tracking branch 'shared/master' into leap
Conflicts:
manifests/debian.pp
Diffstat (limited to 'manifests/centos/itk.pp')
| -rw-r--r-- | manifests/centos/itk.pp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp index 94f0f1c..20f4270 100644 --- a/manifests/centos/itk.pp +++ b/manifests/centos/itk.pp @@ -5,8 +5,6 @@ class apache::centos::itk inherits apache::centos { name => 'httpd-itk', } File['apache_service_config']{ - source => [ "puppet://$server/modules/site-apache/service/CentOS/${fqdn}/httpd.itk", - "puppet://$server/modules/site-apache/service/CentOS/httpd.itk", - "puppet://$server/modules/apache/service/CentOS/httpd.itk" ], + source => "puppet:///modules/apache/service/${::operatingsystem}/httpd.itk" } } |