From jmeeuwen at puppetmanaged.org Thu Aug 5 19:35:00 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 5 Aug 2010 19:35:00 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201008051735.o75HZ0L7000482@master.puppetmanaged.org> files/mash/feature-f13-ruby-1.9.1.mash | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) New commits: commit e7cbd6b9c419f69586549a4f92b725b83ccb0edb Author: Jeroen van Meeuwen Date: Thu Aug 5 19:34:08 2010 +0200 Add feature-f13-ruby-1.9.1 mashing diff --git a/files/mash/feature-f13-ruby-1.9.1.mash b/files/mash/feature-f13-ruby-1.9.1.mash new file mode 100644 index 0000000..d566275 --- /dev/null +++ b/files/mash/feature-f13-ruby-1.9.1.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-f13-ruby-1.9.1] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-f13-ruby-1.9.1 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-f13-ruby-1.9.1/%(arch)s/ +repoviewtitle = "Fedora 13 - Featured Ruby 1.9.1 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Thu Aug 5 21:11:59 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 5 Aug 2010 21:11:59 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201008051911.o75JBx7u014354@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 11 +++++++++++ 1 file changed, 11 insertions(+) New commits: commit b3b5df4e4a878499c653485eec06d36962fd6625 Author: Jeroen van Meeuwen (Ergo Project) Date: Thu Aug 5 21:12:09 2010 +0200 Add docs repo for ergo diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 47322a4..7e355c0 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -143,6 +143,17 @@ node 'master.puppetmanaged.org' { # Git repositories for ergo-project.org git::repository { [ + "docs" + ]: + localtree => "/data/scm/git/git.ergo-project.org/", + shared => true, + public => true, + owner => "kanarip", + group => "git-ergo-project.org-docs", + recipients => [ "jeroen.van.meeuwen at ergo-project.org" ] + } + + git::repository { [ "web" ]: localtree => "/data/scm/git/git.ergo-project.org/", From shartsuiker at puppetmanaged.org Tue Aug 17 07:36:55 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 07:36:55 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008170536.o7H5atpp000564@master.puppetmanaged.org> manifests/init.pp | 1 + 1 file changed, 1 insertion(+) New commits: commit 0792637b3789efa02faab1ef9b7609dc28b1f4fc Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 07:36:52 2010 +0200 add comment about not working diff --git a/manifests/init.pp b/manifests/init.pp index 6013b29..8e02a02 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -471,6 +471,7 @@ class puppet { # Rebind the virtual resource File["/etc/puppet/puppet.conf"] # This needs to after the above define, because at this moment the environment (ie variable values) are fixed in place for the template + # Currently not working: variables appear to be fixed at the time of rebinding, thus the define above is not changing the variables. File["/etc/puppet/puppet.conf"] { content => template('puppet/puppet.conf.erb') } From shartsuiker at puppetmanaged.org Tue Aug 17 08:50:31 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 08:50:31 +0200 Subject: [Commits] Branch 'development' - files/site.pp Message-ID: <201008170650.o7H6oVC7011672@master.puppetmanaged.org> files/site.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 840d93da9575c103d279d21143f5273070682fc8 Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 08:50:28 2010 +0200 change order of the imports to domains and nodes first diff --git a/files/site.pp b/files/site.pp index 51c48b8..19d97c4 100644 --- a/files/site.pp +++ b/files/site.pp @@ -4,11 +4,13 @@ $server = "master.puppetmanaged.org" -import "classes/*.pp" +# Do these first, see if this allow proper variable inheritance import "domains/*.pp" +import "nodes/*.pp" + +import "classes/*.pp" import "groups/*.pp" import "modules/*.pp" -import "nodes/*.pp" import "services/*.pp" import "utils/*.pp" From shartsuiker at puppetmanaged.org Tue Aug 17 09:03:37 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 09:03:37 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008170703.o7H73bos012360@master.puppetmanaged.org> manifests/init.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit cd84509de3acf146621ddf73b070173ed6d4a5f6 Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 09:03:32 2010 +0200 fully scoped variables are not assignable diff --git a/manifests/init.pp b/manifests/init.pp index 8e02a02..d178899 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -431,11 +431,11 @@ class puppet { # We keep this to conform with the puppet::sattelite::storeconfigs_mysql subclass and their ilk, # since we don't want to change the template - $puppet::satellite::real_puppet_extra_output = $puppet_extra_output - $puppet::satellite::real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database - $puppet::satellite::real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username - $puppet::satellite::real_puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password - $puppet::satellite::real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname + $real_puppet_extra_output = $puppet_extra_output + $real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database + $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username + $real_puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password + $real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname case $real_puppet_storeconfigs_mysql_hostname { "127.0.0.1", "localhost", "localhost.localdomain": { From shartsuiker at puppetmanaged.org Tue Aug 17 09:39:48 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 09:39:48 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201008170739.o7H7dm1K021982@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 37e0c7ad012f2a8bc5096b60c8c81abcefb44ec6 Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 09:39:45 2010 +0200 repo centos-5-custom currently contains nothing so yum times out diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 6711482..6612f04 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -763,7 +763,7 @@ node 'master.puppetmanaged.org' { ## yum::repository { "custom": - enable => true + enable => false } } From shartsuiker at puppetmanaged.org Tue Aug 17 10:11:24 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 10:11:24 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008170811.o7H8BO61006027@master.puppetmanaged.org> manifests/init.pp | 1 + 1 file changed, 1 insertion(+) New commits: commit 2c804ab7ada72654b20db4f9be882ec22639cb11 Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 10:11:21 2010 +0200 add notify, I think inheritance is still not working diff --git a/manifests/init.pp b/manifests/init.pp index d178899..a9f06bd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -373,6 +373,7 @@ class puppet { '' => "false", default => $puppet_extra_output } + notify{"the value of \$puppet_extra_output = $puppet_extra_output": } $real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database ? { '' => "puppet", From shartsuiker at puppetmanaged.org Tue Aug 17 10:34:33 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 10:34:33 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008170834.o7H8YXp9031702@master.puppetmanaged.org> manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit bd733907796d2bbf0a00b3833d1d104dbaa13f65 Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 10:34:30 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index a97273f..c3cc7db 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ class programs { "puppet://$server/private/$environment/programs/bin/", "puppet://$server/files/programs/bin.$hostname/", "puppet://$server/files/programs/bin/", - "puppet://$server/programs/bin/" + "puppet://$server/modules/programs/bin/" ], mode => 755, recurse => true, @@ -28,11 +28,11 @@ class programs { "puppet://$server/private/$environment/programs/sbin/", "puppet://$server/files/programs/sbin.$hostname/", "puppet://$server/files/programs/sbin/", - "puppet://$server/programs/sbin/" + "puppet://$server/modules/programs/sbin/" ], mode => 755, recurse => true, purge => false } } -} \ No newline at end of file +} From shartsuiker at puppetmanaged.org Tue Aug 17 11:03:55 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 17 Aug 2010 11:03:55 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008170903.o7H93t10022461@master.puppetmanaged.org> manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit afab1d62f74b086b1e80bd2283b0e6bc67acda5e Author: Stefan Alexander Hartsuiker Date: Tue Aug 17 11:03:51 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index 7138b65..152a47d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,8 +16,8 @@ class selinux { "puppet://$server/private/$environment/selinux/restorecond.conf", "puppet://$server/files/selinux/restorecond.conf.$hostname", "puppet://$server/files/selinux/restorecond.conf", - "puppet://$server/selinux/restorecond.conf.$hostname", - "puppet://$server/selinux/restorecond.conf" + "puppet://$server/modules/selinux/restorecond.conf.$hostname", + "puppet://$server/modules/selinux/restorecond.conf" ], require => Package["policycoreutils"], notify => Service["restorecond"] From jmeeuwen at puppetmanaged.org Wed Aug 18 12:23:06 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 18 Aug 2010 12:23:06 +0200 Subject: [Commits] Branch 'development' - 2 commits - puppet/manifests Message-ID: <201008181023.o7IAN6U6004924@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cb27a5c5d6196c9736739561faeb46893e9fc80e Merge: a060d9b... e7cbd6b... Author: Jeroen van Meeuwen (Ergo Project) Date: Wed Aug 18 11:19:44 2010 +0100 Merge branch 'development' of ssh://git.puppetmanaged.org/git/puppet/domain-kanarip.com into development commit a060d9bdaa38c1f31456726c300227bc2b40dbc3 Author: Jeroen van Meeuwen (Ergo Project) Date: Wed Aug 18 11:10:48 2010 +0100 Update elwood diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 541613c..61218d2 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -28,7 +28,7 @@ node 'elwood.kanarip.com' { } cron { "koji_regen-repo": - command => "for tag in `koji list-tags | grep -E '\-build$'`; do if [ -z \"`koji list-tag-inheritance \$tag | grep -v \$tag | grep -E '\-build $\w+$$'`\" ]; then koji regen-repo --nowait \$tag; else echo \"Tag \$tag does inherit from other build tags, skipping\"; fi; done", + command => "for tag in `koji list-tags | grep -E '\\-build$'`; do if [ -z \"`koji list-tag-inheritance \$tag | grep -v \$tag | grep -E '\\-build $\w+$$'`\" ]; then koji regen-repo --nowait \$tag; else echo \"Tag \$tag does inherit from other build tags, skipping\"; fi; done", minute => "23", hour => "6", user => "kojiadmin" From shartsuiker at puppetmanaged.org Tue Aug 24 20:39:54 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 24 Aug 2010 20:39:54 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008241839.o7OIdsDg006274@master.puppetmanaged.org> manifests/init.pp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) New commits: commit d63fdfb5422640c8dab84385b358c65b40c873fd Author: Stefan Alexander Hartsuiker Date: Tue Aug 24 20:39:51 2010 +0200 cleanup define diff --git a/manifests/init.pp b/manifests/init.pp index a9f06bd..5b371be 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -373,7 +373,6 @@ class puppet { '' => "false", default => $puppet_extra_output } - notify{"the value of \$puppet_extra_output = $puppet_extra_output": } $real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database ? { '' => "puppet", @@ -438,12 +437,6 @@ class puppet { $real_puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password $real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname - case $real_puppet_storeconfigs_mysql_hostname { - "127.0.0.1", "localhost", "localhost.localdomain": { - include mysql::server - } - } - # This shows up in the Puppet Report client side notify{"The value of puppet_storeconfigs in puppet::satellite::storeconfig_mysql is: ${puppet_storeconfigs}": } notify{"The value of real_puppet_storeconfigs_mysql_hostname in puppet::satellite::storeconfig_mysql is: ${real_puppet_storeconfigs_mysql_hostname}": } @@ -452,17 +445,7 @@ class puppet { notify{"The value of real_puppet_storeconfigs_mysql_password in puppet::satellite::storeconfig_mysql is: ${real_puppet_storeconfigs_mysql_password}": } notify{"The value of puppet_extra_output in puppet::satellite::storeconfig_mysql is: ${real_puppet_extra_output}": } - exec { "${puppet_type}-storeconfig_mysql_create_db": - command => "/usr/bin/mysqladmin create $real_puppet_storeconfigs_mysql_database", - unless => "/usr/bin/mysqlcheck -u $real_puppet_storeconfigs_mysql_username --password=$real_puppet_storeconfigs_mysql_password -s puppet 2>/dev/null", - notify => Exec["$puppet_type-storeconfig_mysql_create_user"], - creates => "/var/lib/mysql/$real_puppet_storeconfigs_mysql_database/" - } - - exec { "${puppet_type}-storeconfig_mysql_create_user": - command => "/usr/bin/mysql -e 'grant all privileges on puppet.* to $real_puppet_storeconfigs_mysql_username at localhost identified by \"$real_puppet_storeconfigs_mysql_password\"'", - refreshonly => true - } + include puppet::satellite::storeconfigs_mysql } From shartsuiker at puppetmanaged.org Tue Aug 24 21:42:56 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Tue, 24 Aug 2010 21:42:56 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008241942.o7OJguJQ022743@master.puppetmanaged.org> manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c9f8941931069bd73caee11a9268c7933ab88ac7 Author: Stefan Alexander Hartsuiker Date: Tue Aug 24 21:42:52 2010 +0200 add notify, stuff still does not work as expected diff --git a/manifests/init.pp b/manifests/init.pp index 5b371be..3319823 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -400,6 +400,8 @@ class puppet { } } + notify{"The value of puppet_extra_output in puppet::satellite::storeconfigs_mysql is: ${real_puppet_extra_output}": } + File["/etc/puppet/puppet.conf"] { content => template('puppet/puppet.conf.erb') } @@ -446,7 +448,6 @@ class puppet { notify{"The value of puppet_extra_output in puppet::satellite::storeconfig_mysql is: ${real_puppet_extra_output}": } include puppet::satellite::storeconfigs_mysql - } if $puppet_storeconfigs == '' { From shartsuiker at puppetmanaged.org Wed Aug 25 01:07:12 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 01:07:12 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008242307.o7ON7CVR018559@master.puppetmanaged.org> manifests/init.pp | 57 ++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) New commits: commit 0132888509f94eeb871825a5ba895fc4559c1729 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 01:04:57 2010 +0200 let's move the define into the storeconfigs_mysql class to see if it will help diff --git a/manifests/init.pp b/manifests/init.pp index 3319823..364333a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -368,6 +368,29 @@ class puppet { debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password") + define storeconfigs_mysql_settings ( $puppet_extra_output = "false", + $puppet_storeconfigs_mysql_database = "puppet", + $puppet_storeconfigs_mysql_username = "puppet", + $puppet_storeconfigs_mysql_password = "puppet", + $puppet_storeconfigs_mysql_hostname = "127.0.0.1" ) { + include mysql::client + + # We keep this to conform with the puppet::sattelite::storeconfigs_mysql subclass and their ilk, + # since we don't want to change the template + $real_puppet_extra_output = $puppet_extra_output + $real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database + $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username + $real_puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password + $real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname + + # This shows up in the Puppet Report client side + notify{"The value of puppet_extra_output in storeconfigs_mysql_settings is: ${real_puppet_extra_output}": } + notify{"The value of real_puppet_storeconfigs_mysql_hostname in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_hostname}": } + notify{"The value of real_puppet_storeconfigs_mysql_database in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_database}": } + notify{"The value of real_puppet_storeconfigs_mysql_username in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_username}": } + notify{"The value of real_puppet_storeconfigs_mysql_password in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_password}": } + } + # We may need this to ensure proper downwards inheritance towards subclasses $real_puppet_extra_output = $puppet_extra_output ? { '' => "false", @@ -400,7 +423,11 @@ class puppet { } } - notify{"The value of puppet_extra_output in puppet::satellite::storeconfigs_mysql is: ${real_puppet_extra_output}": } + notify{"The value of puppet_extra_output in puppet::satellite::storeconfig_mysql is: ${real_puppet_extra_output}": } + notify{"The value of real_puppet_storeconfigs_mysql_hostname in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_hostname}": } + notify{"The value of real_puppet_storeconfigs_mysql_database in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_database}": } + notify{"The value of real_puppet_storeconfigs_mysql_username in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_username}": } + notify{"The value of real_puppet_storeconfigs_mysql_password in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_password}": } File["/etc/puppet/puppet.conf"] { content => template('puppet/puppet.conf.erb') @@ -422,34 +449,6 @@ class puppet { } - define storeconfig_mysql ( $puppet_type = "satellite", - $puppet_storeconfigs = "mysql", - $puppet_extra_output = "false", - $puppet_storeconfigs_mysql_database = "puppet", - $puppet_storeconfigs_mysql_username = "puppet", - $puppet_storeconfigs_mysql_password = "puppet", - $puppet_storeconfigs_mysql_hostname = "127.0.0.1" ) { - include mysql::client - - # We keep this to conform with the puppet::sattelite::storeconfigs_mysql subclass and their ilk, - # since we don't want to change the template - $real_puppet_extra_output = $puppet_extra_output - $real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database - $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username - $real_puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password - $real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname - - # This shows up in the Puppet Report client side - notify{"The value of puppet_storeconfigs in puppet::satellite::storeconfig_mysql is: ${puppet_storeconfigs}": } - notify{"The value of real_puppet_storeconfigs_mysql_hostname in puppet::satellite::storeconfig_mysql is: ${real_puppet_storeconfigs_mysql_hostname}": } - notify{"The value of real_puppet_storeconfigs_mysql_database in puppet::satellite::storeconfig_mysql is: ${real_puppet_storeconfigs_mysql_database}": } - notify{"The value of real_puppet_storeconfigs_mysql_username in puppet::satellite::storeconfig_mysql is: ${real_puppet_storeconfigs_mysql_username}": } - notify{"The value of real_puppet_storeconfigs_mysql_password in puppet::satellite::storeconfig_mysql is: ${real_puppet_storeconfigs_mysql_password}": } - notify{"The value of puppet_extra_output in puppet::satellite::storeconfig_mysql is: ${real_puppet_extra_output}": } - - include puppet::satellite::storeconfigs_mysql - } - if $puppet_storeconfigs == '' { $puppet_storeconfigs = "none" } From shartsuiker at puppetmanaged.org Wed Aug 25 01:28:28 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 01:28:28 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008242328.o7ONSSLZ017013@master.puppetmanaged.org> manifests/init.pp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 9baf44dc488a1710ad0addc8f8c3c4c4f0c0e0c3 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 01:28:24 2010 +0200 this is not working at all, I am giving up for now, change notifies to debug statements diff --git a/manifests/init.pp b/manifests/init.pp index 364333a..3fff72c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -384,11 +384,11 @@ class puppet { $real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname # This shows up in the Puppet Report client side - notify{"The value of puppet_extra_output in storeconfigs_mysql_settings is: ${real_puppet_extra_output}": } - notify{"The value of real_puppet_storeconfigs_mysql_hostname in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_hostname}": } - notify{"The value of real_puppet_storeconfigs_mysql_database in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_database}": } - notify{"The value of real_puppet_storeconfigs_mysql_username in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_username}": } - notify{"The value of real_puppet_storeconfigs_mysql_password in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_password}": } + debug("The value of puppet_extra_output in storeconfigs_mysql_settings is: ${real_puppet_extra_output}") + debug("The value of real_puppet_storeconfigs_mysql_hostname in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_hostname}") + debug("The value of real_puppet_storeconfigs_mysql_database in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_database}") + debug("The value of real_puppet_storeconfigs_mysql_username in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_username}") + debug("The value of real_puppet_storeconfigs_mysql_password in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_password}") } # We may need this to ensure proper downwards inheritance towards subclasses @@ -423,11 +423,11 @@ class puppet { } } - notify{"The value of puppet_extra_output in puppet::satellite::storeconfig_mysql is: ${real_puppet_extra_output}": } - notify{"The value of real_puppet_storeconfigs_mysql_hostname in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_hostname}": } - notify{"The value of real_puppet_storeconfigs_mysql_database in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_database}": } - notify{"The value of real_puppet_storeconfigs_mysql_username in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_username}": } - notify{"The value of real_puppet_storeconfigs_mysql_password in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_password}": } + debug("The value of puppet_extra_output in puppet::satellite::storeconfigs_mysql is: ${real_puppet_extra_output}") + debug("The value of real_puppet_storeconfigs_mysql_hostname in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_hostname}") + debug("The value of real_puppet_storeconfigs_mysql_database in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_database}") + debug("The value of real_puppet_storeconfigs_mysql_username in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_username}") + debug("The value of real_puppet_storeconfigs_mysql_password in puppet::satellite::storeconfigs_mysql is: ${real_puppet_storeconfigs_mysql_password}") File["/etc/puppet/puppet.conf"] { content => template('puppet/puppet.conf.erb') From shartsuiker at puppetmanaged.org Wed Aug 25 01:42:09 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 01:42:09 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008242342.o7ONg9fS005987@master.puppetmanaged.org> manifests/init.pp | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) New commits: commit a7355c4053ef42f8bfb5354888093c9061408e6b Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 01:40:31 2010 +0200 Remove useless define again. The only way to override the variables is to make your own subclass inside a node recipe or something. That solution, although ugly as hell, works. diff --git a/manifests/init.pp b/manifests/init.pp index 3fff72c..0a8841d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -368,29 +368,6 @@ class puppet { debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password") - define storeconfigs_mysql_settings ( $puppet_extra_output = "false", - $puppet_storeconfigs_mysql_database = "puppet", - $puppet_storeconfigs_mysql_username = "puppet", - $puppet_storeconfigs_mysql_password = "puppet", - $puppet_storeconfigs_mysql_hostname = "127.0.0.1" ) { - include mysql::client - - # We keep this to conform with the puppet::sattelite::storeconfigs_mysql subclass and their ilk, - # since we don't want to change the template - $real_puppet_extra_output = $puppet_extra_output - $real_puppet_storeconfigs_mysql_database = $puppet_storeconfigs_mysql_database - $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username - $real_puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password - $real_puppet_storeconfigs_mysql_hostname = $puppet_storeconfigs_mysql_hostname - - # This shows up in the Puppet Report client side - debug("The value of puppet_extra_output in storeconfigs_mysql_settings is: ${real_puppet_extra_output}") - debug("The value of real_puppet_storeconfigs_mysql_hostname in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_hostname}") - debug("The value of real_puppet_storeconfigs_mysql_database in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_database}") - debug("The value of real_puppet_storeconfigs_mysql_username in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_username}") - debug("The value of real_puppet_storeconfigs_mysql_password in storeconfigs_mysql_settings is: ${real_puppet_storeconfigs_mysql_password}") - } - # We may need this to ensure proper downwards inheritance towards subclasses $real_puppet_extra_output = $puppet_extra_output ? { '' => "false", @@ -454,8 +431,8 @@ class puppet { } # Rebind the virtual resource File["/etc/puppet/puppet.conf"] - # This needs to after the above define, because at this moment the environment (ie variable values) are fixed in place for the template - # Currently not working: variables appear to be fixed at the time of rebinding, thus the define above is not changing the variables. + # This needs to be as late as possible, because at this moment the environment (ie variable values) is fixed in place for the template + # Currently not working: variables appear to be fixed at the time of rebinding, thus the (now removed) define above is not changing the variables. File["/etc/puppet/puppet.conf"] { content => template('puppet/puppet.conf.erb') } From shartsuiker at puppetmanaged.org Wed Aug 25 02:13:10 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 02:13:10 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250013.o7P0DA3t021951@master.puppetmanaged.org> manifests/init.pp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit 1d41a99b224dcf2d9a40b87cd98dcaad5c2f4932 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 02:13:07 2010 +0200 allow for \$osversion independant repo definition files diff --git a/manifests/init.pp b/manifests/init.pp index 9b7cf5e..8a9ef9c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -621,7 +621,8 @@ class yum { "puppet://$server/files/yum/$os/$osver/repos/$name.repo", "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo", "puppet://$server/yum/$os/$osver/repos/$name.repo", - "puppet://$server/yum/$os/$osmajorver/repos/$name.repo" + "puppet://$server/yum/$os/$osmajorver/repos/$name.repo", + "puppet://$server/yum/$os/repos/$name.repo" ], default => [ "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo.disabled", @@ -629,7 +630,8 @@ class yum { "puppet://$server/files/yum/$os/$osver/repos/$name.repo.disabled", "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo.disabled", "puppet://$server/yum/$os/$osver/repos/$name.repo.disabled", - "puppet://$server/yum/$os/$osmajorver/repos/$name.repo.disabled" + "puppet://$server/yum/$os/$osmajorver/repos/$name.repo.disabled", + "puppet://$server/yum/$os/repos/$name.repo.disabled" ] }, require => Package["redhat-lsb"] @@ -656,7 +658,8 @@ class yum { "puppet://$server/files/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name" + "puppet://$server/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", + "puppet://$server/yum/$os/gpgkeys/RPM-GPG-KEY-$name" ] } } @@ -677,7 +680,8 @@ class yum { "puppet://$server/files/yum/$os/$osver/gpgkeys/$gpgkey", "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/$gpgkey", "puppet://$server/yum/$os/$osver/gpgkeys/$gpgkey", - "puppet://$server/yum/$os/$osmajorver/gpgkeys/$gpgkey" + "puppet://$server/yum/$os/$osmajorver/gpgkeys/$gpgkey", + "puppet://$server/yum/$os/gpgkeys/$gpgkey" ] } } From shartsuiker at puppetmanaged.org Wed Aug 25 02:22:35 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 02:22:35 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250022.o7P0MZdp005097@master.puppetmanaged.org> manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 5675bf59f415df07236a633e7281d2f6fa87e0af Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 02:22:32 2010 +0200 does this break the puppetmaster? diff --git a/manifests/init.pp b/manifests/init.pp index 0a8841d..9ca6c38 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -206,8 +206,8 @@ class puppet { group => "root", mode => 644, source => [ - "/var/lib/puppet/private/$domain/$name/puppet/site.pp", - "/var/lib/puppet/modules/$name/puppet/files/site.pp" + "puppet://$server/private/$domain/$name/puppet/site.pp", + "puppet://$server/modules/$name/puppet/files/site.pp" ], require => File["/var/lib/puppet/manifests/$name/"], notify => Service["puppetmaster"] @@ -217,7 +217,7 @@ class puppet { owner => "root", group => "root", source => [ - "/var/lib/puppet/private/$domain/$name/puppet/manifests/" + "puppet://$server/private/$domain/$name/puppet/manifests/" ], recurse => true, purge => true From shartsuiker at puppetmanaged.org Wed Aug 25 02:32:17 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 02:32:17 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250032.o7P0WHif029786@master.puppetmanaged.org> manifests/init.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit d90399a99d5c488e9b64a8ff88f558f7b390eff2 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 02:32:13 2010 +0200 allow for \$osversion independant repo definition files, take 2 diff --git a/manifests/init.pp b/manifests/init.pp index 8a9ef9c..bc27da0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -618,20 +618,20 @@ class yum { true => [ "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo", "puppet://$server/private/$environment/yum/$os/$osmajorver/repos/$name.repo", + "puppet://$server/private/$environment/yum/$os/repos/$name.repo", "puppet://$server/files/yum/$os/$osver/repos/$name.repo", "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo", "puppet://$server/yum/$os/$osver/repos/$name.repo", - "puppet://$server/yum/$os/$osmajorver/repos/$name.repo", - "puppet://$server/yum/$os/repos/$name.repo" + "puppet://$server/yum/$os/$osmajorver/repos/$name.repo" ], default => [ "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo.disabled", "puppet://$server/private/$environment/yum/$os/$osmajorver/repos/$name.repo.disabled", + "puppet://$server/private/$environment/yum/$os/repos/$name.repo.disabled", "puppet://$server/files/yum/$os/$osver/repos/$name.repo.disabled", "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo.disabled", "puppet://$server/yum/$os/$osver/repos/$name.repo.disabled", - "puppet://$server/yum/$os/$osmajorver/repos/$name.repo.disabled", - "puppet://$server/yum/$os/repos/$name.repo.disabled" + "puppet://$server/yum/$os/$osmajorver/repos/$name.repo.disabled" ] }, require => Package["redhat-lsb"] @@ -655,11 +655,11 @@ class yum { source => [ "puppet://$server/private/$environment/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/private/$environment/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", + "puppet://$server/private/$environment/yum/$os/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/files/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/yum/$os/gpgkeys/RPM-GPG-KEY-$name" + "puppet://$server/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name" ] } } @@ -677,11 +677,11 @@ class yum { source => [ "puppet://$server/private/$environment/yum/$os/$osver/gpgkeys/$gpgkey", "puppet://$server/private/$environment/yum/$os/$osmajorver/gpgkeys/$gpgkey", + "puppet://$server/private/$environment/yum/$os/gpgkeys/$gpgkey", "puppet://$server/files/yum/$os/$osver/gpgkeys/$gpgkey", "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/$gpgkey", "puppet://$server/yum/$os/$osver/gpgkeys/$gpgkey", - "puppet://$server/yum/$os/$osmajorver/gpgkeys/$gpgkey", - "puppet://$server/yum/$os/gpgkeys/$gpgkey" + "puppet://$server/yum/$os/$osmajorver/gpgkeys/$gpgkey" ] } } From shartsuiker at puppetmanaged.org Wed Aug 25 03:12:34 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:12:34 +0200 Subject: [Commits] Branch 'development' - files/fileserver.conf Message-ID: <201008250112.o7P1CY51014851@master.puppetmanaged.org> files/fileserver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fe25212d24972409fc18cf8b04e63dda9f786989 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:11:08 2010 +0200 no trailing slashes allowed on paths diff --git a/files/fileserver.conf b/files/fileserver.conf index f399400..137bfd6 100644 --- a/files/fileserver.conf +++ b/files/fileserver.conf @@ -17,5 +17,5 @@ # allow * [private] - path /var/lib/puppet/private/%d/ + path /var/lib/puppet/private/%d allow * From shartsuiker at puppetmanaged.org Wed Aug 25 03:13:10 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:13:10 +0200 Subject: [Commits] Branch 'development' - puppet/fileserver.conf Message-ID: <201008250113.o7P1DAlr014909@master.puppetmanaged.org> puppet/fileserver.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit cb905ff065bc796462b721d5a1ec1b163e237a31 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:13:06 2010 +0200 no trailing slashes allowed on paths diff --git a/puppet/fileserver.conf b/puppet/fileserver.conf index d5b4a75..077efb7 100644 --- a/puppet/fileserver.conf +++ b/puppet/fileserver.conf @@ -18,9 +18,9 @@ allow * [private] - path /var/lib/puppet/private/%d/ + path /var/lib/puppet/private/%d allow * [sensitive] - path /var/lib/puppet/sensitive/%d/ + path /var/lib/puppet/sensitive/%d allow * From shartsuiker at puppetmanaged.org Wed Aug 25 03:19:28 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:19:28 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250119.o7P1JSQ4029377@master.puppetmanaged.org> manifests/init.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 5edb66f47867a99c12628b5a1122aaa29602a453 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 02:51:18 2010 +0200 allow for \$osversion independant repo definition files, take 3 diff --git a/manifests/init.pp b/manifests/init.pp index bc27da0..bfa1e3b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -618,7 +618,7 @@ class yum { true => [ "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo", "puppet://$server/private/$environment/yum/$os/$osmajorver/repos/$name.repo", - "puppet://$server/private/$environment/yum/$os/repos/$name.repo", + "puppet://$server/private/$environment/yum/repos/$os/$name.repo", "puppet://$server/files/yum/$os/$osver/repos/$name.repo", "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo", "puppet://$server/yum/$os/$osver/repos/$name.repo", @@ -627,7 +627,7 @@ class yum { default => [ "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo.disabled", "puppet://$server/private/$environment/yum/$os/$osmajorver/repos/$name.repo.disabled", - "puppet://$server/private/$environment/yum/$os/repos/$name.repo.disabled", + "puppet://$server/private/$environment/yum/repos/$os/$name.repo.disabled", "puppet://$server/files/yum/$os/$osver/repos/$name.repo.disabled", "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo.disabled", "puppet://$server/yum/$os/$osver/repos/$name.repo.disabled", @@ -655,7 +655,7 @@ class yum { source => [ "puppet://$server/private/$environment/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/private/$environment/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/private/$environment/yum/$os/gpgkeys/RPM-GPG-KEY-$name", + "puppet://$server/private/$environment/yum/gpgkeys/$os/RPM-GPG-KEY-$name", "puppet://$server/files/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", @@ -677,7 +677,7 @@ class yum { source => [ "puppet://$server/private/$environment/yum/$os/$osver/gpgkeys/$gpgkey", "puppet://$server/private/$environment/yum/$os/$osmajorver/gpgkeys/$gpgkey", - "puppet://$server/private/$environment/yum/$os/gpgkeys/$gpgkey", + "puppet://$server/private/$environment/yum/gpgkeys/$os/$gpgkey", "puppet://$server/files/yum/$os/$osver/gpgkeys/$gpgkey", "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/$gpgkey", "puppet://$server/yum/$os/$osver/gpgkeys/$gpgkey", From shartsuiker at puppetmanaged.org Wed Aug 25 03:26:55 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:26:55 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250126.o7P1Qttr005893@master.puppetmanaged.org> manifests/init.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 0ab49c2b2296f91a6a5dd122013a25cc48fbfb85 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:26:23 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index d4ca25f..4c8369d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -70,8 +70,8 @@ class git { mode => 750, source => [ "puppet://$server/private/$environment/git/git_init_script", - "puppet://$server/files/git/git_init_script", - "puppet://$server/git/git_init_script" + "puppet://$server/modules/files/git/git_init_script", + "puppet://$server/modules/git/git_init_script" ] } } @@ -118,8 +118,8 @@ class git { mode => 750, source => [ "puppet://$server/private/$environment/git/git_init_script", - "puppet://$server/files/git/git_init_script", - "puppet://$server/git/git_init_script" + "puppet://$server/modules/files/git/git_init_script", + "puppet://$server/modules/git/git_init_script" ] } } @@ -177,8 +177,8 @@ class git { }, source => [ "puppet://$server/private/$environment/git/post-commit", - "puppet://$server/files/git/post-commit", - "puppet://$server/git/post-commit" + "puppet://$server/modules/files/git/post-commit", + "puppet://$server/modules/git/post-commit" ], mode => 755, require => [ From shartsuiker at puppetmanaged.org Wed Aug 25 03:29:41 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:29:41 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250129.o7P1TfW0005952@master.puppetmanaged.org> manifests/init.pp | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) New commits: commit 7e0f7ec7094f7773a87e9b4968eac619209f3de7 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:29:38 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index f20cd90..3641ac7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -73,10 +73,10 @@ class webserver { source => [ "puppet://$server/private/$environment/webserver/httpd.conf.$hostname", "puppet://$server/private/$environment/webserver/httpd.conf", - "puppet://$server/files/webserver/httpd.conf.$hostname", - "puppet://$server/files/webserver/httpd.conf", - "puppet://$server/webserver/httpd.conf.$hostname", - "puppet://$server/webserver/httpd.conf" + "puppet://$server/modules/files/webserver/httpd.conf.$hostname", + "puppet://$server/modules/files/webserver/httpd.conf", + "puppet://$server/modules/webserver/httpd.conf.$hostname", + "puppet://$server/modules/webserver/httpd.conf" ], require => Package["httpd"], notify => Service["httpd"] @@ -442,8 +442,8 @@ class webserver { ensure => directory, source => [ "puppet://$server/private/$environment/webserver/modsecurity.d/", - "puppet://$server/files/webserver/modsecurity.d/", - "puppet://$server/webserver/modsecurity.d/" + "puppet://$server/modules/files/webserver/modsecurity.d/", + "puppet://$server/modules/webserver/modsecurity.d/" ], recurse => true, purge => false, @@ -507,10 +507,10 @@ class webserver { source => [ "puppet://$server/private/$environment/webserver/sites/$name.conf.$hostname", "puppet://$server/private/$environment/webserver/sites/$name.conf", - "puppet://$server/files/webserver/sites/$name.conf.$hostname", - "puppet://$server/files/webserver/sites/$name.conf", - "puppet://$server/webserver/sites/$name.conf.$hostname", - "puppet://$server/webserver/sites/$name.conf" + "puppet://$server/modules/files/webserver/sites/$name.conf.$hostname", + "puppet://$server/modules/files/webserver/sites/$name.conf", + "puppet://$server/modules/webserver/sites/$name.conf.$hostname", + "puppet://$server/modules/webserver/sites/$name.conf" ], notify => Service["httpd"] } @@ -544,8 +544,8 @@ class webserver { file { "/etc/pki/tls/certs/$name.cert": source => [ "puppet://$server/private/$environment/webserver/sites/$name.cert", - "puppet://$server/files/webserver/sites/$name.cert", - "puppet://$server/webserver/sites/$name.cert" + "puppet://$server/modules/files/webserver/sites/$name.cert", + "puppet://$server/modules/webserver/sites/$name.cert" ], owner => "root", group => "root", @@ -556,8 +556,8 @@ class webserver { file { "/etc/pki/tls/private/$name.key": source => [ "puppet://$server/private/$environment/webserver/sites/$name.key", - "puppet://$server/files/webserver/sites/$name.key", - "puppet://$server/webserver/sites/$name.key" + "puppet://$server/modules/files/webserver/sites/$name.key", + "puppet://$server/modules/webserver/sites/$name.key" ], owner => "root", group => "apache", @@ -569,8 +569,8 @@ class webserver { file { "/etc/pki/tls/certs/$name.ca.cert": source => [ "puppet://$server/private/$environment/webserver/sites/$name.ca.cert", - "puppet://$server/files/webserver/sites/$name.ca.cert", - "puppet://$server/webserver/sites/$name.ca.cert" + "puppet://$server/modules/files/webserver/sites/$name.ca.cert", + "puppet://$server/modules/webserver/sites/$name.ca.cert" ], owner => "root", group => "root", @@ -636,9 +636,9 @@ class webserver { source => [ "puppet://$server/private/$environment/webserver/webalizer/$name.conf.$hostname", "puppet://$server/private/$environment/webserver/webalizer/$name.conf", - "puppet://$server/files/webserver/webalizer/$name.conf.$hostname", - "puppet://$server/files/webserver/webalizer/$name.conf", - "puppet://$server/webserver/webalizer/webalizer.conf" + "puppet://$server/modules/files/webserver/webalizer/$name.conf.$hostname", + "puppet://$server/modules/files/webserver/webalizer/$name.conf", + "puppet://$server/modules/webserver/webalizer/webalizer.conf" ] } @@ -677,11 +677,11 @@ class webserver { "puppet://$server/private/$environment/webserver/configs.d/$name", "puppet://$server/private/$environment/webserver/conf.d/$name.$hostname", "puppet://$server/private/$environment/webserver/conf.d/$name", - "puppet://$server/files/webserver/configs.d/$name.$hostname", - "puppet://$server/files/webserver/configs.d/$name", - "puppet://$server/files/webserver/conf.d/$name.$hostname", - "puppet://$server/files/webserver/conf.d/$name", - "puppet://$server/webserver/configs.d/$name" + "puppet://$server/modules/files/webserver/configs.d/$name.$hostname", + "puppet://$server/modules/files/webserver/configs.d/$name", + "puppet://$server/modules/files/webserver/conf.d/$name.$hostname", + "puppet://$server/modules/files/webserver/conf.d/$name", + "puppet://$server/modules/webserver/configs.d/$name" ], require => File["/etc/httpd/configs.d/"], notify => Service["httpd"] @@ -699,11 +699,11 @@ class webserver { "puppet://$server/private/$environment/webserver/includes.d/$name", "puppet://$server/private/$environment/webserver/conf.d/$name.$hostname", "puppet://$server/private/$environment/webserver/conf.d/$name", - "puppet://$server/files/webserver/includes.d/$name.$hostname", - "puppet://$server/files/webserver/includes.d/$name", - "puppet://$server/files/webserver/conf.d/$name.$hostname", - "puppet://$server/files/webserver/conf.d/$name", - "puppet://$server/webserver/includes.d/$name" + "puppet://$server/modules/files/webserver/includes.d/$name.$hostname", + "puppet://$server/modules/files/webserver/includes.d/$name", + "puppet://$server/modules/files/webserver/conf.d/$name.$hostname", + "puppet://$server/modules/files/webserver/conf.d/$name", + "puppet://$server/modules/webserver/includes.d/$name" ], require => File["/etc/httpd/includes.d/"], notify => Service["httpd"] @@ -728,10 +728,10 @@ class webserver { source => [ "puppet://$server/private/$environment/webserver/modules/$name.$hostname", "puppet://$server/private/$environment/webserver/modules/$name", - "puppet://$server/files/webserver/modules/$name.$hostname", - "puppet://$server/files/webserver/modules/$name", - "puppet://$server/webserver/modules/$name.$hostname", - "puppet://$server/webserver/modules/$name" + "puppet://$server/modules/files/webserver/modules/$name.$hostname", + "puppet://$server/modules/files/webserver/modules/$name", + "puppet://$server/modules/webserver/modules/$name.$hostname", + "puppet://$server/modules/webserver/modules/$name" ], notify => Service["httpd"] } From shartsuiker at puppetmanaged.org Wed Aug 25 03:42:14 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:42:14 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250142.o7P1gEil023914@master.puppetmanaged.org> manifests/init.pp | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) New commits: commit 1901eb6571958e76db671a5986e568ad8515c8a0 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:42:14 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index 327dad5..a8dd538 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -12,8 +12,8 @@ class iptables { mode => 770, source => [ "puppet://$server/private/$environment/iptables/iptables-functions", - "puppet://$server/files/iptables/iptables-functions", - "puppet://$server/iptables/iptables-functions" + "puppet://$server/modules/files/iptables/iptables-functions", + "puppet://$server/modules/iptables/iptables-functions" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -26,10 +26,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/iptables.$hostname", "puppet://$server/private/$environment/iptables/iptables", - "puppet://$server/files/iptables/iptables.$hostname", - "puppet://$server/files/iptables/iptables", - "puppet://$server/iptables/iptables.$hostname", - "puppet://$server/iptables/iptables" + "puppet://$server/modules/files/iptables/iptables.$hostname", + "puppet://$server/modules/files/iptables/iptables", + "puppet://$server/modules/iptables/iptables.$hostname", + "puppet://$server/modules/iptables/iptables" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -42,10 +42,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/$hostname/ipt_chains_filter", "puppet://$server/private/$environment/iptables/ipt_chains_filter", - "puppet://$server/files/iptables/ipt_chains_filter.$hostname", - "puppet://$server/files/iptables/ipt_chains_filter", - "puppet://$server/iptables/ipt_chains_filter.$hostname", - "puppet://$server/iptables/ipt_chains_filter" + "puppet://$server/modules/files/iptables/ipt_chains_filter.$hostname", + "puppet://$server/modules/files/iptables/ipt_chains_filter", + "puppet://$server/modules/iptables/ipt_chains_filter.$hostname", + "puppet://$server/modules/iptables/ipt_chains_filter" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -58,10 +58,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/ipt_chains_nat.$hostname", "puppet://$server/private/$environment/iptables/ipt_chains_nat", - "puppet://$server/files/iptables/ipt_chains_nat.$hostname", - "puppet://$server/files/iptables/ipt_chains_nat", - "puppet://$server/iptables/ipt_chains_nat.$hostname", - "puppet://$server/iptables/ipt_chains_nat" + "puppet://$server/modules/files/iptables/ipt_chains_nat.$hostname", + "puppet://$server/modules/files/iptables/ipt_chains_nat", + "puppet://$server/modules/iptables/ipt_chains_nat.$hostname", + "puppet://$server/modules/iptables/ipt_chains_nat" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -74,10 +74,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/ipt_trusted_ifs.$hostname", "puppet://$server/private/$environment/iptables/ipt_trusted_ifs", - "puppet://$server/files/iptables/ipt_trusted_ifs.$hostname", - "puppet://$server/files/iptables/ipt_trusted_ifs", - "puppet://$server/iptables/ipt_trusted_ifs.$hostname", - "puppet://$server/iptables/ipt_trusted_ifs" + "puppet://$server/modules/files/iptables/ipt_trusted_ifs.$hostname", + "puppet://$server/modules/files/iptables/ipt_trusted_ifs", + "puppet://$server/modules/iptables/ipt_trusted_ifs.$hostname", + "puppet://$server/modules/iptables/ipt_trusted_ifs" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -90,10 +90,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/ipt_rules.$hostname", "puppet://$server/private/$environment/iptables/ipt_rules", - "puppet://$server/files/iptables/ipt_rules.$hostname", - "puppet://$server/files/iptables/ipt_rules", - "puppet://$server/iptables/ipt_rules.$hostname", - "puppet://$server/iptables/ipt_rules" + "puppet://$server/modules/files/iptables/ipt_rules.$hostname", + "puppet://$server/modules/files/iptables/ipt_rules", + "puppet://$server/modules/iptables/ipt_rules.$hostname", + "puppet://$server/modules/iptables/ipt_rules" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -106,10 +106,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/ipt_whitelist.$hostname", "puppet://$server/private/$environment/iptables/ipt_whitelist", - "puppet://$server/files/iptables/ipt_whitelist.$hostname", - "puppet://$server/files/iptables/ipt_whitelist", - "puppet://$server/iptables/ipt_whitelist.$hostname", - "puppet://$server/iptables/ipt_whitelist" + "puppet://$server/modules/files/iptables/ipt_whitelist.$hostname", + "puppet://$server/modules/files/iptables/ipt_whitelist", + "puppet://$server/modules/iptables/ipt_whitelist.$hostname", + "puppet://$server/modules/iptables/ipt_whitelist" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -122,10 +122,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/ipt_blacklist.$hostname", "puppet://$server/private/$environment/iptables/ipt_blacklist", - "puppet://$server/files/iptables/ipt_blacklist.$hostname", - "puppet://$server/files/iptables/ipt_blacklist", - "puppet://$server/iptables/ipt_blacklist.$hostname", - "puppet://$server/iptables/ipt_blacklist" + "puppet://$server/modules/files/iptables/ipt_blacklist.$hostname", + "puppet://$server/modules/files/iptables/ipt_blacklist", + "puppet://$server/modules/iptables/ipt_blacklist.$hostname", + "puppet://$server/modules/iptables/ipt_blacklist" ], require => File["/etc/iptables"], notify => Service["iptables"] @@ -138,10 +138,10 @@ class iptables { source => [ "puppet://$server/private/$environment/iptables/iptables-config.$hostname", "puppet://$server/private/$environment/iptables/iptables-config", - "puppet://$server/files/iptables/iptables-config.$hostname", - "puppet://$server/files/iptables/iptables-config", - "puppet://$server/iptables/iptables-config.$hostname", - "puppet://$server/iptables/iptables-config" + "puppet://$server/modules/files/iptables/iptables-config.$hostname", + "puppet://$server/modules/files/iptables/iptables-config", + "puppet://$server/modules/iptables/iptables-config.$hostname", + "puppet://$server/modules/iptables/iptables-config" ], notify => Service["iptables"] } @@ -154,4 +154,4 @@ class iptables { status => "/etc/init.d/iptables status", require => File["/etc/sysconfig/iptables-config"] } -} \ No newline at end of file +} From shartsuiker at puppetmanaged.org Wed Aug 25 03:43:50 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:43:50 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250143.o7P1hoMm023970@master.puppetmanaged.org> manifests/init.pp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) New commits: commit 13a57f79a49c6eda0b92dfec3a9e6f8977bd3aab Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:43:50 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index d8dd90e..98aacd4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -9,9 +9,9 @@ class munin { source => [ "puppet://$server/private/$environment/munin/munin.conf.$hostname", "puppet://$server/private/$environment/munin/munin.conf", - "puppet://$server/files/munin/munin.conf.$hostname", - "puppet://$server/files/munin/munin.conf", - "puppet://$server/munin/munin.conf" + "puppet://$server/modules/files/munin/munin.conf.$hostname", + "puppet://$server/modules/files/munin/munin.conf", + "puppet://$server/modules/munin/munin.conf" ], require => Package["munin"] } @@ -33,9 +33,9 @@ class munin { source => [ "puppet://$server/private/$environment/munin/munin-node.conf.$hostname", "puppet://$server/private/$environment/munin/munin-node.conf", - "puppet://$server/files/munin/munin-node.conf.$hostname", - "puppet://$server/files/munin/munin-node.conf", - "puppet://$server/munin/munin-node.conf" + "puppet://$server/modules/files/munin/munin-node.conf.$hostname", + "puppet://$server/modules/files/munin/munin-node.conf", + "puppet://$server/modules/munin/munin-node.conf" ], require => Package["munin-node"], notify => Service["munin-node"] @@ -44,8 +44,8 @@ class munin { file { "/etc/munin/plugins/": source => [ "puppet://$server/private/$environment/munin/plugins/", - "puppet://$server/files/munin/plugins/", - "puppet://$server/munin/plugins/" + "puppet://$server/modules/files/munin/plugins/", + "puppet://$server/modules/munin/plugins/" ], require => Package["munin-node"], notify => Service["munin-node"] @@ -79,10 +79,10 @@ class munin { conf => [ "puppet://$server/private/$environment/munin/plugin-conf.d/mysql.$hostname", "puppet://$server/private/$environment/munin/plugin-conf.d/mysql", - "puppet://$server/files/munin/plugin-conf.d/mysql.$hostname", - "puppet://$server/files/munin/plugin-conf.d/mysql", - "puppet://$server/munin/plugin-conf.d/mysql.$hostname", - "puppet://$server/munin/plugin-conf.d/mysql" + "puppet://$server/modules/files/munin/plugin-conf.d/mysql.$hostname", + "puppet://$server/modules/files/munin/plugin-conf.d/mysql", + "puppet://$server/modules/munin/plugin-conf.d/mysql.$hostname", + "puppet://$server/modules/munin/plugin-conf.d/mysql" ], source => true, conf_name => "mysql", @@ -99,10 +99,10 @@ class munin { conf => [ "puppet://$server/private/$environment/munin/plugin-conf.d/mysql.$hostname", "puppet://$server/private/$environment/munin/plugin-conf.d/mysql", - "puppet://$server/files/munin/plugin-conf.d/mysql.$hostname", - "puppet://$server/files/munin/plugin-conf.d/mysql", - "puppet://$server/munin/plugin-conf.d/mysql.$hostname", - "puppet://$server/munin/plugin-conf.d/mysql" + "puppet://$server/modules/files/munin/plugin-conf.d/mysql.$hostname", + "puppet://$server/modules/files/munin/plugin-conf.d/mysql", + "puppet://$server/modules/munin/plugin-conf.d/mysql.$hostname", + "puppet://$server/modules/munin/plugin-conf.d/mysql" ], conf_name => "mysql", require => Package["munin-node"] @@ -155,8 +155,8 @@ class munin { source => $source ? { true => [ "puppet://$server/private/$environment/munin/plugins/$plugin_name", - "puppet://$server/files/munin/plugins/$plugin_name", - "puppet://$server/munin/plugins/$plugin_name" + "puppet://$server/modules/files/munin/plugins/$plugin_name", + "puppet://$server/modules/munin/plugins/$plugin_name" ], default => $source }, @@ -177,8 +177,8 @@ class munin { source => $source ? { true => [ "puppet://$server/private/$environment/munin/plugins/$name", - "puppet://$server/files/munin/plugins/$name", - "puppet://$server/munin/plugins/$name" + "puppet://$server/modules/files/munin/plugins/$name", + "puppet://$server/modules/munin/plugins/$name" ], default => $source }, From shartsuiker at puppetmanaged.org Wed Aug 25 03:44:43 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:44:43 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250144.o7P1ihrx024026@master.puppetmanaged.org> manifests/init.pp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit e40f3d414f3ea93c2dee48e6d8ee3cdf23f12cd8 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:44:42 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index 54575ae..8337b0b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -33,17 +33,17 @@ class ssh { "puppet://$server/private/$environment/ssh/$os/sshd_config", "puppet://$server/private/$environment/ssh/sshd_config.$hostname", "puppet://$server/private/$environment/ssh/sshd_config", - "puppet://$server/files/ssh/$os/$osver/sshd_config.$hostname", - "puppet://$server/files/ssh/$os/$osver/sshd_config", - "puppet://$server/files/ssh/$os/sshd_config.$hostname", - "puppet://$server/files/ssh/$os/sshd_config", - "puppet://$server/files/ssh/sshd_config.$hostname", - "puppet://$server/files/ssh/sshd_config", - "puppet://$server/ssh/$os/$osver/sshd_config.$hostname", - "puppet://$server/ssh/$os/$osver/sshd_config", - "puppet://$server/ssh/$os/sshd_config.$hostname", - "puppet://$server/ssh/$os/sshd_config", - "puppet://$server/ssh/sshd_config" + "puppet://$server/modules/files/ssh/$os/$osver/sshd_config.$hostname", + "puppet://$server/modules/files/ssh/$os/$osver/sshd_config", + "puppet://$server/modules/files/ssh/$os/sshd_config.$hostname", + "puppet://$server/modules/files/ssh/$os/sshd_config", + "puppet://$server/modules/files/ssh/sshd_config.$hostname", + "puppet://$server/modules/files/ssh/sshd_config", + "puppet://$server/modules/ssh/$os/$osver/sshd_config.$hostname", + "puppet://$server/modules/ssh/$os/$osver/sshd_config", + "puppet://$server/modules/ssh/$os/sshd_config.$hostname", + "puppet://$server/modules/ssh/$os/sshd_config", + "puppet://$server/modules/ssh/sshd_config" ], notify => Service["sshd"], require => Package["openssh-server"] @@ -56,8 +56,8 @@ class ssh { replace => true, source => [ "puppet://$server/private/$environment/ssh/denyhosts.conf", - "puppet://$server/files/ssh/denyhosts.conf", - "puppet://$server/ssh/denyhosts.conf" + "puppet://$server/modules/files/ssh/denyhosts.conf", + "puppet://$server/modules/ssh/denyhosts.conf" ] } From shartsuiker at puppetmanaged.org Wed Aug 25 03:46:24 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:46:24 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250146.o7P1kOVc024664@master.puppetmanaged.org> manifests/init.pp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 37c9351bb5dd1e21dfefc6b0b3501b704053fc90 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:46:23 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index 9ca6c38..1096ed8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -40,8 +40,8 @@ class puppet { mode => 750, source => [ "puppet://$server/private/$environment/puppet/run_puppet", - "puppet://$server/files/puppet/run_puppet", - "puppet://$server/puppet/run_puppet" + "puppet://$server/modules/files/puppet/run_puppet", + "puppet://$server/modules/puppet/run_puppet" ] } @@ -250,8 +250,8 @@ class puppet { mode => 644, source => [ "puppet://$server/private/$environment/puppet/fileserver.conf", - "puppet://$server/files/puppet/fileserver.conf", - "puppet://$server/puppet/fileserver.conf" + "puppet://$server/modules/files/puppet/fileserver.conf", + "puppet://$server/modules/puppet/fileserver.conf" ], notify => Service["puppetmaster"], require => File["/var/lib/puppet/private"] @@ -264,10 +264,10 @@ class puppet { source => [ "puppet://$server/private/$environment/puppet/tagmail.conf.$hostname", "puppet://$server/private/$environment/puppet/tagmail.conf", - "puppet://$server/files/puppet/tagmail.conf.$hostname", - "puppet://$server/files/puppet/tagmail.conf", - "puppet://$server/puppet/tagmail.conf.$hostname", - "puppet://$server/puppet/tagmail.conf" + "puppet://$server/modules/files/puppet/tagmail.conf.$hostname", + "puppet://$server/modules/files/puppet/tagmail.conf", + "puppet://$server/modules/puppet/tagmail.conf.$hostname", + "puppet://$server/modules/puppet/tagmail.conf" ], notify => Service["puppetmaster"] } @@ -279,10 +279,10 @@ class puppet { source => [ "puppet://$server/private/$environment/puppet/puppetmaster.sysconfig.$hostname", "puppet://$server/private/$environment/puppet/puppetmaster.sysconfig", - "puppet://$server/files/puppet/puppetmaster.sysconfig.$hostname", - "puppet://$server/files/puppet/puppetmaster.sysconfig", - "puppet://$server/puppet/puppetmaster.sysconfig.$hostname", - "puppet://$server/puppet/puppetmaster.sysconfig" + "puppet://$server/modules/files/puppet/puppetmaster.sysconfig.$hostname", + "puppet://$server/modules/files/puppet/puppetmaster.sysconfig", + "puppet://$server/modules/puppet/puppetmaster.sysconfig.$hostname", + "puppet://$server/modules/puppet/puppetmaster.sysconfig" ], notify => Service["puppetmaster"] } From shartsuiker at puppetmanaged.org Wed Aug 25 03:48:14 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:48:14 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250148.o7P1mEgb024720@master.puppetmanaged.org> manifests/init.pp | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) New commits: commit b9e0d32cb4fe2cca5910810a745984511948ec4d Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:48:13 2010 +0200 Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. <= Or so it says anyway diff --git a/manifests/init.pp b/manifests/init.pp index bfa1e3b..7ad6bb2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -59,9 +59,9 @@ class yum { source => [ "puppet://$server/private/$environment/yum/yum.conf.$hostname", "puppet://$server/private/$environment/yum/yum.conf", - "puppet://$server/files/yum/yum.conf.$hostname", - "puppet://$server/files/yum/yum.conf", - "puppet://$server/yum/yum.conf" + "puppet://$server/modules/files/yum/yum.conf.$hostname", + "puppet://$server/modules/files/yum/yum.conf", + "puppet://$server/modules/yum/yum.conf" ], require => File["/etc/yum/"] } @@ -479,9 +479,9 @@ class yum { source => [ "puppet://$server/private/$environment/yum/yum-updatesd.conf.$hostname", "puppet://$server/private/$environment/yum/yum-updatesd.conf", - "puppet://$server/files/yum/yum-updatesd.conf.$hostname", - "puppet://$server/files/yum/yum-updatesd.conf", - "puppet://$server/yum/yum-updatesd.conf" + "puppet://$server/modules/files/yum/yum-updatesd.conf.$hostname", + "puppet://$server/modules/files/yum/yum-updatesd.conf", + "puppet://$server/modules/yum/yum-updatesd.conf" ], require => Package["yum-updatesd"], notify => Service["yum-updatesd"] @@ -619,19 +619,19 @@ class yum { "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo", "puppet://$server/private/$environment/yum/$os/$osmajorver/repos/$name.repo", "puppet://$server/private/$environment/yum/repos/$os/$name.repo", - "puppet://$server/files/yum/$os/$osver/repos/$name.repo", - "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo", - "puppet://$server/yum/$os/$osver/repos/$name.repo", - "puppet://$server/yum/$os/$osmajorver/repos/$name.repo" + "puppet://$server/modules/files/yum/$os/$osver/repos/$name.repo", + "puppet://$server/modules/files/yum/$os/$osmajorver/repos/$name.repo", + "puppet://$server/modules/yum/$os/$osver/repos/$name.repo", + "puppet://$server/modules/yum/$os/$osmajorver/repos/$name.repo" ], default => [ "puppet://$server/private/$environment/yum/$os/$osver/repos/$name.repo.disabled", "puppet://$server/private/$environment/yum/$os/$osmajorver/repos/$name.repo.disabled", "puppet://$server/private/$environment/yum/repos/$os/$name.repo.disabled", - "puppet://$server/files/yum/$os/$osver/repos/$name.repo.disabled", - "puppet://$server/files/yum/$os/$osmajorver/repos/$name.repo.disabled", - "puppet://$server/yum/$os/$osver/repos/$name.repo.disabled", - "puppet://$server/yum/$os/$osmajorver/repos/$name.repo.disabled" + "puppet://$server/modules/files/yum/$os/$osver/repos/$name.repo.disabled", + "puppet://$server/modules/files/yum/$os/$osmajorver/repos/$name.repo.disabled", + "puppet://$server/modules/yum/$os/$osver/repos/$name.repo.disabled", + "puppet://$server/modules/yum/$os/$osmajorver/repos/$name.repo.disabled" ] }, require => Package["redhat-lsb"] @@ -656,10 +656,10 @@ class yum { "puppet://$server/private/$environment/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/private/$environment/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", "puppet://$server/private/$environment/yum/gpgkeys/$os/RPM-GPG-KEY-$name", - "puppet://$server/files/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", - "puppet://$server/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name" + "puppet://$server/modules/files/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", + "puppet://$server/modules/files/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name", + "puppet://$server/modules/yum/$os/$osver/gpgkeys/RPM-GPG-KEY-$name", + "puppet://$server/modules/yum/$os/$osmajorver/gpgkeys/RPM-GPG-KEY-$name" ] } } @@ -678,10 +678,10 @@ class yum { "puppet://$server/private/$environment/yum/$os/$osver/gpgkeys/$gpgkey", "puppet://$server/private/$environment/yum/$os/$osmajorver/gpgkeys/$gpgkey", "puppet://$server/private/$environment/yum/gpgkeys/$os/$gpgkey", - "puppet://$server/files/yum/$os/$osver/gpgkeys/$gpgkey", - "puppet://$server/files/yum/$os/$osmajorver/gpgkeys/$gpgkey", - "puppet://$server/yum/$os/$osver/gpgkeys/$gpgkey", - "puppet://$server/yum/$os/$osmajorver/gpgkeys/$gpgkey" + "puppet://$server/modules/files/yum/$os/$osver/gpgkeys/$gpgkey", + "puppet://$server/modules/files/yum/$os/$osmajorver/gpgkeys/$gpgkey", + "puppet://$server/modules/yum/$os/$osver/gpgkeys/$gpgkey", + "puppet://$server/modules/yum/$os/$osmajorver/gpgkeys/$gpgkey" ] } } @@ -704,13 +704,13 @@ class yum { source => $confname ? { false => [ "puppet://$server/private/$environment/yum/plugins/$name.conf", - "puppet://$server/files/yum/plugins/$name.conf", - "puppet://$server/yum/plugins/$name.conf" + "puppet://$server/modules/files/yum/plugins/$name.conf", + "puppet://$server/modules/yum/plugins/$name.conf" ], default => [ "puppet://$server/private/$environment/yum/plugins/$confname.conf", - "puppet://$server/files/yum/plugins/$confname.conf", - "puppet://$server/yum/plugins/$confname.conf" + "puppet://$server/modules/files/yum/plugins/$confname.conf", + "puppet://$server/modules/yum/plugins/$confname.conf" ] } } @@ -733,8 +733,8 @@ class yum { file { "/etc/yum/pluginconf.d/versionlock.list": source => [ "puppet://$server/private/$environment/yum/plugins/versionlock.list", - "puppet://$server/files/yum/plugins/versionlock.list", - "puppet://$server/yum/plugins/versionlock.list" + "puppet://$server/modules/files/yum/plugins/versionlock.list", + "puppet://$server/modules/yum/plugins/versionlock.list" ] } } From shartsuiker at puppetmanaged.org Wed Aug 25 03:55:29 2010 From: shartsuiker at puppetmanaged.org (Stefan Hartsuiker) Date: Wed, 25 Aug 2010 03:55:29 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201008250155.o7P1tTf3008709@master.puppetmanaged.org> manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7dd89ced2eeea4e5388167b99b4aac8ebf53c608 Author: Stefan Alexander Hartsuiker Date: Wed Aug 25 03:55:26 2010 +0200 puppet fileserver mount private can not contain $domain in a source definition as it is already mapped by the fileserver diff --git a/manifests/init.pp b/manifests/init.pp index 1096ed8..d9942ea 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -206,7 +206,7 @@ class puppet { group => "root", mode => 644, source => [ - "puppet://$server/private/$domain/$name/puppet/site.pp", + "puppet://$server/private/$name/puppet/site.pp", "puppet://$server/modules/$name/puppet/files/site.pp" ], require => File["/var/lib/puppet/manifests/$name/"], @@ -217,7 +217,7 @@ class puppet { owner => "root", group => "root", source => [ - "puppet://$server/private/$domain/$name/puppet/manifests/" + "puppet://$server/private/$name/puppet/manifests/" ], recurse => true, purge => true