[SCM] generic defines, functions and other miscellanea branch, production, updated. releases/0.9-2-g7820051

0 views

Skip to first unread message

David Schmitt

unread,

Jun 5, 2008, 10:48:29 AM6/5/08

to puppet...@googlegroups.com

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "generic defines, functions and other miscellanea".

The branch, production has been updated
via 7820051c671cf47043bb15ad646e32c6a73d61a6 (commit)
via 6a15374c1750953856774017cfd75814778b9db8 (commit)
from 0da171820dd6f9dee2e5bb1d37d464fa26126c6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7820051c671cf47043bb15ad646e32c6a73d61a6
Author: David Schmitt <da...@schmitt.edv-bus.at>
Date: Thu Jun 5 16:48:00 2008 +0200

remove one more $servername

commit 6a15374c1750953856774017cfd75814778b9db8
Author: martin f. krafft <mad...@madduck.net>
Date: Thu Jun 5 16:05:12 2008 +0200

do not use $servername in puppet:// urls

Instead, use puppet:///, which automatically uses
$servername when executed on clients, but which also works
when run locally.

Signed-off-by: martin f. krafft <mad...@madduck.net>
Signed-off-by: David Schmitt <da...@schmitt.edv-bus.at>

-----------------------------------------------------------------------

Changes:
manifests/defines/concatenated_file.pp | 2 +-
manifests/defines/modules_dir.pp | 2 +-
manifests/init.pp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index c35449b..f6404f2 100644
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -30,7 +30,7 @@ define concatenated_file (
} else {
file {
$dir_real:
- source => "puppet://$servername/common/empty",
+ source => "puppet:///common/empty",
checksum => mtime,
recurse => true, purge => true, force => true,
mode => $mode, owner => $owner, group => $group,
diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
index 271b274..971b9fa 100644
--- a/manifests/defines/modules_dir.pp
+++ b/manifests/defines/modules_dir.pp
@@ -16,7 +16,7 @@ define modules_dir (
} else {
file {
"/var/lib/puppet/modules/${name}":
- source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"],
+ source => [ "puppet:///${name}/modules_dir", "puppet:///common/empty"],
checksum => mtime,
recurse => true, purge => true, force => true,
mode => $mode, owner => $owner, group => $group;
diff --git a/manifests/init.pp b/manifests/init.pp
index d284782..dac5652 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,7 +7,7 @@ file {
# module-local data, e.g. for constructing config files
"/var/lib/puppet/modules":
ensure => directory,
- source => "puppet://$servername/common/modules/",
+ source => "puppet:///common/modules/",
ignore => ".svn",
recurse => true, purge => true, force => true,
mode => 0755, owner => root, group => 0;