diff options
| author | mh <mh@immerda.ch> | 2010-08-07 02:12:18 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-07 02:12:18 +0200 |
| commit | 9a22fb94cb85f744dbb94c4056a2c3d983abd94b (patch) | |
| tree | 12030d4250c5a3a18ed5f994ed1065f6c44cb8cc | |
| parent | 274f2dac531c6b1dc15545f31239fe3e2c30120c (diff) | |
| download | puppet-lighttpd-9a22fb94cb85f744dbb94c4056a2c3d983abd94b.tar.gz puppet-lighttpd-9a22fb94cb85f744dbb94c4056a2c3d983abd94b.tar.bz2 | |
remove unnecessary fileserver variable (#2460)
| -rw-r--r-- | manifests/base.pp | 6 | ||||
| -rw-r--r-- | manifests/config/file.pp | 20 | ||||
| -rw-r--r-- | manifests/vhost/file.pp | 18 | ||||
| -rw-r--r-- | manifests/vhosts.pp | 2 |
4 files changed, 23 insertions, 23 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 03c5071..84062eb 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -11,9 +11,9 @@ class lighttpd::base { } file{'/etc/lighttpd/lighttpd.conf': - source => [ "puppet://$server/modules/site-lighttpd/${fqdn}/lighttpd.conf", - "puppet://$server/modules/site-lighttpd/lighttpd.conf", - "puppet://$server/modules/lighttpd/lighttpd.conf" ], + source => [ "puppet:///modules/site-lighttpd/${fqdn}/lighttpd.conf", + "puppet:///modules/site-lighttpd/lighttpd.conf", + "puppet:///modules/lighttpd/lighttpd.conf" ], require => Package['lighttpd'], notify => Service['lighttpd'], owner => root, group => 0, mode => 0644; diff --git a/manifests/config/file.pp b/manifests/config/file.pp index 6fa98c4..af6580f 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -14,17 +14,17 @@ define lighttpd::config::file( File["/etc/lighttpd/conf.d/${name}.conf"]{ source => $conf_source ? { 'absent' => [ - "puppet://$server/modules/site-lighttpd/conf.d/$fqdn/$name.conf", - "puppet://$server/modules/site-lighttpd/conf.d/$lighttpd_cluster_node/$name.conf", - "puppet://$server/modules/site-lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/modules/site-lighttpd/conf.d/$operatingsystem/$name.conf", - "puppet://$server/modules/site-lighttpd/conf.d/$name.conf", - "puppet://$server/modules/lighttpd/conf.d/$name.conf", - "puppet://$server/modules/lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/modules/lighttpd/conf.d/$operatingsystem/$name.conf", - "puppet://$server/modules/lighttpd/conf.d/$name.conf" + "puppet:///modules/site-lighttpd/conf.d/$fqdn/$name.conf", + "puppet:///modules/site-lighttpd/conf.d/$lighttpd_cluster_node/$name.conf", + "puppet:///modules/site-lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/site-lighttpd/conf.d/$operatingsystem/$name.conf", + "puppet:///modules/site-lighttpd/conf.d/$name.conf", + "puppet:///modules/lighttpd/conf.d/$name.conf", + "puppet:///modules/lighttpd/conf.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/lighttpd/conf.d/$operatingsystem/$name.conf", + "puppet:///modules/lighttpd/conf.d/$name.conf" ], - default => "puppet://$server/$conf_source", + default => "puppet:///$conf_source", } } } diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index f047173..054a530 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -15,16 +15,16 @@ define lighttpd::vhost::file( File["/etc/lighttpd/vhosts.d/${name}.conf"]{ source => $vhost_source ? { 'absent' => [ - "puppet://$server/modules/site-lighttpd/vhosts.d/$fqdn/$name.conf", - "puppet://$server/modules/site-lighttpd/vhosts.d/$lighttpd_cluster_node/$name.conf", - "puppet://$server/modules/site-lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/modules/site-lighttpd/vhosts.d/$operatingsystem/$name.conf", - "puppet://$server/modules/site-lighttpd/vhosts.d/$name.conf", - "puppet://$server/modules/lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/modules/lighttpd/vhosts.d/$operatingsystem/$name.conf", - "puppet://$server/modules/lighttpd/vhosts.d/$name.conf" + "puppet:///modules/site-lighttpd/vhosts.d/$fqdn/$name.conf", + "puppet:///modules/site-lighttpd/vhosts.d/$lighttpd_cluster_node/$name.conf", + "puppet:///modules/site-lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/site-lighttpd/vhosts.d/$operatingsystem/$name.conf", + "puppet:///modules/site-lighttpd/vhosts.d/$name.conf", + "puppet:///modules/lighttpd/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/lighttpd/vhosts.d/$operatingsystem/$name.conf", + "puppet:///modules/lighttpd/vhosts.d/$name.conf" ], - default => "puppet://$server/$vhost_source", + default => "puppet:///$vhost_source", } } } diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp index 9e02661..72cbcf5 100644 --- a/manifests/vhosts.pp +++ b/manifests/vhosts.pp @@ -1,6 +1,6 @@ class lighttpd::vhosts { file{'/etc/lighttpd/vhosts.d': - source => "puppet://$server/modules/common/empty", + source => "puppet:///modules/common/empty", ensure => directory, purge => true, recurse => true, |