From jmeeuwen at puppetmanaged.org Sat May 1 13:54:06 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 1 May 2010 13:54:06 +0200 Subject: [Commits] Branch 'development' - munin/munin.conf Message-ID: <201005011154.o41Bs69u024665@master.puppetmanaged.org> munin/munin.conf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit 8e4c5156212ff22213a6a223ad652057fef9adda Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 1 13:52:06 2010 +0200 Add ghandalf and laurel, remove tom diff --git a/munin/munin.conf b/munin/munin.conf index 89265a6..2fd5143 100644 --- a/munin/munin.conf +++ b/munin/munin.conf @@ -43,11 +43,15 @@ tmpldir /etc/munin/templates address elwood.kanarip.com use_node_name yes -[pinky.kanarip.com] - address pinky.kanarip.com +[ghandalf.kanarip.com] + address ghandalf.kanarip.com + use_node_name yes + +[laurel.kanarip.com] + address laurel.kanarip.com use_node_name yes -[tom.kanarip.com] - address tom.kanarip.com +[pinky.kanarip.com] + address pinky.kanarip.com use_node_name yes From jmeeuwen at puppetmanaged.org Sat May 1 14:09:46 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 1 May 2010 14:09:46 +0200 Subject: [Commits] Branch 'development' - iptables/ipt_rules.ghandalf Message-ID: <201005011209.o41C9khS009715@master.puppetmanaged.org> iptables/ipt_rules.ghandalf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 9341e9e082f7975fcd43211dc596946aaa6fa885 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 1 14:07:45 2010 +0200 Allow munin from donnie diff --git a/iptables/ipt_rules.ghandalf b/iptables/ipt_rules.ghandalf index 1f7c8ec..1c0cbe3 100644 --- a/iptables/ipt_rules.ghandalf +++ b/iptables/ipt_rules.ghandalf @@ -10,4 +10,6 @@ for service in ssh; do eval allow_$service done -allow_standard_protocol "8080" "tcp" \ No newline at end of file +allow_munin "10.10.10.53" + +allow_standard_protocol "8080" "tcp" From jmeeuwen at puppetmanaged.org Thu May 6 00:12:02 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 6 May 2010 00:12:02 +0200 Subject: [Commits] Branch 'development' - programs/bin Message-ID: <201005052212.o45MC2pv003766@master.puppetmanaged.org> programs/bin/ergo-release-git-to-prod | 1 + programs/bin/ergo-release-git-to-test | 1 + 2 files changed, 2 insertions(+) New commits: commit 825c2dea65caed56a07a21c40d82445155b91db5 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 6 00:09:55 2010 +0200 Update scripts to leave private_conf.php intact diff --git a/programs/bin/ergo-release-git-to-prod b/programs/bin/ergo-release-git-to-prod index 6e58f2e..20f7bd0 100755 --- a/programs/bin/ergo-release-git-to-prod +++ b/programs/bin/ergo-release-git-to-prod @@ -14,6 +14,7 @@ rsync -rltOHvz \ --exclude="webalizer.*" \ --exclude="usage/" \ --exclude="db_url.php" \ + --exclude="private_conf.php" \ --exclude="*/sites/*/files/" \ --exclude=".git*" \ $GITTMPDIR/web.git/ergo-project.org/www/ $WWW diff --git a/programs/bin/ergo-release-git-to-test b/programs/bin/ergo-release-git-to-test index c36bfb5..bfee685 100755 --- a/programs/bin/ergo-release-git-to-test +++ b/programs/bin/ergo-release-git-to-test @@ -15,6 +15,7 @@ rsync -rltOHvz \ --exclude="webalizer.*" \ --exclude="usage/" \ --exclude="db_url.php" \ + --exclude="private_conf.php" \ --exclude="*/sites/*/files/" \ --exclude=".git*" \ $GITTMPDIR/web.git/ergo-project.org/www/ $WWWTEST From jmeeuwen at puppetmanaged.org Thu May 6 13:11:46 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 6 May 2010 13:11:46 +0200 Subject: [Commits] Branch 'development' - yum/RedHat Message-ID: <201005061111.o46BBktV014087@master.puppetmanaged.org> yum/RedHat/5/repos/custom-buildsys.repo | 18 ++++++++++++++++++ yum/RedHat/5/repos/custom-buildsys.repo.disabled | 18 ++++++++++++++++++ yum/RedHat/5/repos/feature-kolab.repo | 18 ++++++++++++++++++ yum/RedHat/5/repos/feature-kolab.repo.disabled | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+) New commits: commit f7d4545739cfab8be5f6a5df3764e44ad02b51fd Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 6 13:09:39 2010 +0200 Add custom-buildsys and feature-kolab repository configurations for el5 diff --git a/yum/RedHat/5/repos/custom-buildsys.repo b/yum/RedHat/5/repos/custom-buildsys.repo new file mode 100644 index 0000000..4abe1c4 --- /dev/null +++ b/yum/RedHat/5/repos/custom-buildsys.repo @@ -0,0 +1,18 @@ +[custom-buildsys] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/ +enabled=1 +gpgcheck=0 + +[custom-buildsys-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/yum/RedHat/5/repos/custom-buildsys.repo.disabled b/yum/RedHat/5/repos/custom-buildsys.repo.disabled new file mode 100644 index 0000000..e6040e3 --- /dev/null +++ b/yum/RedHat/5/repos/custom-buildsys.repo.disabled @@ -0,0 +1,18 @@ +[custom-buildsys] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/yum/RedHat/5/repos/feature-kolab.repo b/yum/RedHat/5/repos/feature-kolab.repo new file mode 100644 index 0000000..9c46f66 --- /dev/null +++ b/yum/RedHat/5/repos/feature-kolab.repo @@ -0,0 +1,18 @@ +[feature-kolab] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/yum/RedHat/5/repos/feature-kolab.repo.disabled b/yum/RedHat/5/repos/feature-kolab.repo.disabled new file mode 100644 index 0000000..eb3839c --- /dev/null +++ b/yum/RedHat/5/repos/feature-kolab.repo.disabled @@ -0,0 +1,18 @@ +[feature-kolab] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Thu May 6 13:16:35 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 6 May 2010 13:16:35 +0200 Subject: [Commits] Branch 'development' - puppet/manifests yum/CentOS Message-ID: <201005061116.o46BGZcQ021703@master.puppetmanaged.org> puppet/manifests/nodes/laurel.kanarip.com.pp | 3 ++- yum/CentOS/5 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 80eeaa8bd0dbb73da0af09cd3ec8c6638aecd378 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 6 13:14:15 2010 +0200 Update laurel's manifest to include feature-kolab repository Make sure the CentOS repositories are aligned with the RedHat el5 configs diff --git a/puppet/manifests/nodes/laurel.kanarip.com.pp b/puppet/manifests/nodes/laurel.kanarip.com.pp index ffb317c..5a9bbf5 100644 --- a/puppet/manifests/nodes/laurel.kanarip.com.pp +++ b/puppet/manifests/nodes/laurel.kanarip.com.pp @@ -26,7 +26,8 @@ node 'laurel.kanarip.com' { } yum::repository { [ - "custom-buildsys" + "custom-buildsys", + "feature-kolab" ]: enable => true } diff --git a/yum/CentOS/5 b/yum/CentOS/5 new file mode 120000 index 0000000..5343a65 --- /dev/null +++ b/yum/CentOS/5 @@ -0,0 +1 @@ +../RedHat/5 \ No newline at end of file From jmeeuwen at puppetmanaged.org Thu May 6 13:32:58 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 6 May 2010 13:32:58 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201005061132.o46BWwFO020213@master.puppetmanaged.org> files/mash/custom-el5-buildsys-updates-testing.mash | 1 + files/mash/custom-el5-buildsys-updates.mash | 1 + files/mash/custom-el5-buildsys.mash | 2 +- files/mash/custom-el5-ruby-updates-testing.mash | 1 + files/mash/custom-el5-ruby-updates.mash | 1 + files/mash/custom-el5-ruby.mash | 1 + files/mash/feature-el5-kolab.mash | 1 + files/mash/feature-el5-ruby-1.8.6-updates-testing.mash | 1 + files/mash/feature-el5-ruby-1.8.6-updates.mash | 1 + files/mash/feature-el5-ruby-1.8.6.mash | 1 + files/mash/feature-el5-ruby-1.8.7-updates-testing.mash | 1 + files/mash/feature-el5-ruby-1.8.7-updates.mash | 1 + files/mash/feature-el5-ruby-1.8.7.mash | 1 + files/mash/feature-el5-ruby-1.9.1-updates-testing.mash | 1 + files/mash/feature-el5-ruby-1.9.1-updates.mash | 1 + files/mash/feature-el5-ruby-1.9.1.mash | 1 + 16 files changed, 16 insertions(+), 1 deletion(-) New commits: commit 14cc00ad6ad0c37f3ed46a89118593ea2e3425db Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 6 13:30:49 2010 +0200 Set hashes for el5 repositories to md5 diff --git a/files/mash/custom-el5-buildsys-updates-testing.mash b/files/mash/custom-el5-buildsys-updates-testing.mash index d077468..edebc0a 100644 --- a/files/mash/custom-el5-buildsys-updates-testing.mash +++ b/files/mash/custom-el5-buildsys-updates-testing.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/custom-el5-buildsys-updates.mash b/files/mash/custom-el5-buildsys-updates.mash index 33c05a3..f44587c 100644 --- a/files/mash/custom-el5-buildsys-updates.mash +++ b/files/mash/custom-el5-buildsys-updates.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/custom-el5-buildsys.mash b/files/mash/custom-el5-buildsys.mash index f54e71e..1c68b28 100644 --- a/files/mash/custom-el5-buildsys.mash +++ b/files/mash/custom-el5-buildsys.mash @@ -13,4 +13,4 @@ use_repoview = True inherit = True latest = False arches = i386 x86_64 - +hash = md5 diff --git a/files/mash/custom-el5-ruby-updates-testing.mash b/files/mash/custom-el5-ruby-updates-testing.mash index 0c1676d..149a062 100644 --- a/files/mash/custom-el5-ruby-updates-testing.mash +++ b/files/mash/custom-el5-ruby-updates-testing.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/custom-el5-ruby-updates.mash b/files/mash/custom-el5-ruby-updates.mash index 607e6a8..d58c9bc 100644 --- a/files/mash/custom-el5-ruby-updates.mash +++ b/files/mash/custom-el5-ruby-updates.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/custom-el5-ruby.mash b/files/mash/custom-el5-ruby.mash index b07bea2..67b0a8d 100644 --- a/files/mash/custom-el5-ruby.mash +++ b/files/mash/custom-el5-ruby.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = True latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-kolab.mash b/files/mash/feature-el5-kolab.mash index 25ae175..a32d654 100644 --- a/files/mash/feature-el5-kolab.mash +++ b/files/mash/feature-el5-kolab.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = True latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.8.6-updates-testing.mash b/files/mash/feature-el5-ruby-1.8.6-updates-testing.mash index db76fca..abdeb17 100644 --- a/files/mash/feature-el5-ruby-1.8.6-updates-testing.mash +++ b/files/mash/feature-el5-ruby-1.8.6-updates-testing.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.8.6-updates.mash b/files/mash/feature-el5-ruby-1.8.6-updates.mash index 6b545e9..5fc395f 100644 --- a/files/mash/feature-el5-ruby-1.8.6-updates.mash +++ b/files/mash/feature-el5-ruby-1.8.6-updates.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.8.6.mash b/files/mash/feature-el5-ruby-1.8.6.mash index 8465187..ddc6cd6 100644 --- a/files/mash/feature-el5-ruby-1.8.6.mash +++ b/files/mash/feature-el5-ruby-1.8.6.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = True latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.8.7-updates-testing.mash b/files/mash/feature-el5-ruby-1.8.7-updates-testing.mash index a175f84..5b9dcf2 100644 --- a/files/mash/feature-el5-ruby-1.8.7-updates-testing.mash +++ b/files/mash/feature-el5-ruby-1.8.7-updates-testing.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.8.7-updates.mash b/files/mash/feature-el5-ruby-1.8.7-updates.mash index 4509faf..f1cc3a6 100644 --- a/files/mash/feature-el5-ruby-1.8.7-updates.mash +++ b/files/mash/feature-el5-ruby-1.8.7-updates.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.8.7.mash b/files/mash/feature-el5-ruby-1.8.7.mash index e8b338b..d46d1f2 100644 --- a/files/mash/feature-el5-ruby-1.8.7.mash +++ b/files/mash/feature-el5-ruby-1.8.7.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = True latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.9.1-updates-testing.mash b/files/mash/feature-el5-ruby-1.9.1-updates-testing.mash index 0d368ef..131d666 100644 --- a/files/mash/feature-el5-ruby-1.9.1-updates-testing.mash +++ b/files/mash/feature-el5-ruby-1.9.1-updates-testing.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.9.1-updates.mash b/files/mash/feature-el5-ruby-1.9.1-updates.mash index fa98004..e85a0f7 100644 --- a/files/mash/feature-el5-ruby-1.9.1-updates.mash +++ b/files/mash/feature-el5-ruby-1.9.1-updates.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = False latest = False arches = i386 x86_64 +hash = md5 diff --git a/files/mash/feature-el5-ruby-1.9.1.mash b/files/mash/feature-el5-ruby-1.9.1.mash index 59347e4..f3e4961 100644 --- a/files/mash/feature-el5-ruby-1.9.1.mash +++ b/files/mash/feature-el5-ruby-1.9.1.mash @@ -13,4 +13,5 @@ use_repoview = True inherit = True latest = False arches = i386 x86_64 +hash = md5 From jmeeuwen at puppetmanaged.org Fri May 7 00:25:14 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 7 May 2010 00:25:14 +0200 Subject: [Commits] Branch 'development' - programs/bin Message-ID: <201005062225.o46MPElZ019366@master.puppetmanaged.org> programs/bin/mirror-ergo-project | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 97012d37ec55abe6a1f5b541e7cb58d70ca4a692 Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 7 00:23:08 2010 +0200 Update mirror-ergo-project diff --git a/programs/bin/mirror-ergo-project b/programs/bin/mirror-ergo-project index 7040696..fc706c2 100755 --- a/programs/bin/mirror-ergo-project +++ b/programs/bin/mirror-ergo-project @@ -1,5 +1,6 @@ #!/bin/bash -rsync -rltHz --delete-after \ - rsync://elwood.kanarip.com/ergo-project/repositories/ \ - /var/www/ergo-project.org/mirror.nl/public_html/repositories/ +[ -z "`ps aux | grep [r]sync | grep [e]lwood`" ] && \ + rsync -rltHz --delete-after \ + rsync://elwood.kanarip.com/ergo-project/repositories/ \ + /var/www/ergo-project.org/mirror.nl/public_html/repositories/ From jmeeuwen at puppetmanaged.org Sat May 8 06:58:06 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 8 May 2010 06:58:06 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201005080458.o484w6il020297@master.puppetmanaged.org> files/mash/feature-el6-beta-kolab.mash | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) New commits: commit 45798b3c3a5e2677b28e3510aa601a1abaafbd3d Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 8 06:55:42 2010 +0200 Add mashing feature-el6-beta-kolab diff --git a/files/mash/feature-el6-beta-kolab.mash b/files/mash/feature-el6-beta-kolab.mash new file mode 100644 index 0000000..683ebce --- /dev/null +++ b/files/mash/feature-el6-beta-kolab.mash @@ -0,0 +1,17 @@ +# mash config file +[feature-el6-beta-kolab] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-kolab +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-kolab/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Kolab Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 +hash = md5 + From jmeeuwen at puppetmanaged.org Sat May 8 17:58:00 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 8 May 2010 17:58:00 +0200 Subject: [Commits] Branch 'development' - files/RedHat Message-ID: <201005081558.o48Fw0i0019493@master.puppetmanaged.org> files/RedHat/5/repos/custom-buildsys.repo | 18 ++++++++++++++++++ files/RedHat/5/repos/custom-buildsys.repo.disabled | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) New commits: commit 7afe0d6a6d621c9a4c3a45ef2355d88d543f1199 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 8 17:55:38 2010 +0200 Add repository configuration for Ergo Project's custom buildsystem packages, such as an updated RPM and YUM diff --git a/files/RedHat/5/repos/custom-buildsys.repo b/files/RedHat/5/repos/custom-buildsys.repo new file mode 100644 index 0000000..4abe1c4 --- /dev/null +++ b/files/RedHat/5/repos/custom-buildsys.repo @@ -0,0 +1,18 @@ +[custom-buildsys] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/ +enabled=1 +gpgcheck=0 + +[custom-buildsys-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/custom-buildsys.repo.disabled b/files/RedHat/5/repos/custom-buildsys.repo.disabled new file mode 100644 index 0000000..e6040e3 --- /dev/null +++ b/files/RedHat/5/repos/custom-buildsys.repo.disabled @@ -0,0 +1,18 @@ +[custom-buildsys] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Sat May 8 20:39:53 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 8 May 2010 20:39:53 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201005081839.o48IdrfN023563@master.puppetmanaged.org> files/mash/mash.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit deac2c9b5c7073ff94f0eb5e3e90395e3330904c Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 8 20:37:30 2010 +0200 Make sure the mash directory is on the same drive as the koji directories diff --git a/files/mash/mash.conf b/files/mash/mash.conf index 874b3b3..ca0a878 100644 --- a/files/mash/mash.conf +++ b/files/mash/mash.conf @@ -2,6 +2,6 @@ configdir = /etc/mash buildhost = http://koji.ergo-project.org/kojihub repodir = file:///data/koji -outputdir = /srv/ergo-project/mash +outputdir = /data/koji-mash use_sqlite = True use_repoview = True From jmeeuwen at puppetmanaged.org Sat May 8 20:41:21 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 8 May 2010 20:41:21 +0200 Subject: [Commits] Branch 'development' - files/mash puppet/manifests Message-ID: <201005081841.o48IfLOS030986@master.puppetmanaged.org> files/mash/mash.conf | 2 +- puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 988f0393a45123f04d2d96ae44b30c354acfd1a3 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 8 20:39:18 2010 +0200 Update koji and mashing locations diff --git a/files/mash/mash.conf b/files/mash/mash.conf index ca0a878..f23d681 100644 --- a/files/mash/mash.conf +++ b/files/mash/mash.conf @@ -2,6 +2,6 @@ configdir = /etc/mash buildhost = http://koji.ergo-project.org/kojihub repodir = file:///data/koji -outputdir = /data/koji-mash +outputdir = /data/koji/mash use_sqlite = True use_repoview = True diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 21de277..f87a599 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -35,7 +35,7 @@ node 'elwood.kanarip.com' { } cron { "mash_everything": - command => "for mashconfig in `find /etc/mash/ -type f -name '*.mash'`; do mash $(echo $(basename \$mashconfig) | sed -e 's/.mash//g'); done >/var/log/mash.log 2>&1; rsync -aHz --delete-after --link-dest /srv/ergo-project/mash/ /srv/ergo-project/mash/ /srv/ergo-project/repositories/", + command => "for mashconfig in `find /etc/mash/ -type f -name '*.mash'`; do mash $(echo $(basename \$mashconfig) | sed -e 's/.mash//g'); done >/var/log/mash.log 2>&1; rsync -aHz --delete --delete-after /data/koji/mash/ /srv/ergo-project/repositories/", hour => "*/2", minute => "15" } From jmeeuwen at puppetmanaged.org Sat May 8 22:12:51 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 8 May 2010 22:12:51 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005082012.o48KCpkY000875@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a8dabc08d5a87b9fe778136fd8375ee5d98dd79b Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 8 22:10:25 2010 +0200 Use -rlptHv instead of -aHz diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index f87a599..1863aa0 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -35,7 +35,7 @@ node 'elwood.kanarip.com' { } cron { "mash_everything": - command => "for mashconfig in `find /etc/mash/ -type f -name '*.mash'`; do mash $(echo $(basename \$mashconfig) | sed -e 's/.mash//g'); done >/var/log/mash.log 2>&1; rsync -aHz --delete --delete-after /data/koji/mash/ /srv/ergo-project/repositories/", + command => "for mashconfig in `find /etc/mash/ -type f -name '*.mash'`; do mash $(echo $(basename \$mashconfig) | sed -e 's/.mash//g'); done >/var/log/mash.log 2>&1; rsync -rlptHz --delete --delete-after /data/koji/mash/ /srv/ergo-project/repositories/", hour => "*/2", minute => "15" } From jmeeuwen at puppetmanaged.org Sun May 9 19:03:12 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sun, 9 May 2010 19:03:12 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005091703.o49H3C02022883@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c629ddcae4720c32ff48433936f07474791121b8 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sun May 9 19:00:54 2010 +0200 Sort the mashing so we know what we're looking at each time it runs diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 1863aa0..48250ec 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -35,7 +35,7 @@ node 'elwood.kanarip.com' { } cron { "mash_everything": - command => "for mashconfig in `find /etc/mash/ -type f -name '*.mash'`; do mash $(echo $(basename \$mashconfig) | sed -e 's/.mash//g'); done >/var/log/mash.log 2>&1; rsync -rlptHz --delete --delete-after /data/koji/mash/ /srv/ergo-project/repositories/", + command => "for mashconfig in `find /etc/mash/ -type f -name '*.mash' | sort`; do mash $(echo $(basename \$mashconfig) | sed -e 's/.mash//g'); done >/var/log/mash.log 2>&1; rsync -rlptHz --delete --delete-after /data/koji/mash/ /srv/ergo-project/repositories/", hour => "*/2", minute => "15" } From jmeeuwen at puppetmanaged.org Mon May 10 17:36:21 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 10 May 2010 17:36:21 +0200 Subject: [Commits] Branch 'development' - webserver/webalizer Message-ID: <201005101536.o4AFaLJr004080@master.puppetmanaged.org> webserver/webalizer/mirror.nl.ergo-project.org.conf | 9 +++++++++ 1 file changed, 9 insertions(+) New commits: commit aae325df28f8704b1d5b1aef444d4a429d79d21f Author: Jeroen van Meeuwen (Fedora Unity) Date: Mon May 10 17:34:08 2010 +0200 Update mirror webalizer diff --git a/webserver/webalizer/mirror.nl.ergo-project.org.conf b/webserver/webalizer/mirror.nl.ergo-project.org.conf index 9177040..e346c55 100644 --- a/webserver/webalizer/mirror.nl.ergo-project.org.conf +++ b/webserver/webalizer/mirror.nl.ergo-project.org.conf @@ -52,6 +52,15 @@ HideURL /repositories/custom-f13-ruby* HideURL /repositories/dist-el6-beta* +GroupURL /repositories/feature-el5-kolab* Enterprise Linux 5 Kolab packages +HideURL /repositories/feature-el5-kolab* +GroupURL /repositories/feature-el5-ruby-1.8.6* Enterprise Linux 5 Ruby 1.8.6 packages +HideURL /repositories/feature-el5-ruby-1.8.6* +GroupURL /repositories/feature-el5-ruby-1.8.7* Enterprise Linux 5 Ruby 1.8.7 packages +HideURL /repositories/feature-el5-ruby-1.8.7* +GroupURL /repositories/feature-el5-ruby-1.9.1* Enterprise Linux 5 Ruby 1.9.1 packages +HideURL /repositories/feature-el5-ruby-1.9.1* + HideAllSites yes GroupDomains 1 GroupShading yes From jmeeuwen at puppetmanaged.org Tue May 11 00:17:04 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 11 May 2010 00:17:04 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005102217.o4AMH4iY027011@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e273252701920e84d3dfc33affcd1742ddf7603 Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue May 11 00:14:50 2010 +0200 Make sure we regenerate only the necessary diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 48250ec..97402d8 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 build` ; do koji regen-repo --nowait \$tag ; 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 jmeeuwen at puppetmanaged.org Tue May 11 15:31:47 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 11 May 2010 15:31:47 +0200 Subject: [Commits] Branch 'development' - files/Fedora files/RedHat Message-ID: <201005111331.o4BDVlYe009522@master.puppetmanaged.org> files/Fedora/11/repos/feature-kolab.repo | 18 ++++++++++++++++++ files/Fedora/11/repos/feature-kolab.repo.disabled | 18 ++++++++++++++++++ files/Fedora/12/repos/feature-kolab.repo | 18 ++++++++++++++++++ files/Fedora/12/repos/feature-kolab.repo.disabled | 18 ++++++++++++++++++ files/RedHat/5/repos/feature-kolab.repo | 18 ++++++++++++++++++ files/RedHat/5/repos/feature-kolab.repo.disabled | 18 ++++++++++++++++++ 6 files changed, 108 insertions(+) New commits: commit ad78bfb21c287ef4d1092268880ad7b5dcf5442e Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue May 11 15:29:44 2010 +0200 Add featured kolab packages repositories diff --git a/files/Fedora/11/repos/feature-kolab.repo b/files/Fedora/11/repos/feature-kolab.repo new file mode 100644 index 0000000..354a290 --- /dev/null +++ b/files/Fedora/11/repos/feature-kolab.repo @@ -0,0 +1,18 @@ +[feature-kolab] +name=Featured Kolab Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Featured Kolab packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Featured Kolab Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/Fedora/11/repos/feature-kolab.repo.disabled b/files/Fedora/11/repos/feature-kolab.repo.disabled new file mode 100644 index 0000000..5d47834 --- /dev/null +++ b/files/Fedora/11/repos/feature-kolab.repo.disabled @@ -0,0 +1,18 @@ +[feature-kolab] +name=Featured Kolab Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Featured Kolab packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Featured Kolab Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/Fedora/12/repos/feature-kolab.repo b/files/Fedora/12/repos/feature-kolab.repo new file mode 100644 index 0000000..2881e75 --- /dev/null +++ b/files/Fedora/12/repos/feature-kolab.repo @@ -0,0 +1,18 @@ +[feature-kolab] +name=Featured Kolab Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Featured Kolab packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Featured Kolab Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/Fedora/12/repos/feature-kolab.repo.disabled b/files/Fedora/12/repos/feature-kolab.repo.disabled new file mode 100644 index 0000000..6eb41cf --- /dev/null +++ b/files/Fedora/12/repos/feature-kolab.repo.disabled @@ -0,0 +1,18 @@ +[feature-kolab] +name=Featured Kolab Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Featured Kolab packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Featured Kolab Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/feature-kolab.repo b/files/RedHat/5/repos/feature-kolab.repo new file mode 100644 index 0000000..195f727 --- /dev/null +++ b/files/RedHat/5/repos/feature-kolab.repo @@ -0,0 +1,18 @@ +[feature-kolab] +name=Featured Kolab Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Featured Kolab packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Featured Kolab Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/feature-kolab.repo.disabled b/files/RedHat/5/repos/feature-kolab.repo.disabled new file mode 100644 index 0000000..2b05263 --- /dev/null +++ b/files/RedHat/5/repos/feature-kolab.repo.disabled @@ -0,0 +1,18 @@ +[feature-kolab] +name=Featured Kolab Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-kolab-debuginfo] +name=Featured Kolab packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-kolab-source] +name=Featured Kolab Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Thu May 13 15:18:37 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 13 May 2010 15:18:37 +0200 Subject: [Commits] Branch 'development' - webserver/sites Message-ID: <201005131318.o4DDIbgT008956@master.puppetmanaged.org> webserver/sites/www-test.ergo-project.org.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e35620fe2fd7a10c1d986df85a00334296116ff0 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 13 15:16:21 2010 +0200 Include storm-test.ergo-project.org in www-test.ergo-project.org diff --git a/webserver/sites/www-test.ergo-project.org.conf b/webserver/sites/www-test.ergo-project.org.conf index 4878873..f4340a6 100644 --- a/webserver/sites/www-test.ergo-project.org.conf +++ b/webserver/sites/www-test.ergo-project.org.conf @@ -4,7 +4,7 @@ ServerAdmin webmaster at ergo-project.org DocumentRoot /var/www/ergo-project.org/www-test/public_html/ ServerName www-test.ergo-project.org - ServerAlias forums-test.ergo-project.org planet-test.ergo-project.org www-test.puppetmanaged.org + ServerAlias forums-test.ergo-project.org planet-test.ergo-project.org www-test.puppetmanaged.org storm-test.ergo-project.org ErrorLog logs/www-test.ergo-project.org-error_log CustomLog logs/www-test.ergo-project.org-access_log combined From jmeeuwen at puppetmanaged.org Thu May 13 16:10:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 13 May 2010 16:10:48 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005131410.o4DEAmxD009124@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) New commits: commit 95b4259602064dfc45d66b413056d49f6c986353 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 13 16:08:02 2010 +0200 Add ruby.git and kolab-debian.git diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 881972d..823eb2e 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -154,10 +154,22 @@ node 'master.puppetmanaged.org' { recipients => [ "jeroen.van.meeuwen at ergo-project.org" ] } + git::repository { [ + "ruby.git" + ]: + localtree => "/data/scm/git/git.ergo-project.org/", + shared => true, + public => true, + owner => "kanarip", + group => "git-ergo-project.org-ruby", + recipients => [ "jeroen.van.meeuwen at ergo-project.org" ] + } + # Git repositories for Kolab git::repository { [ - "kolab-server.git", - "kolab-fedora.git" + "kolab-debian.git", + "kolab-fedora.git", + "kolab-server.git" ]: localtree => "/data/scm/git/git.ergo-project.org/", shared => true, From jmeeuwen at puppetmanaged.org Thu May 13 22:36:38 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 13 May 2010 22:36:38 +0200 Subject: [Commits] Branch 'development' - webserver/webalizer Message-ID: <201005132036.o4DKacO9024589@master.puppetmanaged.org> webserver/webalizer/mirror.nl.ergo-project.org.conf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) New commits: commit 249974eb280fc4732cfed308425a8209e925f3ed Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu May 13 22:34:44 2010 +0200 Update groupurl/hideurl diff --git a/webserver/webalizer/mirror.nl.ergo-project.org.conf b/webserver/webalizer/mirror.nl.ergo-project.org.conf index e346c55..77f1bde 100644 --- a/webserver/webalizer/mirror.nl.ergo-project.org.conf +++ b/webserver/webalizer/mirror.nl.ergo-project.org.conf @@ -61,6 +61,23 @@ HideURL /repositories/feature-el5-ruby-1.8.7* GroupURL /repositories/feature-el5-ruby-1.9.1* Enterprise Linux 5 Ruby 1.9.1 packages HideURL /repositories/feature-el5-ruby-1.9.1* +GroupURL /repositories/feature-el6-beta-kolab* Enterprise Linux 6 Kolab packages +HideURL /repositories/feature-el6-beta-kolab* +GroupURL /repositories/feature-el6-beta-ruby-1.8.6* Enterprise Linux 6 Ruby 1.8.6 packages +HideURL /repositories/feature-el6-beta-ruby-1.8.6* +GroupURL /repositories/feature-el6-beta-ruby-1.8.7* Enterprise Linux 6 Ruby 1.8.7 packages +HideURL /repositories/feature-el6-beta-ruby-1.8.7* +GroupURL /repositories/feature-el6-beta-ruby-1.9.1* Enterprise Linux 6 Ruby 1.9.1 packages +HideURL /repositories/feature-el6-beta-ruby-1.9.1* +GroupURL /repositories/feature-el6-kolab* Enterprise Linux 6 Kolab packages +HideURL /repositories/feature-el6-kolab* +GroupURL /repositories/feature-el6-ruby-1.8.6* Enterprise Linux 6 Ruby 1.8.6 packages +HideURL /repositories/feature-el6-ruby-1.8.6* +GroupURL /repositories/feature-el6-ruby-1.8.7* Enterprise Linux 6 Ruby 1.8.7 packages +HideURL /repositories/feature-el6-ruby-1.8.7* +GroupURL /repositories/feature-el6-ruby-1.9.1* Enterprise Linux 6 Ruby 1.9.1 packages +HideURL /repositories/feature-el6-ruby-1.9.1* + HideAllSites yes GroupDomains 1 GroupShading yes From jmeeuwen at puppetmanaged.org Fri May 14 01:53:18 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 01:53:18 +0200 Subject: [Commits] Branch 'development' - files/Fedora Message-ID: <201005132353.o4DNrIah002550@master.puppetmanaged.org> files/Fedora/12/repos/feature-ruby-1.9.1.repo | 18 +++++++++++++++++ files/Fedora/12/repos/feature-ruby-1.9.1.repo.disabled | 18 +++++++++++++++++ 2 files changed, 36 insertions(+) New commits: commit a4071e0cf261d1020f2021c0ec9f8090fedfa8ce Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 01:49:15 2010 +0200 Add feature-ruby-1.9.1 repository configuration diff --git a/files/Fedora/12/repos/feature-ruby-1.9.1.repo b/files/Fedora/12/repos/feature-ruby-1.9.1.repo new file mode 100644 index 0000000..86d8f45 --- /dev/null +++ b/files/Fedora/12/repos/feature-ruby-1.9.1.repo @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-ruby-1.9.1-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/Fedora/12/repos/feature-ruby-1.9.1.repo.disabled b/files/Fedora/12/repos/feature-ruby-1.9.1.repo.disabled new file mode 100644 index 0000000..a537de9 --- /dev/null +++ b/files/Fedora/12/repos/feature-ruby-1.9.1.repo.disabled @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Fri May 14 05:16:14 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 05:16:14 +0200 Subject: [Commits] Branch 'development' - files/RedHat Message-ID: <201005140316.o4E3GEep017193@master.puppetmanaged.org> files/RedHat/5/repos/feature-ruby-1.9.1.repo | 18 ++++++++++++++++++ files/RedHat/5/repos/feature-ruby-1.9.1.repo.disabled | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) New commits: commit daa0a73e02edd71bbc2db5c9168583e35dd9c7c0 Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 05:14:21 2010 +0200 Add featured ruby 1.9.1 repository configuration for el5 diff --git a/files/RedHat/5/repos/feature-ruby-1.9.1.repo b/files/RedHat/5/repos/feature-ruby-1.9.1.repo new file mode 100644 index 0000000..1142832 --- /dev/null +++ b/files/RedHat/5/repos/feature-ruby-1.9.1.repo @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-ruby-1.9.1-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/feature-ruby-1.9.1.repo.disabled b/files/RedHat/5/repos/feature-ruby-1.9.1.repo.disabled new file mode 100644 index 0000000..2a61c10 --- /dev/null +++ b/files/RedHat/5/repos/feature-ruby-1.9.1.repo.disabled @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Fri May 14 05:17:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 05:17:48 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005140317.o4E3HmKr017360@master.puppetmanaged.org> puppet/manifests/nodes/ghandalf.kanarip.com.pp | 3 ++- puppet/manifests/nodes/laurel.kanarip.com.pp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 70b4ff524be6542ecdab17abc61b994be01f5478 Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 05:15:54 2010 +0200 Add ruby 1.9.1 feature repositories to ghandalf and laurel diff --git a/puppet/manifests/nodes/ghandalf.kanarip.com.pp b/puppet/manifests/nodes/ghandalf.kanarip.com.pp index e0b63dd..6be64ce 100644 --- a/puppet/manifests/nodes/ghandalf.kanarip.com.pp +++ b/puppet/manifests/nodes/ghandalf.kanarip.com.pp @@ -97,7 +97,8 @@ node 'ghandalf.kanarip.com' { } yum::repository { [ - "custom-buildsys" + "custom-buildsys", + "feature-ruby-1.9.1" ]: enable => true } diff --git a/puppet/manifests/nodes/laurel.kanarip.com.pp b/puppet/manifests/nodes/laurel.kanarip.com.pp index 5a9bbf5..d6964e1 100644 --- a/puppet/manifests/nodes/laurel.kanarip.com.pp +++ b/puppet/manifests/nodes/laurel.kanarip.com.pp @@ -27,7 +27,8 @@ node 'laurel.kanarip.com' { yum::repository { [ "custom-buildsys", - "feature-kolab" + "feature-kolab", + "feature-ruby-1.9.1" ]: enable => true } From jmeeuwen at puppetmanaged.org Fri May 14 05:28:34 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 05:28:34 +0200 Subject: [Commits] Branch 'development' - yum/Fedora yum/RedHat Message-ID: <201005140328.o4E3SY1O006554@master.puppetmanaged.org> yum/Fedora/12/repos/custom-buildsys.repo | 18 ------------------ yum/Fedora/12/repos/custom-buildsys.repo.disabled | 18 ------------------ yum/RedHat/5/repos/custom-buildsys.repo | 18 ------------------ yum/RedHat/5/repos/custom-buildsys.repo.disabled | 18 ------------------ 4 files changed, 72 deletions(-) New commits: commit a0c5a63de4bc6f656c762ec70979f32aa417b902 Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 05:26:24 2010 +0200 Remove custom-buildsys repositories from local domain name space config tree diff --git a/yum/Fedora/12/repos/custom-buildsys.repo b/yum/Fedora/12/repos/custom-buildsys.repo deleted file mode 100644 index 84acebe..0000000 --- a/yum/Fedora/12/repos/custom-buildsys.repo +++ /dev/null @@ -1,18 +0,0 @@ -[custom-buildsys] -name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/$basearch/ -enabled=1 -gpgcheck=0 - -[custom-buildsys-debuginfo] -name=Custom Packages for Build Systems - Debuginfo -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[custom-buildsys-source] -name=Custom Packages for Build Systems - Sources -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/SRPMS/ -enabled=0 -gpgcheck=0 - diff --git a/yum/Fedora/12/repos/custom-buildsys.repo.disabled b/yum/Fedora/12/repos/custom-buildsys.repo.disabled deleted file mode 100644 index aa694da..0000000 --- a/yum/Fedora/12/repos/custom-buildsys.repo.disabled +++ /dev/null @@ -1,18 +0,0 @@ -[custom-buildsys] -name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/$basearch/ -enabled=0 -gpgcheck=0 - -[custom-buildsys-debuginfo] -name=Custom Packages for Build Systems - Debuginfo -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[custom-buildsys-source] -name=Custom Packages for Build Systems - Sources -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/SRPMS/ -enabled=0 -gpgcheck=0 - diff --git a/yum/RedHat/5/repos/custom-buildsys.repo b/yum/RedHat/5/repos/custom-buildsys.repo deleted file mode 100644 index 4abe1c4..0000000 --- a/yum/RedHat/5/repos/custom-buildsys.repo +++ /dev/null @@ -1,18 +0,0 @@ -[custom-buildsys] -name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/ -enabled=1 -gpgcheck=0 - -[custom-buildsys-debuginfo] -name=Custom Packages for Build Systems - Debuginfo -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[custom-buildsys-source] -name=Custom Packages for Build Systems - Sources -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/SRPMS/ -enabled=0 -gpgcheck=0 - diff --git a/yum/RedHat/5/repos/custom-buildsys.repo.disabled b/yum/RedHat/5/repos/custom-buildsys.repo.disabled deleted file mode 100644 index e6040e3..0000000 --- a/yum/RedHat/5/repos/custom-buildsys.repo.disabled +++ /dev/null @@ -1,18 +0,0 @@ -[custom-buildsys] -name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/ -enabled=0 -gpgcheck=0 - -[custom-buildsys-debuginfo] -name=Custom Packages for Build Systems - Debuginfo -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[custom-buildsys-source] -name=Custom Packages for Build Systems - Sources -baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/SRPMS/ -enabled=0 -gpgcheck=0 - From jmeeuwen at puppetmanaged.org Fri May 14 05:30:10 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 05:30:10 +0200 Subject: [Commits] Branch 'development' - yum/RedHat Message-ID: <201005140330.o4E3UAh8008155@master.puppetmanaged.org> yum/RedHat/5/repos/feature-kolab.repo | 18 ------------------ yum/RedHat/5/repos/feature-kolab.repo.disabled | 18 ------------------ 2 files changed, 36 deletions(-) New commits: commit 1668cff9b3b67aad71cab5c8ea9bb034af8b9efa Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 05:27:46 2010 +0200 Remove local domain name space yum configuration files for featured kolab package repository diff --git a/yum/RedHat/5/repos/feature-kolab.repo b/yum/RedHat/5/repos/feature-kolab.repo deleted file mode 100644 index 9c46f66..0000000 --- a/yum/RedHat/5/repos/feature-kolab.repo +++ /dev/null @@ -1,18 +0,0 @@ -[feature-kolab] -name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/ -enabled=1 -gpgcheck=0 - -[feature-kolab-debuginfo] -name=Custom Packages for Build Systems - Debuginfo -baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[feature-kolab-source] -name=Custom Packages for Build Systems - Sources -baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/SRPMS/ -enabled=0 -gpgcheck=0 - diff --git a/yum/RedHat/5/repos/feature-kolab.repo.disabled b/yum/RedHat/5/repos/feature-kolab.repo.disabled deleted file mode 100644 index eb3839c..0000000 --- a/yum/RedHat/5/repos/feature-kolab.repo.disabled +++ /dev/null @@ -1,18 +0,0 @@ -[feature-kolab] -name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/ -enabled=0 -gpgcheck=0 - -[feature-kolab-debuginfo] -name=Custom Packages for Build Systems - Debuginfo -baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[feature-kolab-source] -name=Custom Packages for Build Systems - Sources -baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/SRPMS/ -enabled=0 -gpgcheck=0 - From jmeeuwen at puppetmanaged.org Fri May 14 16:29:47 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 16:29:47 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201005141429.o4EETlj5007386@master.puppetmanaged.org> files/mash/feature-f12-ruby-1.9.1-updates-testing.mash | 16 ++++++++++++++++ files/mash/feature-f12-ruby-1.9.1-updates.mash | 16 ++++++++++++++++ files/mash/feature-f12-ruby-1.9.1.mash | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) New commits: commit 4fc1424e0cafa0ffc45bcd6b7d3bc8170d0ece89 Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 16:27:49 2010 +0200 Add mash config for feature-f12-ruby-1.9.1 tags diff --git a/files/mash/feature-f12-ruby-1.9.1-updates-testing.mash b/files/mash/feature-f12-ruby-1.9.1-updates-testing.mash new file mode 100644 index 0000000..4194484 --- /dev/null +++ b/files/mash/feature-f12-ruby-1.9.1-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-f12-ruby-1.9.1-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-f12-ruby-1.9.1-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1-updates-testing/%(arch)s/ +repoviewtitle = "Fedora 12 - Featured Ruby 1.9.1 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-f12-ruby-1.9.1-updates.mash b/files/mash/feature-f12-ruby-1.9.1-updates.mash new file mode 100644 index 0000000..75ba918 --- /dev/null +++ b/files/mash/feature-f12-ruby-1.9.1-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-f12-ruby-1.9.1-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-f12-ruby-1.9.1-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1-updates/%(arch)s/ +repoviewtitle = "Fedora 12 - Featured Ruby 1.9.1 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-f12-ruby-1.9.1.mash b/files/mash/feature-f12-ruby-1.9.1.mash new file mode 100644 index 0000000..77da87a --- /dev/null +++ b/files/mash/feature-f12-ruby-1.9.1.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-f12-ruby-1.9.1] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-f12-ruby-1.9.1 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-f12-ruby-1.9.1/%(arch)s/ +repoviewtitle = "Fedora 12 - 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 Fri May 14 17:09:50 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 14 May 2010 17:09:50 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005141509.o4EF9oNC017834@master.puppetmanaged.org> puppet/manifests/nodes/laurel.kanarip.com.pp | 1 - 1 file changed, 1 deletion(-) New commits: commit a5c3e30871b20061baf825235aeac3d7ba2b1b3d Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri May 14 17:07:55 2010 +0200 Remove custom-buildsys repository from laurel diff --git a/puppet/manifests/nodes/laurel.kanarip.com.pp b/puppet/manifests/nodes/laurel.kanarip.com.pp index d6964e1..5089d36 100644 --- a/puppet/manifests/nodes/laurel.kanarip.com.pp +++ b/puppet/manifests/nodes/laurel.kanarip.com.pp @@ -26,7 +26,6 @@ node 'laurel.kanarip.com' { } yum::repository { [ - "custom-buildsys", "feature-kolab", "feature-ruby-1.9.1" ]: From jmeeuwen at puppetmanaged.org Sat May 15 16:30:53 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 15 May 2010 16:30:53 +0200 Subject: [Commits] Branch 'development' - 2 commits - files/CentOS Message-ID: <201005151430.o4FEUrsq004771@master.puppetmanaged.org> files/CentOS/5/repos/feature-kolab.repo | 1 + files/CentOS/5/repos/feature-kolab.repo.disabled | 1 + files/CentOS/5/repos/feature-ruby-1.9.1.repo | 1 + files/CentOS/5/repos/feature-ruby-1.9.1.repo.disabled | 1 + 4 files changed, 4 insertions(+) New commits: commit f54db61a0b2022e4f6bda8044f9a9bcb999bbd61 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 15 16:28:43 2010 +0200 Add feature-ruby-1.9.1 repository configuration to CentOS/5/repos diff --git a/files/CentOS/5/repos/feature-ruby-1.9.1.repo b/files/CentOS/5/repos/feature-ruby-1.9.1.repo new file mode 120000 index 0000000..1c49813 --- /dev/null +++ b/files/CentOS/5/repos/feature-ruby-1.9.1.repo @@ -0,0 +1 @@ +../../../RedHat/5/repos/feature-ruby-1.9.1.repo \ No newline at end of file diff --git a/files/CentOS/5/repos/feature-ruby-1.9.1.repo.disabled b/files/CentOS/5/repos/feature-ruby-1.9.1.repo.disabled new file mode 120000 index 0000000..dd0825a --- /dev/null +++ b/files/CentOS/5/repos/feature-ruby-1.9.1.repo.disabled @@ -0,0 +1 @@ +../../../RedHat/5/repos/feature-ruby-1.9.1.repo.disabled \ No newline at end of file commit d8e1f4cb3a936e43e33824015ba0aa7bc7df7632 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat May 15 16:28:15 2010 +0200 Add feature-kolab repository configuration to CentOS/5/repos diff --git a/files/CentOS/5/repos/feature-kolab.repo b/files/CentOS/5/repos/feature-kolab.repo new file mode 120000 index 0000000..c914214 --- /dev/null +++ b/files/CentOS/5/repos/feature-kolab.repo @@ -0,0 +1 @@ +../../../RedHat/5/repos/feature-kolab.repo \ No newline at end of file diff --git a/files/CentOS/5/repos/feature-kolab.repo.disabled b/files/CentOS/5/repos/feature-kolab.repo.disabled new file mode 120000 index 0000000..7aa887e --- /dev/null +++ b/files/CentOS/5/repos/feature-kolab.repo.disabled @@ -0,0 +1 @@ +../../../RedHat/5/repos/feature-kolab.repo.disabled \ No newline at end of file From jmeeuwen at puppetmanaged.org Sun May 16 02:39:05 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sun, 16 May 2010 02:39:05 +0200 Subject: [Commits] Branch 'development' - webserver/webalizer Message-ID: <201005160039.o4G0d53M028641@master.puppetmanaged.org> webserver/webalizer/mirror.nl.ergo-project.org.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) New commits: commit 479ccb352e1da12ab9dc3d79b21bcea3ed21fe59 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sun May 16 02:37:10 2010 +0200 Update list of repositories diff --git a/webserver/webalizer/mirror.nl.ergo-project.org.conf b/webserver/webalizer/mirror.nl.ergo-project.org.conf index 77f1bde..038ba44 100644 --- a/webserver/webalizer/mirror.nl.ergo-project.org.conf +++ b/webserver/webalizer/mirror.nl.ergo-project.org.conf @@ -78,6 +78,16 @@ HideURL /repositories/feature-el6-ruby-1.8.7* GroupURL /repositories/feature-el6-ruby-1.9.1* Enterprise Linux 6 Ruby 1.9.1 packages HideURL /repositories/feature-el6-ruby-1.9.1* +GroupURL /repositories/feature-f11-kolab* Fedora 11 Kolab packages +HideURL /repositories/feature-f11-kolab* + +GroupURL /repositories/feature-f12-kolab* Fedora 12 Kolab packages +HideURL /repositories/feature-f12-kolab* +GroupURL /repositories/feature-f12-ruby-1.8.7* Fedora 12 Ruby 1.8.7 packages +HideURL /repositories/feature-f12-ruby-1.8.7* +GroupURL /repositories/feature-f12-ruby-1.9.1* Fedora 12 Ruby 1.9.1 packages +HideURL /repositories/feature-f12-ruby-1.9.1* + HideAllSites yes GroupDomains 1 GroupShading yes From jmeeuwen at puppetmanaged.org Thu May 20 08:39:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 20 May 2010 08:39:48 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005200639.o4K6dmvk006383@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a32bc23f6097e9511996953e6d8cc960ed79ab8 Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 20 08:37:14 2010 +0200 Fix typo/escaping diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 97402d8..e4ff68f 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 jmeeuwen at puppetmanaged.org Thu May 20 12:21:34 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 20 May 2010 12:21:34 +0200 Subject: [Commits] Branch 'development' - 3 commits - files/Fedora manifests/init.pp Message-ID: <201005201021.o4KALYIN028927@master.puppetmanaged.org> files/Fedora/11/repos/livna-development.repo | 33 ------------ files/Fedora/11/repos/livna-development.repo.disabled | 33 ------------ files/Fedora/11/repos/livna-testing.repo | 34 ------------ files/Fedora/11/repos/livna-testing.repo.disabled | 34 ------------ files/Fedora/11/repos/livna.repo | 21 +------ files/Fedora/11/repos/livna.repo.disabled | 23 +------- files/Fedora/12/repos/livna.repo | 19 +++++++ files/Fedora/12/repos/livna.repo.disabled | 19 +++++++ manifests/init.pp | 48 +++++++----------- 9 files changed, 65 insertions(+), 199 deletions(-) New commits: commit 50be64d7cbe677795c6157a60362b83ab6b0f974 Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 20 12:18:56 2010 +0200 Fix the references to the livna repositories and do not expire for Fedora 11/12 diff --git a/manifests/init.pp b/manifests/init.pp index e4041c3..9b7cf5e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -83,11 +83,9 @@ class yum { enable => true; [ "updates-testing", - "livna-testing", "rpmfusion-free-updates-testing", "rpmfusion-nonfree-updates-testing", "development", - "livna-development", "rpmfusion-free-development", "rpmfusion-nonfree-development", "koji" @@ -190,7 +188,6 @@ class yum { "updates", "updates-testing", "livna", - "livna-testing", "rpmfusion-free", "rpmfusion-free-updates", "rpmfusion-free-updates-testing", @@ -201,7 +198,6 @@ class yum { enable => true; [ "development", - "livna-development", "rpmfusion-free-development", "rpmfusion-nonfree-development", "koji" @@ -293,7 +289,7 @@ class yum { "Fedora": { repository { [ "development", - "livna-development", + "livna", "rpmfusion-free-development", "rpmfusion-nonfree-development" ]: @@ -301,9 +297,7 @@ class yum { [ "release", "updates", - "livna", "updates-testing", - "livna-testing", "koji", "rpmfusion-free", "rpmfusion-free-updates", @@ -399,7 +393,7 @@ class yum { "Fedora": { repository { [ "development", - "livna-development", + "livna", "rpmfusion-free-development", "rpmfusion-nonfree-development", "koji" @@ -408,9 +402,7 @@ class yum { [ "release", "updates", - "livna", "updates-testing", - "livna-testing", "rpmfusion-free", "rpmfusion-free-updates", "rpmfusion-free-updates-testing", @@ -517,24 +509,24 @@ class yum { # # $expired = false - $expired = $os ? { - "Fedora" => $osmajorver ? { - "11" => $name ? { - "livna" => true, - "livna-testing" => true, - "livna-development" => true, - default => false - }, - "12" => $name ? { - "livna" => true, - "livna-testing" => true, - "livna-development" => true, - default => false - }, - default => false - }, - default => false - } +# $expired = $os ? { +# "Fedora" => $osmajorver ? { +# "11" => $name ? { +# "livna" => true, +# "livna-testing" => true, +# "livna-development" => true, +# default => false +# }, +# "12" => $name ? { +# "livna" => true, +# "livna-testing" => true, +# "livna-development" => true, +# default => false +# }, +# default => false +# }, +# default => false +# } case $name { "epel", "epel-testing": { commit 238aabe204cb3d5fdb044404cfccd7c746133ada Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 20 12:17:26 2010 +0200 Fix URLs for livna repo in Fedora 11 and delete expired repositories diff --git a/files/Fedora/11/repos/livna-development.repo b/files/Fedora/11/repos/livna-development.repo deleted file mode 100644 index 3a0a7c1..0000000 --- a/files/Fedora/11/repos/livna-development.repo +++ /dev/null @@ -1,33 +0,0 @@ -# Managed with puppet -[development-livna] -name=Livna for Fedora - Base -baseurl=http://rpm.livna.org/fedora/development/$basearch/ - http://livna.cat.pdx.edu/fedora/development/$basearch/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/development/$basearch/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/development/$basearch/ - http://mirror.atrpms.net/livna/fedora/development/$basearch/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/development/$basearch/ -enabled=1 -gpgcheck=0 - -[development-livna-debuginfo] -name=Livna for Fedora - Debug -baseurl=http://rpm.livna.org/fedora/development/$basearch/debug/ - http://livna.cat.pdx.edu/fedora/development/$basearch/debug/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/development/$basearch/debug/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/development/$basearch/debug/ - http://mirror.atrpms.net/livna/fedora/development/$basearch/debug/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/development/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[development-livna-source] -name=Livna for Fedora - Source -baseurl=http://rpm.livna.org/fedora/development/SRPMS/ - http://livna.cat.pdx.edu/fedora/development/SRPMS/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/development/SRPMS/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/development/SRPMS/ - http://mirror.atrpms.net/livna/fedora/development/SRPMS/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/development/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/files/Fedora/11/repos/livna-development.repo.disabled b/files/Fedora/11/repos/livna-development.repo.disabled deleted file mode 100644 index 35a671c..0000000 --- a/files/Fedora/11/repos/livna-development.repo.disabled +++ /dev/null @@ -1,33 +0,0 @@ -# Managed with puppet -[development-livna] -name=Livna for Fedora - Base -baseurl=http://rpm.livna.org/fedora/development/$basearch/ - http://livna.cat.pdx.edu/fedora/development/$basearch/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/development/$basearch/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/development/$basearch/ - http://mirror.atrpms.net/livna/fedora/development/$basearch/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/development/$basearch/ -enabled=0 -gpgcheck=0 - -[development-livna-debuginfo] -name=Livna for Fedora - Debug -baseurl=http://rpm.livna.org/fedora/development/$basearch/debug/ - http://livna.cat.pdx.edu/fedora/development/$basearch/debug/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/development/$basearch/debug/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/development/$basearch/debug/ - http://mirror.atrpms.net/livna/fedora/development/$basearch/debug/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/development/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[development-livna-source] -name=Livna for Fedora - Source -baseurl=http://rpm.livna.org/fedora/development/SRPMS/ - http://livna.cat.pdx.edu/fedora/development/SRPMS/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/development/SRPMS/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/development/SRPMS/ - http://mirror.atrpms.net/livna/fedora/development/SRPMS/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/development/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/files/Fedora/11/repos/livna-testing.repo b/files/Fedora/11/repos/livna-testing.repo deleted file mode 100644 index ca68b78..0000000 --- a/files/Fedora/11/repos/livna-testing.repo +++ /dev/null @@ -1,34 +0,0 @@ -# Managed with puppet -# ./distr/files/Fedora/11/etc/yum/repos.d/livna-testing.repo -[livna-testing] -name=Livna for Fedora - Testing -baseurl=http://rpm.livna.org/fedora/testing/11/$basearch/ - http://livna.cat.pdx.edu/fedora/testing/11/$basearch/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/testing/11/$basearch/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/testing/11/$basearch/ - http://mirror.atrpms.net/livna/fedora/testing/11/$basearch/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/testing/11/$basearch/ -enabled=1 -gpgcheck=0 - -[livna-testing-debug] -name=Livna for Fedora - Testing - Debug -baseurl=http://rpm.livna.org/fedora/testing/11/$basearch/debug/ - http://livna.cat.pdx.edu/fedora/testing/11/$basearch/debug/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/testing/11/$basearch/debug/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/testing/11/$basearch/debug/ - http://mirror.atrpms.net/livna/fedora/testing/11/$basearch/debug/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/testing/11/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[livna-testing-source] -name=Livna for Fedora - Testing - Source -baseurl=http://rpm.livna.org/fedora/testing/11/SRPMS/ - http://livna.cat.pdx.edu/fedora/testing/11/SRPMS/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/testing/11/SRPMS/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/testing/11/SRPMS/ - http://mirror.atrpms.net/livna/fedora/testing/11/SRPMS/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/testing/11/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/files/Fedora/11/repos/livna-testing.repo.disabled b/files/Fedora/11/repos/livna-testing.repo.disabled deleted file mode 100644 index 0a9869b..0000000 --- a/files/Fedora/11/repos/livna-testing.repo.disabled +++ /dev/null @@ -1,34 +0,0 @@ -# Managed with puppet -# ./distr/files/Fedora/11/etc/yum/repos.d/livna-testing.repo -[livna-testing] -name=Livna for Fedora - Testing -baseurl=http://rpm.livna.org/fedora/testing/11/$basearch/ - http://livna.cat.pdx.edu/fedora/testing/11/$basearch/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/testing/11/$basearch/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/testing/11/$basearch/ - http://mirror.atrpms.net/livna/fedora/testing/11/$basearch/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/testing/11/$basearch/ -enabled=0 -gpgcheck=0 - -[livna-testing-debug] -name=Livna for Fedora - Testing - Debug -baseurl=http://rpm.livna.org/fedora/testing/11/$basearch/debug/ - http://livna.cat.pdx.edu/fedora/testing/11/$basearch/debug/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/testing/11/$basearch/debug/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/testing/11/$basearch/debug/ - http://mirror.atrpms.net/livna/fedora/testing/11/$basearch/debug/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/testing/11/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[livna-testing-source] -name=Livna for Fedora - Testing - Source -baseurl=http://rpm.livna.org/fedora/testing/11/SRPMS/ - http://livna.cat.pdx.edu/fedora/testing/11/SRPMS/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/testing/11/SRPMS/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/testing/11/SRPMS/ - http://mirror.atrpms.net/livna/fedora/testing/11/SRPMS/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/testing/11/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/files/Fedora/11/repos/livna.repo b/files/Fedora/11/repos/livna.repo index 14ffae8..2751e32 100644 --- a/files/Fedora/11/repos/livna.repo +++ b/files/Fedora/11/repos/livna.repo @@ -2,33 +2,18 @@ # ./distr/files/Fedora/11/etc/yum/repos.d/livna.repo [livna] name=Livna for Fedora - Base -baseurl=http://rpm.livna.org/fedora/11/$basearch/ - http://livna.cat.pdx.edu/fedora/11/$basearch/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/11/$basearch/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/11/$basearch/ - http://mirror.atrpms.net/livna/fedora/11/$basearch/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/11/$basearch/ +baseurl=http://rpm.livna.org/repo/11/$basearch/ enabled=1 gpgcheck=0 [livna-debuginfo] name=Livna for Fedora - Debug -baseurl=http://rpm.livna.org/fedora/11/$basearch/debug/ - http://livna.cat.pdx.edu/fedora/11/$basearch/debug/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/11/$basearch/debug/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/11/$basearch/debug/ - http://mirror.atrpms.net/livna/fedora/11/$basearch/debug/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/11/$basearch/debug/ +baseurl=http://rpm.livna.org/repo/11/$basearch/debug/ enabled=0 gpgcheck=0 [livna-source] name=Livna for Fedora - Source -baseurl=http://rpm.livna.org/fedora/11/SRPMS/ - http://livna.cat.pdx.edu/fedora/11/SRPMS/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/11/SRPMS/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/11/SRPMS/ - http://mirror.atrpms.net/livna/fedora/11/SRPMS/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/11/SRPMS/ +baseurl=http://rpm.livna.org/repo/11/SRPMS/ enabled=0 gpgcheck=0 diff --git a/files/Fedora/11/repos/livna.repo.disabled b/files/Fedora/11/repos/livna.repo.disabled index b1c57e4..70ecc6a 100644 --- a/files/Fedora/11/repos/livna.repo.disabled +++ b/files/Fedora/11/repos/livna.repo.disabled @@ -1,34 +1,19 @@ # Managed with puppet -# ./distr/files/Fedora/11/etc/yum/repos.d/livna.repo.disabled +# ./distr/files/Fedora/11/etc/yum/repos.d/livna.repo [livna] name=Livna for Fedora - Base -baseurl=http://rpm.livna.org/fedora/11/$basearch/ - http://livna.cat.pdx.edu/fedora/11/$basearch/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/11/$basearch/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/11/$basearch/ - http://mirror.atrpms.net/livna/fedora/11/$basearch/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/11/$basearch/ +baseurl=http://rpm.livna.org/repo/11/$basearch/ enabled=0 gpgcheck=0 [livna-debuginfo] name=Livna for Fedora - Debug -baseurl=http://rpm.livna.org/fedora/11/$basearch/debug/ - http://livna.cat.pdx.edu/fedora/11/$basearch/debug/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/11/$basearch/debug/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/11/$basearch/debug/ - http://mirror.atrpms.net/livna/fedora/11/$basearch/debug/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/11/$basearch/debug/ +baseurl=http://rpm.livna.org/repo/11/$basearch/debug/ enabled=0 gpgcheck=0 [livna-source] name=Livna for Fedora - Source -baseurl=http://rpm.livna.org/fedora/11/SRPMS/ - http://livna.cat.pdx.edu/fedora/11/SRPMS/ - http://wftp.tu-chemnitz.de/pub/linux/livna/fedora/11/SRPMS/ - http://ftp-stud.fht-esslingen.de/pub/Mirrors/rpm.livna.org/fedora/11/SRPMS/ - http://mirror.atrpms.net/livna/fedora/11/SRPMS/ - ftp://mirrors.tummy.com/pub/rpm.livna.org/fedora/11/SRPMS/ +baseurl=http://rpm.livna.org/repo/11/SRPMS/ enabled=0 gpgcheck=0 commit d2760d241e234212bdc51501bf0db6d23f59af50 Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 20 12:16:31 2010 +0200 Add livna repositories with the correct url diff --git a/files/Fedora/12/repos/livna.repo b/files/Fedora/12/repos/livna.repo new file mode 100644 index 0000000..a434421 --- /dev/null +++ b/files/Fedora/12/repos/livna.repo @@ -0,0 +1,19 @@ +# Managed with puppet +# ./distr/files/Fedora/12/etc/yum/repos.d/livna.repo +[livna] +name=Livna for Fedora - Base +baseurl=http://rpm.livna.org/repo/12/$basearch/ +enabled=1 +gpgcheck=0 + +[livna-debuginfo] +name=Livna for Fedora - Debug +baseurl=http://rpm.livna.org/repo/12/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[livna-source] +name=Livna for Fedora - Source +baseurl=http://rpm.livna.org/repo/12/SRPMS/ +enabled=0 +gpgcheck=0 diff --git a/files/Fedora/12/repos/livna.repo.disabled b/files/Fedora/12/repos/livna.repo.disabled new file mode 100644 index 0000000..5fefd35 --- /dev/null +++ b/files/Fedora/12/repos/livna.repo.disabled @@ -0,0 +1,19 @@ +# Managed with puppet +# ./distr/files/Fedora/12/etc/yum/repos.d/livna.repo +[livna] +name=Livna for Fedora - Base +baseurl=http://rpm.livna.org/repo/12/$basearch/ +enabled=0 +gpgcheck=0 + +[livna-debuginfo] +name=Livna for Fedora - Debug +baseurl=http://rpm.livna.org/repo/12/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[livna-source] +name=Livna for Fedora - Source +baseurl=http://rpm.livna.org/repo/12/SRPMS/ +enabled=0 +gpgcheck=0 From jmeeuwen at puppetmanaged.org Fri May 21 12:38:31 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 21 May 2010 12:38:31 +0200 Subject: [Commits] Branch 'development' - 2 commits - puppet/manifests Message-ID: <201005211038.o4LAcVIr028762@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 236fc7e3037bbb1b6347fdd49c5098707a5ac39a Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 12:36:08 2010 +0200 Fix another variable escaping thing diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index d867382..63f12d0 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" commit 5ead074aa9a1819e7e1d1f4cce92eb782b114d69 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 12:35:13 2010 +0200 Fix escaping variables in koji_regen-repo crontab diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index e4ff68f..d867382 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 jmeeuwen at puppetmanaged.org Fri May 21 12:39:26 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 21 May 2010 12:39:26 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005211039.o4LAdQPV028817@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bc947859e4c42335801a4f8a77c824657e41edf7 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 12:37:07 2010 +0200 Fix another variable escaping thing diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 63f12d0..eb1c0b0 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 jmeeuwen at puppetmanaged.org Fri May 21 12:39:52 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 21 May 2010 12:39:52 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005211039.o4LAdqBp028872@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 275c0aadbea3d166a47710296eac51aa55890899 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 12:37:32 2010 +0200 Fix another variable escaping thing diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index eb1c0b0..541613c 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 jmeeuwen at puppetmanaged.org Fri May 21 14:20:13 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 21 May 2010 14:20:13 +0200 Subject: [Commits] Branch 'development' - 3 commits - puppet/fileserver.conf puppet/manifests Message-ID: <201005211220.o4LCKDek027236@master.puppetmanaged.org> puppet/fileserver.conf | 4 +++ puppet/manifests/nodes/master.puppetmanaged.org.pp | 14 +++++++++++++ puppet/manifests/utils/sensitive-file.pp | 22 +++++++++++++++++++++ 3 files changed, 40 insertions(+) New commits: commit 6c34482610ddb65e9dc334dda01b21838c70699b Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 14:15:43 2010 +0200 Add a sensitive_file resource diff --git a/puppet/manifests/utils/sensitive-file.pp b/puppet/manifests/utils/sensitive-file.pp new file mode 100644 index 0000000..08847c0 --- /dev/null +++ b/puppet/manifests/utils/sensitive-file.pp @@ -0,0 +1,22 @@ +define sensitive-file ( + $source_path, + $owner = "root", + $group = "root", + $mode = 640, + $path = false + ) { + + file { "$name": + owner => "$owner", + group => "$group", + mode => "$mode", + path => $path ? { + false => "$name", + default => "$path" + }, + source => [ + "puppet://$server/sensitive/$source_path.$hostname", + "puppet://$server/sensitive/$source_path" + ] + } +} commit f46a24412c130cf326fec93dcd207abbdaf9ac3f Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 14:14:42 2010 +0200 Update fileserver configuration and add sensitive mount diff --git a/puppet/fileserver.conf b/puppet/fileserver.conf index 0e742e8..d5b4a75 100644 --- a/puppet/fileserver.conf +++ b/puppet/fileserver.conf @@ -20,3 +20,7 @@ [private] path /var/lib/puppet/private/%d/ allow * + +[sensitive] + path /var/lib/puppet/sensitive/%d/ + allow * commit a16745cd7a4d1db819d48211c3ba268ba16a8b5d Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 21 14:13:32 2010 +0200 Add a sensitive repository diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 823eb2e..f809ff7 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -222,6 +222,20 @@ node 'master.puppetmanaged.org' { recipients => [ "kanarip at kanarip.com", "commits at puppetmanaged.org" ] } + git::repository::domain { [ + "puppetmanaged.org-sensitive" + ]: + localtree => "/data/scm/git/git.puppetmanaged.org/", + shared => true, + public => false, + owner => "root", + group => "git-$name", + prefix => "domain", + symlink_prefix => "puppet", + description => "Domain specific, sensitive configuration", + recipients => [ "kanarip at kanarip.com" ] + } + # GIT Repositories for private, domain specific trees git::repository::domain { [ "baard.xs4all.nl", From jmeeuwen at puppetmanaged.org Sat May 22 21:32:11 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 22 May 2010 21:32:11 +0200 Subject: [Commits] Branch 'development' - files/RedHat Message-ID: <201005221932.o4MJWBee009370@master.puppetmanaged.org> files/RedHat/5/repos/custom-ruby.repo | 18 ++++++++++++++++++ files/RedHat/5/repos/custom-ruby.repo.disabled | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) New commits: commit b64f706a2408e8623f583ffc49981ed7c7edfd34 Author: Jeroen van Meeuwen Date: Sat May 22 21:31:47 2010 +0200 Add custom ruby repositories to the mix diff --git a/files/RedHat/5/repos/custom-ruby.repo b/files/RedHat/5/repos/custom-ruby.repo new file mode 100644 index 0000000..47d5098 --- /dev/null +++ b/files/RedHat/5/repos/custom-ruby.repo @@ -0,0 +1,18 @@ +[custom-ruby] +name=Custom Ruby Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/$basearch/ +enabled=1 +gpgcheck=0 + +[custom-ruby-debuginfo] +name=Custom Ruby Packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-ruby-source] +name=Custom Ruby Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/custom-ruby.repo.disabled b/files/RedHat/5/repos/custom-ruby.repo.disabled new file mode 100644 index 0000000..1d4b679 --- /dev/null +++ b/files/RedHat/5/repos/custom-ruby.repo.disabled @@ -0,0 +1,18 @@ +[custom-ruby] +name=Custom Ruby Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/$basearch/ +enabled=0 +gpgcheck=0 + +[custom-ruby-debuginfo] +name=Custom Ruby Packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-ruby-source] +name=Custom Ruby Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Mon May 24 14:18:43 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 14:18:43 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005241218.o4OCIhp1013085@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 1 + 1 file changed, 1 insertion(+) New commits: commit 2099c25f5485e1281c07ff20089203d6c1d14733 Author: Jeroen van Meeuwen (Ergo Project) Date: Mon May 24 14:16:09 2010 +0200 Add a git repository for a kolab puppet module diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index f809ff7..61d2bd6 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -69,6 +69,7 @@ node 'master.puppetmanaged.org' { "hg", "iptables", "koji", + "kolab", "mail", "memcached", "mirror", From jmeeuwen at puppetmanaged.org Mon May 24 17:45:08 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 17:45:08 +0200 Subject: [Commits] Changes to 'master' Message-ID: <201005241545.o4OFj8Gg003628@master.puppetmanaged.org> New branch 'master' available with the following commits: commit 9f90376417f2749cd9a3c19dbff951ac261c5ef5 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 17:42:30 2010 +0200 Initial commit From jmeeuwen at puppetmanaged.org Mon May 24 20:46:33 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 20:46:33 +0200 Subject: [Commits] 3 commits - manifests/common.pp manifests/init.pp manifests/server manifests/server.pp manifests/settings.pp templates/server Message-ID: <201005241846.o4OIkXXx028434@master.puppetmanaged.org> manifests/common.pp | 76 +++++++++++++++++++++++++++++++++++++++ manifests/init.pp | 45 ----------------------- manifests/server.pp | 3 + manifests/server/centos.pp | 5 ++ manifests/server/debian.pp | 5 ++ manifests/server/fedora.pp | 5 ++ manifests/server/redhat.pp | 5 ++ manifests/settings.pp | 11 +++++ templates/server/kolabd.conf.erb | 44 ++++++++++++++++++++++ 9 files changed, 154 insertions(+), 45 deletions(-) New commits: commit d84317421549c0080212abd358949f96226ad0cb Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 20:43:04 2010 +0200 Add kolab::server, and make sure we have control over a couple of example Linux distributions diff --git a/manifests/server.pp b/manifests/server.pp new file mode 100644 index 0000000..546f7df --- /dev/null +++ b/manifests/server.pp @@ -0,0 +1,3 @@ +class server inherits kolab::common { + include kolab::server::$os +} \ No newline at end of file diff --git a/manifests/server/centos.pp b/manifests/server/centos.pp new file mode 100644 index 0000000..97591ed --- /dev/null +++ b/manifests/server/centos.pp @@ -0,0 +1,5 @@ +# CentOS specific kolab::server settings & logic +# + +class centos inherits kolab::server::redhat { +} \ No newline at end of file diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp new file mode 100644 index 0000000..24c672e --- /dev/null +++ b/manifests/server/debian.pp @@ -0,0 +1,5 @@ +# Debian specific kolab::server settings & logic +# + +class debian inherits kolab::server { +} \ No newline at end of file diff --git a/manifests/server/fedora.pp b/manifests/server/fedora.pp new file mode 100644 index 0000000..b50575b --- /dev/null +++ b/manifests/server/fedora.pp @@ -0,0 +1,5 @@ +# Fedora specific kolab::server settings & logic +# + +class fedora inherits kolab::server { +} \ No newline at end of file diff --git a/manifests/server/redhat.pp b/manifests/server/redhat.pp new file mode 100644 index 0000000..b349d42 --- /dev/null +++ b/manifests/server/redhat.pp @@ -0,0 +1,5 @@ +# Red Hat specific kolab::server settings & logic +# + +class redhat inherits kolab::server::fedora { +} \ No newline at end of file commit dbb7a4922d3bd91abcfd62872350be16509d23d2 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 20:42:02 2010 +0200 Add a settings file, and use common to make sure these are either set or default diff --git a/manifests/common.pp b/manifests/common.pp new file mode 100644 index 0000000..9881ca9 --- /dev/null +++ b/manifests/common.pp @@ -0,0 +1,76 @@ +class common inherits kolab { + + ## + ## Parse the settings, or set them default + ## + + $real_kolab_base_dn = $kolab_base_dn ? { + nil => "dc=example,dc=com", + default => $kolab_base_dn + } + + $real_kolab_confdir = $kolab_confdir ? { + nil => "/etc/kolab/", + default => $kolab_confdir + } + + $real_kolab_confdir_mode = $kolab_confdir_mode ? { + nil => 750, + default => $kolab_confdir_mode + } + + $real_kolab_group = $kolab_group ? { + nil => "kolab", + default => $kolab_group + } + + $real_kolab_group_gid = $kolab_group_gid ? { + nil => 412, + default => $kolab_group_gid + } + + $real_kolab_manager_bind_dn = $kolab_manager_bind_dn ? { + nil => "cn=manager,cn=internal,$real_kolab_base_dn", + default => $kolab_manager_bind_dn + } + + $real_kolab_manager_bind_password = $kolab_manager_bind_password ? { + nil => "secret", + default => $kolab_manager_bind_password + } + + $real_kolab_master = $kolab_master ? { + nil => "$fqdn", + default => $kolab_master + } + + $real_kolab_php_bind_dn = $kolab_php_bind_dn ? { + nil => "cn=manager,cn=internal,$real_kolab_base_dn", + default => $kolab_php_bind_dn + } + + $real_kolab_php_bind_password = $kolab_php_bind_password ? { + nil => "secret", + default => $kolab_php_bind_password + } + + $real_kolab_user = $kolab_user ? { + nil => "kolab", + default => $kolab_user + } + + $real_kolab_user_homedir = $kolab_user_homedir ? { + nil => "/var/lib/kolab/", + default => $kolab_user_homedir + } + + $real_kolab_user_shell = $kolab_user_shell ? { + nil => "/sbin/nologin", + default => $kolab_user_shell + } + + $real_kolab_user_uid = $kolab_user_uid ? { + nil => 412, + default => $kolab_user_uid + } +} \ No newline at end of file diff --git a/manifests/init.pp b/manifests/init.pp index 0382670..2ec88d9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,49 +26,4 @@ class kolab { # Include settings.pp include kolab::settings - - ## - ## Parse the settings, or set them default - ## - - $real_kolab_confdir = $kolab_confdir ? { - nil => "/etc/kolab/", - default => $kolab_confdir - } - - $real_kolab_confdir_mode = $kolab_confdir_mode ? { - nil => 750, - default => $kolab_confdir_mode - } - - $real_kolab_group = $kolab_group ? { - nil => "kolab", - default => $kolab_group - } - - $real_kolab_group_gid = $kolab_group_gid ? { - nil => 412, - default => $kolab_group_gid - } - - $real_kolab_user = $kolab_user ? { - nil => "kolab", - default => $kolab_user - } - - $real_kolab_user_homedir = $kolab_user_homedir ? { - nil => "/var/lib/kolab/", - default => $kolab_user_homedir - } - - $real_kolab_user_shell = $kolab_user_shell ? { - nil => "/sbin/nologin", - default => $kolab_user_shell - } - - $real_kolab_user_uid = $kolab_user_uid ? { - nil => 412, - default => $kolab_user_uid - } - } \ No newline at end of file diff --git a/manifests/settings.pp b/manifests/settings.pp index 2a5d47c..02fd4db 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -37,6 +37,9 @@ class settings { ## ## Other settings we have not yet explicitly documented ## +# $kolab_calendar_id = "calendar" +# $kolab_calendar_password = "secret" + # $kolab_imapserver = "cyrus" # $kolab_user = "kolab" # $kolab_user_homedir = "/var/lib/kolab/" @@ -44,4 +47,12 @@ class settings { # $kolab_user_uid = 412 # $kolab_group = "kolab" # $kolab_group_gid = 412 +# $kolab_base_dn = "dc=example,dc=com" +# $kolab_manager_bind_dn = "cn=manager,cn=internal,$kolab_base_dn" +# $kolab_manager_bind_password = "secret" +# $kolab_manager_bind_password_hash = "{SSHA}rdnK47q9F2hSSjOVCI/paWaPjaDavFw7" + +# $kolab_php_bind_dn = "cn=nobody,cn=internal,$kolab_base_dn" +# $kolab_php_bind_password = "secret" + } \ No newline at end of file commit b83740ee2d807c581c17e1837ba3edbaf5ad5df3 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 20:41:27 2010 +0200 Add a first version of the kolabd.conf template for a Kolab server diff --git a/templates/server/kolabd.conf.erb b/templates/server/kolabd.conf.erb new file mode 100644 index 0000000..0e6ff37 --- /dev/null +++ b/templates/server/kolabd.conf.erb @@ -0,0 +1,44 @@ +# Managed by Puppet +# +# File source: <%= __FILE__ -%> + +# FIXME: If this where a configuration file in .INI format, we could use Augeas +# +fqdnhostname : <%= fqdn -%> + +<% if real_kolab_master == fqdn then %> +is_master : true +<% else %> +is_master : false +<% end %> + +base_dn : <%= real_kolab_base_dn -%> +bind_dn : <%= real_kolab_manager_bind_dn -%> +bind_pw : <%= real_kolab_manager_bind_password -%> + +ldap_uri : <%= real_kolab_ldap_uri -%> +ldap_master_uri : <%= real_kolab_ldap_master_uri -%> + +php_dn : <%= real_kolab_php_bind_dn -%> +php_pw : <%= real_kolab_php_bind_password -%> + +calendar_id : <%= real_kolab_calendar_id -%> +calendar_pw : <%= real_kolab_calendar_password -%> + +slurpd_addr : 127.0.0.1 +slurpd_port : 9999 + +fqdnhostname : laurel.kanarip.com +is_master : true +base_dn : dc=kanarip,dc=com +bind_dn : cn=manager,cn=internal,dc=kanarip,dc=com +bind_pw : secret +bind_pw_hash : {SSHA}rdnK47q9F2hSSjOVCI/paWaPjaDavFw7 +ldap_uri : ldap://127.0.0.1:389 +ldap_master_uri : ldap://127.0.0.1:389 +php_dn : cn=nobody,cn=internal,dc=kanarip,dc=com +php_pw : euU8MT5xVp2jPshCKurCSv8RwrZR8U6nc6JLHKAC +calendar_id : calendar +calendar_pw : 8Y1d4XHA5ClCZu4TffMeGreo5IrkGylFl5TpZ+nY +slurpd_addr : 127.0.0.1 +slurpd_port : 9999 From jmeeuwen at puppetmanaged.org Mon May 24 21:16:43 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:16:43 +0200 Subject: [Commits] Changes to 'development' Message-ID: <201005241916.o4OJGhmx028739@master.puppetmanaged.org> New branch 'development' available with the following commits: commit a65b2a34c9f83197ea04689366016f4e5f0514fa Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 21:13:22 2010 +0200 Move the parsing of the settings we need in common to common::settings, and require common:settings From jmeeuwen at puppetmanaged.org Mon May 24 21:18:40 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:18:40 +0200 Subject: [Commits] Changes to 'testing' Message-ID: <201005241918.o4OJIe5r028822@master.puppetmanaged.org> New branch 'testing' available with the following commits: From jmeeuwen at puppetmanaged.org Mon May 24 21:18:43 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:18:43 +0200 Subject: [Commits] Changes to 'production' Message-ID: <201005241918.o4OJIhPW028863@master.puppetmanaged.org> New branch 'production' available with the following commits: From jmeeuwen at puppetmanaged.org Mon May 24 21:37:58 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:37:58 +0200 Subject: [Commits] Branch 'development' - manifests/common manifests/common.pp manifests/init.pp manifests/server manifests/server.pp manifests/settings.pp Message-ID: <201005241937.o4OJbwVs021274@master.puppetmanaged.org> manifests/common.pp | 4 ++-- manifests/common/settings.pp | 2 +- manifests/init.pp | 4 +++- manifests/server.pp | 32 ++++++++++++++++++++++++++++++-- manifests/server/centos.pp | 2 +- manifests/server/debian.pp | 2 +- manifests/server/fedora.pp | 2 +- manifests/server/redhat.pp | 2 +- manifests/settings.pp | 2 +- 9 files changed, 41 insertions(+), 11 deletions(-) New commits: commit b171af74321fbc58d0dd63005cb24626fb351ce7 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 21:35:21 2010 +0200 Update references to classes included and required diff --git a/manifests/common.pp b/manifests/common.pp index 9d870d1..ae631e5 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -1,5 +1,5 @@ -class common inherits kolab { - require common::settings +class kolab::common inherits kolab { + require kolab::common::settings @group { "$real_kolab_group": ensure => present, diff --git a/manifests/common/settings.pp b/manifests/common/settings.pp index 13918f0..d9a2277 100644 --- a/manifests/common/settings.pp +++ b/manifests/common/settings.pp @@ -1,4 +1,4 @@ -class settings inherits kolab::settings { +class kolab::common::settings inherits kolab::settings { ## ## Parse the settings, or set them default ## diff --git a/manifests/init.pp b/manifests/init.pp index 2ec88d9..921ef85 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -23,7 +23,9 @@ ## all you want. ## +import 'server.pp' + class kolab { # Include settings.pp include kolab::settings -} \ No newline at end of file +} diff --git a/manifests/server.pp b/manifests/server.pp index 546f7df..18846fe 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -1,3 +1,31 @@ -class server inherits kolab::common { - include kolab::server::$os +class kolab::server inherits kolab::common { + include kolab::server::$operatingsystem + + # FIXME: This should actually be kolabd.conf + file { "$real_kolab_confdir/kolab.conf": + ensure => file, + owner => "$real_kolab_user", + group => "$real_kolab_group", + mode => 640, + content => template("kolab/server/kolabd.conf.erb"), + notify => Service["kolabd"], + require => [ + Group["$real_kolab_group"], + Package["kolab-server"], + User["$real_kolab_user"] + ] + } + + package { "kolab-server": + ensure => installed + } + + service { "kolabd": + ensure => running, + enable => true, + require => [ + File["$real_kolab_confdir/kolab.conf"], + Package["kolab-server"] + ] + } } \ No newline at end of file diff --git a/manifests/server/centos.pp b/manifests/server/centos.pp index 97591ed..9b67f44 100644 --- a/manifests/server/centos.pp +++ b/manifests/server/centos.pp @@ -1,5 +1,5 @@ # CentOS specific kolab::server settings & logic # -class centos inherits kolab::server::redhat { +class kolab::server::centos inherits kolab::server::redhat { } \ No newline at end of file diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp index 24c672e..2f29263 100644 --- a/manifests/server/debian.pp +++ b/manifests/server/debian.pp @@ -1,5 +1,5 @@ # Debian specific kolab::server settings & logic # -class debian inherits kolab::server { +class kolab::server::debian inherits kolab::server { } \ No newline at end of file diff --git a/manifests/server/fedora.pp b/manifests/server/fedora.pp index b50575b..85dba98 100644 --- a/manifests/server/fedora.pp +++ b/manifests/server/fedora.pp @@ -1,5 +1,5 @@ # Fedora specific kolab::server settings & logic # -class fedora inherits kolab::server { +class kolab::server::fedora inherits kolab::server { } \ No newline at end of file diff --git a/manifests/server/redhat.pp b/manifests/server/redhat.pp index b349d42..51200f8 100644 --- a/manifests/server/redhat.pp +++ b/manifests/server/redhat.pp @@ -1,5 +1,5 @@ # Red Hat specific kolab::server settings & logic # -class redhat inherits kolab::server::fedora { +class kolab::server::redhat inherits kolab::server::fedora { } \ No newline at end of file diff --git a/manifests/settings.pp b/manifests/settings.pp index 02fd4db..95b2d3a 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -5,7 +5,7 @@ # # The documentation on these options is inline. # -class settings { +class kolab::settings { # # The Kolab configuration directory. All configuration is being deployed # underneath this directory, in a tree similar to: From jmeeuwen at puppetmanaged.org Mon May 24 21:49:59 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:49:59 +0200 Subject: [Commits] Branch 'development' - 2 commits - manifests/common manifests/common.pp manifests/server.pp manifests/settings.pp templates/server Message-ID: <201005241949.o4OJnxe8029265@master.puppetmanaged.org> manifests/common.pp | 12 +++---- manifests/common/settings.pp | 60 +++++++++++++++++++-------------------- manifests/server.pp | 16 +++++----- manifests/settings.pp | 40 +++++++++++++------------- templates/server/kolabd.conf.erb | 20 ++++++------- 5 files changed, 74 insertions(+), 74 deletions(-) New commits: commit c675141d9783ffd7d165bb41658291ce019c8e98 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 21:47:10 2010 +0200 If we lookup all variables in the $kolab:: scope anyway, there's no reason to prefix them. diff --git a/manifests/common.pp b/manifests/common.pp index ae631e5..9485efb 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -1,17 +1,17 @@ class kolab::common inherits kolab { require kolab::common::settings - @group { "$real_kolab_group": + @group { "$real_group": ensure => present, - gid => $real_kolab_group_gid + gid => $real_group_gid } - @user { "$real_kolab_user": + @user { "$real_user": ensure => present, - uid => $real_kolab_user_uid, - home => "$real_kolab_user_homedir", + uid => $real_user_uid, + home => "$real_user_homedir", managehome => true, comment => "Kolab System User", - require => Group["$real_kolab_group"] + require => Group["$real_group"] } } \ No newline at end of file diff --git a/manifests/common/settings.pp b/manifests/common/settings.pp index d9a2277..f3a2b8b 100644 --- a/manifests/common/settings.pp +++ b/manifests/common/settings.pp @@ -3,73 +3,73 @@ class kolab::common::settings inherits kolab::settings { ## Parse the settings, or set them default ## - $real_kolab_base_dn = $kolab_base_dn ? { + $real_base_dn = $base_dn ? { nil => "dc=example,dc=com", - default => $kolab_base_dn + default => $base_dn } - $real_kolab_confdir = $kolab_confdir ? { + $real_confdir = $confdir ? { nil => "/etc/kolab/", - default => $kolab_confdir + default => $confdir } - $real_kolab_confdir_mode = $kolab_confdir_mode ? { + $real_confdir_mode = $confdir_mode ? { nil => 750, - default => $kolab_confdir_mode + default => $confdir_mode } - $real_kolab_group = $kolab_group ? { + $real_group = $group ? { nil => "kolab", - default => $kolab_group + default => $group } - $real_kolab_group_gid = $kolab_group_gid ? { + $real_group_gid = $group_gid ? { nil => 412, - default => $kolab_group_gid + default => $group_gid } - $real_kolab_manager_bind_dn = $kolab_manager_bind_dn ? { - nil => "cn=manager,cn=internal,$real_kolab_base_dn", - default => $kolab_manager_bind_dn + $real_manager_bind_dn = $manager_bind_dn ? { + nil => "cn=manager,cn=internal,$real_base_dn", + default => $manager_bind_dn } - $real_kolab_manager_bind_password = $kolab_manager_bind_password ? { + $real_manager_bind_password = $manager_bind_password ? { nil => "secret", - default => $kolab_manager_bind_password + default => $manager_bind_password } - $real_kolab_master = $kolab_master ? { + $real_master = $master ? { nil => "$fqdn", - default => $kolab_master + default => $master } - $real_kolab_php_bind_dn = $kolab_php_bind_dn ? { - nil => "cn=manager,cn=internal,$real_kolab_base_dn", - default => $kolab_php_bind_dn + $real_php_bind_dn = $php_bind_dn ? { + nil => "cn=manager,cn=internal,$real_base_dn", + default => $php_bind_dn } - $real_kolab_php_bind_password = $kolab_php_bind_password ? { + $real_php_bind_password = $php_bind_password ? { nil => "secret", - default => $kolab_php_bind_password + default => $php_bind_password } - $real_kolab_user = $kolab_user ? { + $real_user = $user ? { nil => "kolab", - default => $kolab_user + default => $user } - $real_kolab_user_homedir = $kolab_user_homedir ? { + $real_user_homedir = $user_homedir ? { nil => "/var/lib/kolab/", - default => $kolab_user_homedir + default => $user_homedir } - $real_kolab_user_shell = $kolab_user_shell ? { + $real_user_shell = $user_shell ? { nil => "/sbin/nologin", - default => $kolab_user_shell + default => $user_shell } - $real_kolab_user_uid = $kolab_user_uid ? { + $real_user_uid = $user_uid ? { nil => 412, - default => $kolab_user_uid + default => $user_uid } } \ No newline at end of file diff --git a/manifests/server.pp b/manifests/server.pp index 2aaa2d3..6d3b4c2 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -2,17 +2,17 @@ class kolab::server inherits kolab::common { include "kolab::server::$operatingsystem" # FIXME: This should actually be kolabd.conf - file { "$real_kolab_confdir/kolab.conf": + file { "$real_confdir/kolab.conf": ensure => file, - owner => "$real_kolab_user", - group => "$real_kolab_group", + owner => "$real_user", + group => "$real_group", mode => 640, content => template("kolab/server/kolabd.conf.erb"), notify => Service["kolabd"], require => [ - Group["$real_kolab_group"], + Group["$real_group"], Package["kolab-server"], - User["$real_kolab_user"] + User["$real_user"] ] } @@ -24,7 +24,7 @@ class kolab::server inherits kolab::common { ensure => running, enable => true, require => [ - File["$real_kolab_confdir/kolab.conf"], + File["$real_confdir/kolab.conf"], Package["kolab-server"] ] } diff --git a/manifests/settings.pp b/manifests/settings.pp index 95b2d3a..bfea784 100644 --- a/manifests/settings.pp +++ b/manifests/settings.pp @@ -16,43 +16,43 @@ class kolab::settings { # |-- webadmin (web administration interface configuration) # `-- webclient (web client interface configuration) # -# $kolab_confdir = "/etc/kolab/" +# $confdir = "/etc/kolab/" # - # The mode for the $kolab_confdir directory. By default, mode 750 is used, + # The mode for the $confdir directory. By default, mode 750 is used, # and so only the kolab user and group members have access. # # Change this is you want other utilities to have access to the Kolab - # configuration directory, configured with $kolab_confdir + # configuration directory, configured with $confdir # -# $kolab_confdir_mode = 750 +# $confdir_mode = 750 # # What MTA would you like kolab to integrate with? Possible values are: # # - postfix # -# $kolab_mta = "postfix" +# $mta = "postfix" ## ## Other settings we have not yet explicitly documented ## -# $kolab_calendar_id = "calendar" -# $kolab_calendar_password = "secret" +# $calendar_id = "calendar" +# $calendar_password = "secret" -# $kolab_imapserver = "cyrus" -# $kolab_user = "kolab" -# $kolab_user_homedir = "/var/lib/kolab/" -# $kolab_user_shell = "/sbin/nologin" -# $kolab_user_uid = 412 -# $kolab_group = "kolab" -# $kolab_group_gid = 412 -# $kolab_base_dn = "dc=example,dc=com" -# $kolab_manager_bind_dn = "cn=manager,cn=internal,$kolab_base_dn" -# $kolab_manager_bind_password = "secret" -# $kolab_manager_bind_password_hash = "{SSHA}rdnK47q9F2hSSjOVCI/paWaPjaDavFw7" +# $imapserver = "cyrus" +# $user = "kolab" +# $user_homedir = "/var/lib/kolab/" +# $user_shell = "/sbin/nologin" +# $user_uid = 412 +# $group = "kolab" +# $group_gid = 412 +# $base_dn = "dc=example,dc=com" +# $manager_bind_dn = "cn=manager,cn=internal,$base_dn" +# $manager_bind_password = "secret" +# $manager_bind_password_hash = "{SSHA}rdnK47q9F2hSSjOVCI/paWaPjaDavFw7" -# $kolab_php_bind_dn = "cn=nobody,cn=internal,$kolab_base_dn" -# $kolab_php_bind_password = "secret" +# $php_bind_dn = "cn=nobody,cn=internal,$base_dn" +# $php_bind_password = "secret" } \ No newline at end of file diff --git a/templates/server/kolabd.conf.erb b/templates/server/kolabd.conf.erb index 0e6ff37..547ad8e 100644 --- a/templates/server/kolabd.conf.erb +++ b/templates/server/kolabd.conf.erb @@ -6,24 +6,24 @@ # fqdnhostname : <%= fqdn -%> -<% if real_kolab_master == fqdn then %> +<% if real_master == fqdn then %> is_master : true <% else %> is_master : false <% end %> -base_dn : <%= real_kolab_base_dn -%> -bind_dn : <%= real_kolab_manager_bind_dn -%> -bind_pw : <%= real_kolab_manager_bind_password -%> +base_dn : <%= real_base_dn -%> +bind_dn : <%= real_manager_bind_dn -%> +bind_pw : <%= real_manager_bind_password -%> -ldap_uri : <%= real_kolab_ldap_uri -%> -ldap_master_uri : <%= real_kolab_ldap_master_uri -%> +ldap_uri : <%= real_ldap_uri -%> +ldap_master_uri : <%= real_ldap_master_uri -%> -php_dn : <%= real_kolab_php_bind_dn -%> -php_pw : <%= real_kolab_php_bind_password -%> +php_dn : <%= real_php_bind_dn -%> +php_pw : <%= real_php_bind_password -%> -calendar_id : <%= real_kolab_calendar_id -%> -calendar_pw : <%= real_kolab_calendar_password -%> +calendar_id : <%= real_calendar_id -%> +calendar_pw : <%= real_calendar_password -%> slurpd_addr : 127.0.0.1 slurpd_port : 9999 commit 368e64e4d286ef491fd7931d1030330044c74630 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 21:37:24 2010 +0200 Quote the inclusion of the operating system specific sub-class diff --git a/manifests/server.pp b/manifests/server.pp index 18846fe..2aaa2d3 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -1,5 +1,5 @@ class kolab::server inherits kolab::common { - include kolab::server::$operatingsystem + include "kolab::server::$operatingsystem" # FIXME: This should actually be kolabd.conf file { "$real_kolab_confdir/kolab.conf": @@ -28,4 +28,4 @@ class kolab::server inherits kolab::common { Package["kolab-server"] ] } -} \ No newline at end of file +} From jmeeuwen at puppetmanaged.org Mon May 24 21:56:33 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:56:33 +0200 Subject: [Commits] Branch 'development' - manifests/common.pp manifests/init.pp Message-ID: <201005241956.o4OJuXE9004885@master.puppetmanaged.org> manifests/common.pp | 3 -- manifests/init.pp | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 3 deletions(-) New commits: commit 90b14c472480a99619a277146bae86e7eb1d6655 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 21:53:40 2010 +0200 Update the location of the parsing of settings or providing a default, in order to shortcut the namespacing in templates diff --git a/manifests/common.pp b/manifests/common.pp index 9485efb..025fbc7 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -1,5 +1,4 @@ class kolab::common inherits kolab { - require kolab::common::settings @group { "$real_group": ensure => present, @@ -14,4 +13,4 @@ class kolab::common inherits kolab { comment => "Kolab System User", require => Group["$real_group"] } -} \ No newline at end of file +} diff --git a/manifests/init.pp b/manifests/init.pp index 921ef85..c3efdf8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,5 +27,79 @@ import 'server.pp' class kolab { # Include settings.pp - include kolab::settings + require kolab::settings + + ## + ## Parse the settings, or set them default + ## + + $real_base_dn = $base_dn ? { + nil => "dc=example,dc=com", + default => $base_dn + } + + $real_confdir = $confdir ? { + nil => "/etc/kolab/", + default => $confdir + } + + $real_confdir_mode = $confdir_mode ? { + nil => 750, + default => $confdir_mode + } + + $real_group = $group ? { + nil => "kolab", + default => $group + } + + $real_group_gid = $group_gid ? { + nil => 412, + default => $group_gid + } + + $real_manager_bind_dn = $manager_bind_dn ? { + nil => "cn=manager,cn=internal,$real_base_dn", + default => $manager_bind_dn + } + + $real_manager_bind_password = $manager_bind_password ? { + nil => "secret", + default => $manager_bind_password + } + + $real_master = $master ? { + nil => "$fqdn", + default => $master + } + + $real_php_bind_dn = $php_bind_dn ? { + nil => "cn=manager,cn=internal,$real_base_dn", + default => $php_bind_dn + } + + $real_php_bind_password = $php_bind_password ? { + nil => "secret", + default => $php_bind_password + } + + $real_user = $user ? { + nil => "kolab", + default => $user + } + + $real_user_homedir = $user_homedir ? { + nil => "/var/lib/kolab/", + default => $user_homedir + } + + $real_user_shell = $user_shell ? { + nil => "/sbin/nologin", + default => $user_shell + } + + $real_user_uid = $user_uid ? { + nil => 412, + default => $user_uid + } } From jmeeuwen at puppetmanaged.org Mon May 24 21:57:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 21:57:48 +0200 Subject: [Commits] Branch 'development' - manifests/common Message-ID: <201005241957.o4OJvmqI004942@master.puppetmanaged.org> manifests/common/settings.pp | 75 ------------------------------------------- 1 file changed, 75 deletions(-) New commits: commit d0f737eb3e19015aa6137271341fdc3f6e105d93 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 21:55:18 2010 +0200 We don't need this copy laying around diff --git a/manifests/common/settings.pp b/manifests/common/settings.pp deleted file mode 100644 index f3a2b8b..0000000 --- a/manifests/common/settings.pp +++ /dev/null @@ -1,75 +0,0 @@ -class kolab::common::settings inherits kolab::settings { - ## - ## Parse the settings, or set them default - ## - - $real_base_dn = $base_dn ? { - nil => "dc=example,dc=com", - default => $base_dn - } - - $real_confdir = $confdir ? { - nil => "/etc/kolab/", - default => $confdir - } - - $real_confdir_mode = $confdir_mode ? { - nil => 750, - default => $confdir_mode - } - - $real_group = $group ? { - nil => "kolab", - default => $group - } - - $real_group_gid = $group_gid ? { - nil => 412, - default => $group_gid - } - - $real_manager_bind_dn = $manager_bind_dn ? { - nil => "cn=manager,cn=internal,$real_base_dn", - default => $manager_bind_dn - } - - $real_manager_bind_password = $manager_bind_password ? { - nil => "secret", - default => $manager_bind_password - } - - $real_master = $master ? { - nil => "$fqdn", - default => $master - } - - $real_php_bind_dn = $php_bind_dn ? { - nil => "cn=manager,cn=internal,$real_base_dn", - default => $php_bind_dn - } - - $real_php_bind_password = $php_bind_password ? { - nil => "secret", - default => $php_bind_password - } - - $real_user = $user ? { - nil => "kolab", - default => $user - } - - $real_user_homedir = $user_homedir ? { - nil => "/var/lib/kolab/", - default => $user_homedir - } - - $real_user_shell = $user_shell ? { - nil => "/sbin/nologin", - default => $user_shell - } - - $real_user_uid = $user_uid ? { - nil => 412, - default => $user_uid - } -} \ No newline at end of file From jmeeuwen at puppetmanaged.org Mon May 24 22:15:52 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:15:52 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005242015.o4OKFq3a029603@master.puppetmanaged.org> manifests/init.pp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 9d7f6e0c06b77aa8c0e3fb0200def0a7f6facddf Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:13:17 2010 +0200 Update the conditionals for variable checking diff --git a/manifests/init.pp b/manifests/init.pp index c3efdf8..1c2c906 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -34,72 +34,72 @@ class kolab { ## $real_base_dn = $base_dn ? { - nil => "dc=example,dc=com", + '' => "dc=example,dc=com", default => $base_dn } $real_confdir = $confdir ? { - nil => "/etc/kolab/", + '' => "/etc/kolab/", default => $confdir } $real_confdir_mode = $confdir_mode ? { - nil => 750, + '' => 750, default => $confdir_mode } $real_group = $group ? { - nil => "kolab", + '' => "kolab", default => $group } $real_group_gid = $group_gid ? { - nil => 412, + '' => 412, default => $group_gid } $real_manager_bind_dn = $manager_bind_dn ? { - nil => "cn=manager,cn=internal,$real_base_dn", + '' => "cn=manager,cn=internal,$real_base_dn", default => $manager_bind_dn } $real_manager_bind_password = $manager_bind_password ? { - nil => "secret", + '' => "secret", default => $manager_bind_password } $real_master = $master ? { - nil => "$fqdn", + '' => "$fqdn", default => $master } $real_php_bind_dn = $php_bind_dn ? { - nil => "cn=manager,cn=internal,$real_base_dn", + '' => "cn=manager,cn=internal,$real_base_dn", default => $php_bind_dn } $real_php_bind_password = $php_bind_password ? { - nil => "secret", + '' => "secret", default => $php_bind_password } $real_user = $user ? { - nil => "kolab", + '' => "kolab", default => $user } $real_user_homedir = $user_homedir ? { - nil => "/var/lib/kolab/", + '' => "/var/lib/kolab/", default => $user_homedir } $real_user_shell = $user_shell ? { - nil => "/sbin/nologin", + '' => "/sbin/nologin", default => $user_shell } $real_user_uid = $user_uid ? { - nil => 412, + '' => 412, default => $user_uid } } From jmeeuwen at puppetmanaged.org Mon May 24 22:18:42 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:18:42 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005242018.o4OKIg1E029665@master.puppetmanaged.org> manifests/init.pp | 12 ++++++++++++ 1 file changed, 12 insertions(+) New commits: commit 178adef1423337ecc7f9a092f44ffa9225d1c4db Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:16:08 2010 +0200 Add ldap uri settings diff --git a/manifests/init.pp b/manifests/init.pp index 1c2c906..6893710 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -58,6 +58,18 @@ class kolab { default => $group_gid } + # FIXME: Make this conditional to real_ldap_master + # + $real_ldap_uri = $ldap_uri ? { + '' => "ldap://127.0.0.1:389", + default => $ldap_uri + } + + $real_ldap_master_uri = $ldap_master_uri ? { + '' => "ldap://127.0.0.1:389", + default => $ldap_master_uri + } + $real_manager_bind_dn = $manager_bind_dn ? { '' => "cn=manager,cn=internal,$real_base_dn", default => $manager_bind_dn From jmeeuwen at puppetmanaged.org Mon May 24 22:20:32 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:20:32 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005242020.o4OKKWWe004695@master.puppetmanaged.org> manifests/init.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) New commits: commit dd1484a2e8c0704f002127e54a181f1a33eeef2d Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:17:57 2010 +0200 Add calendar settings diff --git a/manifests/init.pp b/manifests/init.pp index 6893710..7ef2a80 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -38,6 +38,16 @@ class kolab { default => $base_dn } + $real_calendar_id = $calendar_id ? { + '' => "calendar", + default => $calendar_id + } + + $real_calendar_password = $calendar_password ? { + '' => "secret", + default => $calendar_password + } + $real_confdir = $confdir ? { '' => "/etc/kolab/", default => $confdir From jmeeuwen at puppetmanaged.org Mon May 24 22:25:46 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:25:46 +0200 Subject: [Commits] Branch 'development' - manifests/common.pp manifests/server manifests/server.pp Message-ID: <201005242025.o4OKPkqC005326@master.puppetmanaged.org> manifests/common.pp | 5 +++++ manifests/server.pp | 4 +--- manifests/server/debian.pp | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) New commits: commit 2e88f2f0ece0acccea035fe6c8b9930df9fc10d9 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:22:45 2010 +0200 Set the correct resource requirements for File["$real_confdir/kolab.conf"] diff --git a/manifests/common.pp b/manifests/common.pp index 025fbc7..309a50a 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -1,5 +1,10 @@ class kolab::common inherits kolab { + ## + ## These are common resources for kolab, but may only + ## apply to certain operating systems + ## + @group { "$real_group": ensure => present, gid => $real_group_gid diff --git a/manifests/server.pp b/manifests/server.pp index 6d3b4c2..925e187 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -10,9 +10,7 @@ class kolab::server inherits kolab::common { content => template("kolab/server/kolabd.conf.erb"), notify => Service["kolabd"], require => [ - Group["$real_group"], - Package["kolab-server"], - User["$real_user"] + Package["kolab-server"] ] } diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp index 2f29263..09d3de0 100644 --- a/manifests/server/debian.pp +++ b/manifests/server/debian.pp @@ -2,4 +2,18 @@ # class kolab::server::debian inherits kolab::server { -} \ No newline at end of file + + # Suppose Debian packages do not themselves create + # the user/group accounts needed. In that case; + File["$real_confdir/kolabd.conf"] { + require +> [ + Group["$real_group"], + User["$real_group"] + ] + } + + realize( + Group["$real_group"], + User["$real_user"] + ) +} From jmeeuwen at puppetmanaged.org Mon May 24 22:28:16 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:28:16 +0200 Subject: [Commits] Branch 'development' - templates/server Message-ID: <201005242028.o4OKSGt3005384@master.puppetmanaged.org> templates/server/kolabd.conf.erb | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) New commits: commit a4de0a4c48eb808e8f7104fa6d3d7ea723e3ac4b Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:25:27 2010 +0200 Fix newlines, Remove example config now that troubleshooting is over (sort of) diff --git a/templates/server/kolabd.conf.erb b/templates/server/kolabd.conf.erb index 547ad8e..5f6bc2c 100644 --- a/templates/server/kolabd.conf.erb +++ b/templates/server/kolabd.conf.erb @@ -5,40 +5,24 @@ # FIXME: If this where a configuration file in .INI format, we could use Augeas # fqdnhostname : <%= fqdn -%> - <% if real_master == fqdn then %> is_master : true <% else %> is_master : false <% end %> +base_dn : <%= real_base_dn %> +bind_dn : <%= real_manager_bind_dn %> +bind_pw : <%= real_manager_bind_password %> -base_dn : <%= real_base_dn -%> -bind_dn : <%= real_manager_bind_dn -%> -bind_pw : <%= real_manager_bind_password -%> - -ldap_uri : <%= real_ldap_uri -%> -ldap_master_uri : <%= real_ldap_master_uri -%> +ldap_uri : <%= real_ldap_uri %> +ldap_master_uri : <%= real_ldap_master_uri %> -php_dn : <%= real_php_bind_dn -%> -php_pw : <%= real_php_bind_password -%> +php_dn : <%= real_php_bind_dn %> +php_pw : <%= real_php_bind_password %> -calendar_id : <%= real_calendar_id -%> -calendar_pw : <%= real_calendar_password -%> +calendar_id : <%= real_calendar_id %> +calendar_pw : <%= real_calendar_password %> slurpd_addr : 127.0.0.1 slurpd_port : 9999 -fqdnhostname : laurel.kanarip.com -is_master : true -base_dn : dc=kanarip,dc=com -bind_dn : cn=manager,cn=internal,dc=kanarip,dc=com -bind_pw : secret -bind_pw_hash : {SSHA}rdnK47q9F2hSSjOVCI/paWaPjaDavFw7 -ldap_uri : ldap://127.0.0.1:389 -ldap_master_uri : ldap://127.0.0.1:389 -php_dn : cn=nobody,cn=internal,dc=kanarip,dc=com -php_pw : euU8MT5xVp2jPshCKurCSv8RwrZR8U6nc6JLHKAC -calendar_id : calendar -calendar_pw : 8Y1d4XHA5ClCZu4TffMeGreo5IrkGylFl5TpZ+nY -slurpd_addr : 127.0.0.1 -slurpd_port : 9999 From jmeeuwen at puppetmanaged.org Mon May 24 22:31:39 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:31:39 +0200 Subject: [Commits] Branch 'development' - templates/server Message-ID: <201005242031.o4OKVdBI014960@master.puppetmanaged.org> templates/server/kolabd.conf.erb | 2 ++ 1 file changed, 2 insertions(+) New commits: commit ca30ae8b60374598301191aacfddce215ddd6a3e Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:29:07 2010 +0200 Add the password hash, it helps diff --git a/templates/server/kolabd.conf.erb b/templates/server/kolabd.conf.erb index 5f6bc2c..8ccf025 100644 --- a/templates/server/kolabd.conf.erb +++ b/templates/server/kolabd.conf.erb @@ -11,8 +11,10 @@ is_master : true is_master : false <% end %> base_dn : <%= real_base_dn %> + bind_dn : <%= real_manager_bind_dn %> bind_pw : <%= real_manager_bind_password %> +bind_pw_hash : <%= real_manager_bind_password_hash %> ldap_uri : <%= real_ldap_uri %> ldap_master_uri : <%= real_ldap_master_uri %> From jmeeuwen at puppetmanaged.org Mon May 24 22:48:40 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:48:40 +0200 Subject: [Commits] Branch 'development' - 2 commits - manifests/init.pp plugins/puppet Message-ID: <201005242048.o4OKmeq0026372@master.puppetmanaged.org> manifests/init.pp | 5 +++++ plugins/puppet/parser/functions/create_password_hash.rb | 8 ++++++++ 2 files changed, 13 insertions(+) New commits: commit aec47094596959f0f14ba3f743d2eca8fd410c18 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:45:44 2010 +0200 Add real_manager_bind_password_hash, and use a new function to create the hash if not explicitly supplied through settings diff --git a/manifests/init.pp b/manifests/init.pp index 7ef2a80..64ca23a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -90,6 +90,11 @@ class kolab { default => $manager_bind_password } + $real_manager_bind_password_hash = $manager_bind_password_hash ? { + '' => create_password_hash($real_manager_bind_password), + default => $manager_bind_password_hash + } + $real_master = $master ? { '' => "$fqdn", default => $master commit 9d8961e43b9e2cb0ed02b536d199d64393b584a4 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:44:59 2010 +0200 Add a create_password_hash function to Puppet diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb new file mode 100644 index 0000000..550e412 --- /dev/null +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -0,0 +1,8 @@ +require 'digest/sha1' + +module Puppet::Parser::Functions + newfunction(:create_password_hash) do |args| + password = args[0] + SHA1.new(password).to_s + end +end From jmeeuwen at puppetmanaged.org Mon May 24 22:54:49 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 22:54:49 +0200 Subject: [Commits] Branch 'development' - plugins/puppet Message-ID: <201005242054.o4OKsnWo005398@master.puppetmanaged.org> plugins/puppet/parser/functions/create_password_hash.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 7feb3199a6fd253650cd1b8a7aa1cbe0b43a7d44 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:52:18 2010 +0200 Update create_password_hash function diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb index 550e412..c59b862 100644 --- a/plugins/puppet/parser/functions/create_password_hash.rb +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -2,7 +2,6 @@ require 'digest/sha1' module Puppet::Parser::Functions newfunction(:create_password_hash) do |args| - password = args[0] - SHA1.new(password).to_s + Digest::SHA1.hexdigest(args[0]) end end From jmeeuwen at puppetmanaged.org Mon May 24 23:00:03 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 23:00:03 +0200 Subject: [Commits] Branch 'development' - plugins/puppet Message-ID: <201005242100.o4OL03AS006078@master.puppetmanaged.org> plugins/puppet/parser/functions/create_password_hash.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 801ae4f41bec5c395c1646bba21ab48ca85f6d1e Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:57:31 2010 +0200 That's not what I wanted. Shell out diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb index c59b862..a977190 100644 --- a/plugins/puppet/parser/functions/create_password_hash.rb +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -1,7 +1,5 @@ -require 'digest/sha1' - module Puppet::Parser::Functions newfunction(:create_password_hash) do |args| - Digest::SHA1.hexdigest(args[0]) + %x{slappasswd -s args[0]} end end From jmeeuwen at puppetmanaged.org Mon May 24 23:00:44 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 23:00:44 +0200 Subject: [Commits] Branch 'development' - plugins/puppet Message-ID: <201005242100.o4OL0iMi013710@master.puppetmanaged.org> plugins/puppet/parser/functions/create_password_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 27142dd915dd66e9789d283b5b30f8e4fcebb743 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:58:11 2010 +0200 The function does not return anything diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb index a977190..49de6ad 100644 --- a/plugins/puppet/parser/functions/create_password_hash.rb +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -1,5 +1,5 @@ module Puppet::Parser::Functions newfunction(:create_password_hash) do |args| - %x{slappasswd -s args[0]} + setcode do %x{slappasswd -s args[0]} end end end From jmeeuwen at puppetmanaged.org Mon May 24 23:01:38 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 23:01:38 +0200 Subject: [Commits] Branch 'development' - plugins/puppet Message-ID: <201005242101.o4OL1cRe015435@master.puppetmanaged.org> plugins/puppet/parser/functions/create_password_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e3ad40163a29c624d09bf3d318bda9f15ca12e9 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 22:59:06 2010 +0200 Do I have to print the value maybe? diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb index 49de6ad..dcc0ac8 100644 --- a/plugins/puppet/parser/functions/create_password_hash.rb +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -1,5 +1,5 @@ module Puppet::Parser::Functions newfunction(:create_password_hash) do |args| - setcode do %x{slappasswd -s args[0]} end + puts %x{slappasswd -s args[0]} end end From jmeeuwen at puppetmanaged.org Mon May 24 23:03:00 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 23:03:00 +0200 Subject: [Commits] Branch 'development' - plugins/puppet Message-ID: <201005242103.o4OL301B015492@master.puppetmanaged.org> plugins/puppet/parser/functions/create_password_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40601aea3cc44570ea81d4308899d398fece2d71 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 23:00:18 2010 +0200 Maybe if I RTF Puppet M? ;-) diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb index dcc0ac8..8777b81 100644 --- a/plugins/puppet/parser/functions/create_password_hash.rb +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -1,5 +1,5 @@ module Puppet::Parser::Functions - newfunction(:create_password_hash) do |args| + newfunction(:create_password_hash, :type => :rvalue) do |args| puts %x{slappasswd -s args[0]} end end From jmeeuwen at puppetmanaged.org Mon May 24 23:03:44 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 24 May 2010 23:03:44 +0200 Subject: [Commits] Branch 'development' - plugins/puppet Message-ID: <201005242103.o4OL3iHq015549@master.puppetmanaged.org> plugins/puppet/parser/functions/create_password_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03812588029e352988c3fbf9fdc1c715b81b19b4 Author: Jeroen van Meeuwen (Kolab Systems) Date: Mon May 24 23:01:16 2010 +0200 Without the puts diff --git a/plugins/puppet/parser/functions/create_password_hash.rb b/plugins/puppet/parser/functions/create_password_hash.rb index 8777b81..7f6a360 100644 --- a/plugins/puppet/parser/functions/create_password_hash.rb +++ b/plugins/puppet/parser/functions/create_password_hash.rb @@ -1,5 +1,5 @@ module Puppet::Parser::Functions newfunction(:create_password_hash, :type => :rvalue) do |args| - puts %x{slappasswd -s args[0]} + %x{slappasswd -s args[0]} end end From jmeeuwen at puppetmanaged.org Tue May 25 01:54:28 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 25 May 2010 01:54:28 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005242354.o4ONsSGN025854@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 1 + 1 file changed, 1 insertion(+) New commits: commit db6667453de76b168d899869be58e220d535c286 Author: Jeroen van Meeuwen (Ergo Project) Date: Tue May 25 01:51:54 2010 +0200 Add kolab-docs.git repository diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 61d2bd6..6ba1a87 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -169,6 +169,7 @@ node 'master.puppetmanaged.org' { # Git repositories for Kolab git::repository { [ "kolab-debian.git", + "kolab-docs.git", "kolab-fedora.git", "kolab-server.git" ]: From ynemoy at puppetmanaged.org Tue May 25 17:25:41 2010 From: ynemoy at puppetmanaged.org (Yaakov Nemoy) Date: Tue, 25 May 2010 17:25:41 +0200 Subject: [Commits] Changes to 'module-fix' Message-ID: <201005251525.o4PFPfav016824@master.puppetmanaged.org> New branch 'module-fix' available with the following commits: commit dcfab251815075999f172baa3c7b3c9d951e94e7 Author: Yaakov M. Nemoy Date: Thu May 20 12:47:09 2010 +0200 Sets modsecurity files always present Apparently there is a bug in puppet in regards to recursively disabled directories. This patch just puts all the files in place, even when not used, as a workaround. To track the bug, please see: http://projects.reductivelabs.com/issues/3835 commit 52ab46b6d845d7c8e15e66ec5f182191400be4fc Author: Yaakov M. Nemoy Date: Thu May 20 12:48:53 2010 +0200 Switches over the premade profiles to use the standard bloated webserver ipv the non functioning base class commit 00dfb067761c844714b1d78dfd82a6027d204c7f Author: Yaakov M. Nemoy Date: Thu May 20 11:38:03 2010 +0200 Create a minimal profile that we need in the UMC commit a7f9844f6f93fd7156e8b26c95573ad40ff88bb4 Author: Yaakov M. Nemoy Date: Thu May 20 11:33:06 2010 +0200 Create a standard webserver profile commit 93a8ff5932246b5b0dd64c2b45537b3f276adbb9 Author: Yaakov M. Nemoy Date: Thu May 20 11:23:41 2010 +0200 Replaces some subclasses with more sensical usage of module commit f04451b1cabd49662cfafa1c024aedf19d348441 Author: Yaakov M. Nemoy Date: Thu May 20 11:08:01 2010 +0200 Fixes the modules so there is a single define for all modules that does the right thing no matter what You can see that this changes the API for modules, but it makes it more uniform with the way we think about defined resources anyways. This fixes some severe issues we had trying to disable modules to create a minimal profile for apache. Because of how inheritance works, the old system could not override settings via the definitions. This allows inheritance to work as it should commit a8e3a8d724bdf797ada111b8aabb4081260e5e36 Author: Yaakov M. Nemoy Date: Wed May 19 15:48:38 2010 +0200 Replaces module class with module definition From jmeeuwen at puppetmanaged.org Thu May 27 09:43:07 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 27 May 2010 09:43:07 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005270743.o4R7h7Ac029551@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 1 + 1 file changed, 1 insertion(+) New commits: commit fcbfada67bbc97fa45af078a5b8b87ecfe27e24d Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 27 09:39:11 2010 +0200 Add kolabsys.com domain name space specific configuration tree git repository diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 6ba1a87..0897be0 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -243,6 +243,7 @@ node 'master.puppetmanaged.org' { "baard.xs4all.nl", "fedoraproject.org", "genomicscenter.nl", + "kolabsys.com", "svanwingerden.nl", "the-cave-of-steef.nl" ]: From jmeeuwen at puppetmanaged.org Thu May 27 10:30:27 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 27 May 2010 10:30:27 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005270830.o4R8URfe021099@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit f38c8cfff0c608ed0b5a4997c871a03ca1042c7d Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 27 10:27:40 2010 +0200 Add kolabsys.com-sensitive git repository diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 0897be0..e95f540 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -243,7 +243,6 @@ node 'master.puppetmanaged.org' { "baard.xs4all.nl", "fedoraproject.org", "genomicscenter.nl", - "kolabsys.com", "svanwingerden.nl", "the-cave-of-steef.nl" ]: @@ -288,6 +287,21 @@ node 'master.puppetmanaged.org' { } git::repository::domain { [ + "kolabsys.com", + "kolabsys.com-sensitive" + ]: + localtree => "/data/scm/git/git.puppetmanaged.org/", + shared => true, + public => false, + owner => "root", + group => "git-$name", + prefix => "domain", + symlink_prefix => "puppet", + description => "Domain specific configuration", + recipients => [ "vanmeeuwen at kolabsys.com", "wickert at kolabsys.com" ] + } + + git::repository::domain { [ "rpmfusion.net" ]: localtree => "/data/scm/git/git.puppetmanaged.org/", From jmeeuwen at puppetmanaged.org Thu May 27 11:34:34 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 27 May 2010 11:34:34 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005270934.o4R9YY2V013405@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 3 +++ 1 file changed, 3 insertions(+) New commits: commit b5cc6c485b8b0f3734eac488f2564440b09cf0fd Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 27 11:31:55 2010 +0200 Add kolabsys.com to the mix diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index e95f540..aa75afa 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -447,6 +447,7 @@ node 'master.puppetmanaged.org' { "fedoraunity.org", "genomicscenter.nl", "kanarip.com", + "kolabsys.com", "ogd.nl", "puppetmanaged.org", "rpmfusion.net", @@ -465,6 +466,7 @@ node 'master.puppetmanaged.org' { "fedoraunity.org", "genomicscenter.nl", "kanarip.com", + "kolabsys.com", "ogd.nl", "puppetmanaged.org", "rpmfusion.net", @@ -483,6 +485,7 @@ node 'master.puppetmanaged.org' { "fedoraunity.org", "genomicscenter.nl", "kanarip.com", + "kolabsys.com", "ogd.nl", "puppetmanaged.org", "rpmfusion.net", From jmeeuwen at puppetmanaged.org Thu May 27 22:32:31 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 27 May 2010 22:32:31 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005272032.o4RKWVHM000308@master.puppetmanaged.org> manifests/init.pp | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) New commits: commit d7d20e03adc13d08c02489edb660d2ec461b18eb Author: Jeroen van Meeuwen (Ergo Project) Date: Thu May 27 22:29:29 2010 +0200 Require the munin::client class to be applied before starting to go about rolling out plugins and requiring Package["munin-node"] diff --git a/manifests/init.pp b/manifests/init.pp index d8dd90e..0f2513f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -128,16 +128,19 @@ class munin { default => absent }, links => manage, - require => $plugin_name ? { - false => [ - File["/usr/share/munin/plugins/$name"], - Package["munin-node"] - ], - default => [ - File["/usr/share/munin/plugins/$plugin_name"], - Package["munin-node"] - ], - }, + require => [ + $plugin_name ? { + false => [ + File["/usr/share/munin/plugins/$name"], + Package["munin-node"] + ], + default => [ + File["/usr/share/munin/plugins/$plugin_name"], + Package["munin-node"] + ], + }, + Class["munin::client"] + ], notify => Service["munin-node"] } @@ -161,7 +164,10 @@ class munin { default => $source }, notify => Service["munin-node"], - require => Package["munin-node"] + require => [ + Class["munin::client"], + Package["munin-node"] + ] } } } else { @@ -183,7 +189,10 @@ class munin { default => $source }, notify => Service["munin-node"], - require => Package["munin-node"] + require => [ + Class["munin::client"], + Package["munin-node"] + ] } } @@ -202,7 +211,10 @@ class munin { default => absent }, notify => Service["munin-node"], - require => Package["munin-node"] + require => [ + Class["munin::client"], + Package["munin-node"] + ] } } @@ -222,7 +234,10 @@ class munin { }, source => $conf, notify => Service["munin-node"], - require => Package["munin-node"] + require => [ + Class["munin::client"], + Package["munin-node"] + ] } } } From jmeeuwen at puppetmanaged.org Fri May 28 09:34:28 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 28 May 2010 09:34:28 +0200 Subject: [Commits] Branch 'development' - 2 commits - manifests/init.pp Message-ID: <201005280734.o4S7YSAQ023973@master.puppetmanaged.org> manifests/init.pp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) New commits: commit da4cb5708a6ead7135a7221d2730afaed489634b Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:31:37 2010 +0200 Remove the view and zone inclusion magic from the module diff --git a/manifests/init.pp b/manifests/init.pp index 8e87688..83ae1f5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -32,9 +32,9 @@ class dns { ] } - File["/etc/named.conf"] { - content +> template('dns/zone.conf.erb') - } +# File["/etc/named.conf"] { +# content +> template('dns/zone.conf.erb') +# } } define view($enable = true) { commit bf4d28573b676935afb22740ee49f5bf04987d6c Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:27:58 2010 +0200 Update module for dns management diff --git a/manifests/init.pp b/manifests/init.pp index 7c3c1ea..8e87688 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,8 +25,10 @@ class dns { default => absent }, source => [ - "puppet://$server/private/$environment/dns/zones/$name.zone", - "puppet://$server/files/dns/zones/$name.zone" + "puppet://$server/private/$environment/dns/$view/$name.zone", + "puppet://$server/private/$environment/dns/$name.zone", + "puppet://$server/files/dns/$view/$name.zone" + "puppet://$server/files/dns/$name.zone" ] } @@ -35,12 +37,18 @@ class dns { } } - define view() { + define view($enable = true) { file { "/var/named/$name/": owner => "named", group => "named", mode => 750, - ensure => directory + ensure => $enable ? { + true => directory, + default => absent + }, + recurse => true, + force => true, + purge => true } } } \ No newline at end of file From jmeeuwen at puppetmanaged.org Fri May 28 09:47:19 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 28 May 2010 09:47:19 +0200 Subject: [Commits] Branch 'development' - 5 commits - files/named.root files/named.root.hints manifests/init.pp Message-ID: <201005280747.o4S7lJCQ014218@master.puppetmanaged.org> files/named.root | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ files/named.root.hints | 15 +++++++++++++ manifests/init.pp | 14 ++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) New commits: commit b5a7b01b855e07dec9e19b272972aca4034d788e Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:44:41 2010 +0200 Fix typo diff --git a/manifests/init.pp b/manifests/init.pp index bd98e9f..a13a9c1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -39,7 +39,7 @@ class dns { source => [ "puppet://$server/private/$environment/dns/$view/$name.zone", "puppet://$server/private/$environment/dns/$name.zone", - "puppet://$server/files/dns/$view/$name.zone" + "puppet://$server/files/dns/$view/$name.zone", "puppet://$server/files/dns/$name.zone" ] } commit b25b6a4fb392d56904677c0901715b5cd4347f7f Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:36:44 2010 +0200 Add /var/named/named.root diff --git a/manifests/init.pp b/manifests/init.pp index bb1ec86..bd98e9f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -19,6 +19,12 @@ class dns { "puppet://$server/dns/named.root.hints" ] } + + file { "/var/named/named.root": + source => [ + "puppet://$server/dns/named.root" + ] + } } define zone( $enable = true, $view = "world" ) { commit a4004ff8d572c8bc62595f1435c678eb533c6ae7 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:36:18 2010 +0200 Add named.root as well diff --git a/files/named.root b/files/named.root new file mode 100644 index 0000000..90490ce --- /dev/null +++ b/files/named.root @@ -0,0 +1,53 @@ + +; <<>> DiG 9.5.0b2 <<>> +bufsize=1200 +norec NS . @a.root-servers.net +;; global options: printcmd +;; Got answer: +;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 7033 +;; flags: qr aa; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 20 + +;; OPT PSEUDOSECTION: +; EDNS: version: 0, flags:; udp: 4096 +;; QUESTION SECTION: +;. IN NS + +;; ANSWER SECTION: +. 518400 IN NS D.ROOT-SERVERS.NET. +. 518400 IN NS E.ROOT-SERVERS.NET. +. 518400 IN NS F.ROOT-SERVERS.NET. +. 518400 IN NS G.ROOT-SERVERS.NET. +. 518400 IN NS H.ROOT-SERVERS.NET. +. 518400 IN NS I.ROOT-SERVERS.NET. +. 518400 IN NS J.ROOT-SERVERS.NET. +. 518400 IN NS K.ROOT-SERVERS.NET. +. 518400 IN NS L.ROOT-SERVERS.NET. +. 518400 IN NS M.ROOT-SERVERS.NET. +. 518400 IN NS A.ROOT-SERVERS.NET. +. 518400 IN NS B.ROOT-SERVERS.NET. +. 518400 IN NS C.ROOT-SERVERS.NET. + +;; ADDITIONAL SECTION: +A.ROOT-SERVERS.NET. 3600000 IN A 198.41.0.4 +A.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:503:ba3e::2:30 +B.ROOT-SERVERS.NET. 3600000 IN A 192.228.79.201 +C.ROOT-SERVERS.NET. 3600000 IN A 192.33.4.12 +D.ROOT-SERVERS.NET. 3600000 IN A 128.8.10.90 +E.ROOT-SERVERS.NET. 3600000 IN A 192.203.230.10 +F.ROOT-SERVERS.NET. 3600000 IN A 192.5.5.241 +F.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:500:2f::f +G.ROOT-SERVERS.NET. 3600000 IN A 192.112.36.4 +H.ROOT-SERVERS.NET. 3600000 IN A 128.63.2.53 +H.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:500:1::803f:235 +I.ROOT-SERVERS.NET. 3600000 IN A 192.36.148.17 +J.ROOT-SERVERS.NET. 3600000 IN A 192.58.128.30 +J.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:503:c27::2:30 +K.ROOT-SERVERS.NET. 3600000 IN A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:7fd::1 +L.ROOT-SERVERS.NET. 3600000 IN A 199.7.83.42 +M.ROOT-SERVERS.NET. 3600000 IN A 202.12.27.33 +M.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:dc3::35 + +;; Query time: 110 msec +;; SERVER: 198.41.0.4#53(198.41.0.4) +;; WHEN: Tue Feb 26 15:05:57 2008 +;; MSG SIZE rcvd: 615 + commit c89719c7454504f21ebce97ed21ce175847c57b8 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:35:14 2010 +0200 Add /etc/named.root.hints to the managed files diff --git a/manifests/init.pp b/manifests/init.pp index 83ae1f5..bb1ec86 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,6 +13,12 @@ class dns { "puppet://$server/dns/named.conf" ] } + + file { "/etc/named.root.hints": + source => [ + "puppet://$server/dns/named.root.hints" + ] + } } define zone( $enable = true, $view = "world" ) { commit e09645b3602c4bdf5318e625507dc8674fe3fad0 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 09:33:44 2010 +0200 Add named.root.hints diff --git a/files/named.root.hints b/files/named.root.hints new file mode 100644 index 0000000..7c5971d --- /dev/null +++ b/files/named.root.hints @@ -0,0 +1,15 @@ +// +// The 'named.root' root cache hints zone for the bind DNS 'named' nameserver. +// +// named's cache must be primed with the addresses of the root zone '.' nameservers. +// The root zone file can be obtained by querying the root 'A' nameserver: +// $ dig . ns @198.41.0.4 > named.root +// Or by download via FTP / HTTP: +// $ wget ftp://ftp.rs.internic.net/domain/named.root +// +// Every view that is to provide recursive service must include this zone. +// +zone "." IN { + type hint; + file "named.root"; +}; \ No newline at end of file From jmeeuwen at puppetmanaged.org Fri May 28 10:37:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 28 May 2010 10:37:48 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201005280837.o4S8bmiJ001552@master.puppetmanaged.org> puppet/manifests/utils/file.pp | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 1d2363ba2ab53cd632f8e97dd85423bbe266dffb Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 10:35:03 2010 +0200 Add default for file to follow links diff --git a/puppet/manifests/utils/file.pp b/puppet/manifests/utils/file.pp new file mode 100644 index 0000000..27c50e5 --- /dev/null +++ b/puppet/manifests/utils/file.pp @@ -0,0 +1,3 @@ +File { + links => follow +} \ No newline at end of file From jmeeuwen at puppetmanaged.org Fri May 28 11:52:15 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 28 May 2010 11:52:15 +0200 Subject: [Commits] Branch 'development' - 2 commits - files/iptables files/iptables-functions Message-ID: <201005280952.o4S9qFAd029013@master.puppetmanaged.org> files/iptables | 4 ++++ files/iptables-functions | 4 ++++ 2 files changed, 8 insertions(+) New commits: commit 1fc9aa8fe8ff12e77a4abf0e22e265e8d473284e Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 11:49:12 2010 +0200 Allow an environment variable called LOG_DROPPED to be set, and hence enable logging at exactly the right moment diff --git a/files/iptables b/files/iptables index 7e65229..61da363 100644 --- a/files/iptables +++ b/files/iptables @@ -97,6 +97,10 @@ $iptables -P INPUT DROP # $iptables -A FORWARD -m tcp -p tcp -m state --state RELATED,ESTABLISHED -j ACCEPT $iptables -A FORWARD -m udp -p udp -m state --state RELATED,ESTABLISHED -j ACCEPT + +[ ! -n "$LOG_DROPPED" ] && \ + $iptables -A FORWARD -j LOG --log-prefix='FORWARD(DROP): ' + $iptables -P FORWARD DROP allow_icmp commit 84f10019885883d530a0ed13af8525674ed6bb5a Author: Jeroen van Meeuwen (Fedora Unity) Date: Mon Apr 12 13:02:47 2010 +0200 Add function allow_nsca diff --git a/files/iptables-functions b/files/iptables-functions index 5b8683b..11ca51d 100644 --- a/files/iptables-functions +++ b/files/iptables-functions @@ -289,6 +289,10 @@ function allow_nrpe() { allow_standard_protocol "5666" "tcp" $@ } +function allow_nsca() { + allow_standard_protocol "5667" "tcp" $@ +} + function allow_ntp() { allow_standard_protocol "123" "udp" $@ } From jmeeuwen at puppetmanaged.org Fri May 28 12:05:41 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 28 May 2010 12:05:41 +0200 Subject: [Commits] Branch 'development' - files/iptables Message-ID: <201005281005.o4SA5few014590@master.puppetmanaged.org> files/iptables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 740ff08416df6f9ccb379bff024bb40f59b16973 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 12:03:03 2010 +0200 Use -z, not -n diff --git a/files/iptables b/files/iptables index 61da363..63bed51 100644 --- a/files/iptables +++ b/files/iptables @@ -98,7 +98,7 @@ $iptables -P INPUT DROP $iptables -A FORWARD -m tcp -p tcp -m state --state RELATED,ESTABLISHED -j ACCEPT $iptables -A FORWARD -m udp -p udp -m state --state RELATED,ESTABLISHED -j ACCEPT -[ ! -n "$LOG_DROPPED" ] && \ +[ ! -z "$LOG_DROPPED" ] && \ $iptables -A FORWARD -j LOG --log-prefix='FORWARD(DROP): ' $iptables -P FORWARD DROP From jmeeuwen at puppetmanaged.org Fri May 28 22:38:06 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 28 May 2010 22:38:06 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005282038.o4SKc6Cu015201@master.puppetmanaged.org> manifests/init.pp | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) New commits: commit b16cc29e29abdc15609d2fbe428a79cb9fd5ade2 Author: Jeroen van Meeuwen (Ergo Project) Date: Fri May 28 22:35:31 2010 +0200 Revert "Require the munin::client class to be applied before starting to go about rolling out plugins and requiring Package["munin-node"]" This reverts commit d7d20e03adc13d08c02489edb660d2ec461b18eb. diff --git a/manifests/init.pp b/manifests/init.pp index 0f2513f..d8dd90e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -128,19 +128,16 @@ class munin { default => absent }, links => manage, - require => [ - $plugin_name ? { - false => [ - File["/usr/share/munin/plugins/$name"], - Package["munin-node"] - ], - default => [ - File["/usr/share/munin/plugins/$plugin_name"], - Package["munin-node"] - ], - }, - Class["munin::client"] - ], + require => $plugin_name ? { + false => [ + File["/usr/share/munin/plugins/$name"], + Package["munin-node"] + ], + default => [ + File["/usr/share/munin/plugins/$plugin_name"], + Package["munin-node"] + ], + }, notify => Service["munin-node"] } @@ -164,10 +161,7 @@ class munin { default => $source }, notify => Service["munin-node"], - require => [ - Class["munin::client"], - Package["munin-node"] - ] + require => Package["munin-node"] } } } else { @@ -189,10 +183,7 @@ class munin { default => $source }, notify => Service["munin-node"], - require => [ - Class["munin::client"], - Package["munin-node"] - ] + require => Package["munin-node"] } } @@ -211,10 +202,7 @@ class munin { default => absent }, notify => Service["munin-node"], - require => [ - Class["munin::client"], - Package["munin-node"] - ] + require => Package["munin-node"] } } @@ -234,10 +222,7 @@ class munin { }, source => $conf, notify => Service["munin-node"], - require => [ - Class["munin::client"], - Package["munin-node"] - ] + require => Package["munin-node"] } } } From jmeeuwen at puppetmanaged.org Sat May 29 18:42:53 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 29 May 2010 18:42:53 +0200 Subject: [Commits] Branch 'development' - files/iptables-functions Message-ID: <201005291642.o4TGgrN9007929@master.puppetmanaged.org> files/iptables-functions | 1 + 1 file changed, 1 insertion(+) New commits: commit 80066eac354acc882f2a10f364d0fc07058f449a Author: Jeroen van Meeuwen (Ergo Project) Date: Sat May 29 18:39:59 2010 +0200 If ICMP is allowed from X to Y, then maybe ICMP from Y to X should be allowed as well diff --git a/files/iptables-functions b/files/iptables-functions index 11ca51d..69be86a 100644 --- a/files/iptables-functions +++ b/files/iptables-functions @@ -227,6 +227,7 @@ function allow_icmp() { [ -z "$2" ] && destination="-d 0/0" || destination="-d $2" [ -z "$3" ] && chain="INPUT" || chain="$3" $iptables -A $chain $source $destination -p icmp -j ACCEPT + $iptables -A $chain $destination $source -p icmp -j ACCEPT } function allow_imap() { From jmeeuwen at puppetmanaged.org Sat May 29 18:57:53 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 29 May 2010 18:57:53 +0200 Subject: [Commits] Branch 'development' - files/iptables Message-ID: <201005291657.o4TGvrIJ031102@master.puppetmanaged.org> files/iptables | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 08c851cb3d017495287618a39535c84758b0ce9c Author: Jeroen van Meeuwen (Ergo Project) Date: Sat May 29 18:54:54 2010 +0200 If $LOG_DROPPED is set, let's also log the dropping of input packets (and thus also output packets) diff --git a/files/iptables b/files/iptables index 63bed51..21593eb 100644 --- a/files/iptables +++ b/files/iptables @@ -98,8 +98,11 @@ $iptables -P INPUT DROP $iptables -A FORWARD -m tcp -p tcp -m state --state RELATED,ESTABLISHED -j ACCEPT $iptables -A FORWARD -m udp -p udp -m state --state RELATED,ESTABLISHED -j ACCEPT -[ ! -z "$LOG_DROPPED" ] && \ +if [ ! -z "$LOG_DROPPED" ]; then + $iptables -A INPUT -j LOG --log-prefix='INPUT(DROP): ' $iptables -A FORWARD -j LOG --log-prefix='FORWARD(DROP): ' + $iptables -A OUTPUT -j LOG --log-prefix='OUTPUT(DROP): ' +fi $iptables -P FORWARD DROP From jmeeuwen at puppetmanaged.org Sat May 29 19:09:18 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 29 May 2010 19:09:18 +0200 Subject: [Commits] Branch 'development' - files/iptables Message-ID: <201005291709.o4TH9IMG022856@master.puppetmanaged.org> files/iptables | 1 - 1 file changed, 1 deletion(-) New commits: commit a6df5d618fcf5984bfe78fd4584eb1b188604bab Author: Jeroen van Meeuwen (Ergo Project) Date: Sat May 29 19:06:36 2010 +0200 Fix output, this chain accepts by default diff --git a/files/iptables b/files/iptables index 21593eb..351986c 100644 --- a/files/iptables +++ b/files/iptables @@ -101,7 +101,6 @@ $iptables -A FORWARD -m udp -p udp -m state --state RELATED,ESTABLISHED -j ACCEP if [ ! -z "$LOG_DROPPED" ]; then $iptables -A INPUT -j LOG --log-prefix='INPUT(DROP): ' $iptables -A FORWARD -j LOG --log-prefix='FORWARD(DROP): ' - $iptables -A OUTPUT -j LOG --log-prefix='OUTPUT(DROP): ' fi $iptables -P FORWARD DROP From jmeeuwen at puppetmanaged.org Sat May 29 22:24:28 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 29 May 2010 22:24:28 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005292024.o4TKOSLS026934@master.puppetmanaged.org> manifests/init.pp | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) New commits: commit 63d3bd4a93dbbe1fb74e62c14eb4234e9051b4d0 Author: Jeroen van Meeuwen (Ergo Project) Date: Sat May 29 22:20:21 2010 +0200 Make it so that duplicates are less likely: With the use of Dns::Zone["example.com"] for both view "internal" and "external", Dns::Zone["example.com"] is defined twice (and thus failing). Now, in such cases, specify the real_name para-meter. diff --git a/manifests/init.pp b/manifests/init.pp index a13a9c1..b4a730a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,8 +27,25 @@ class dns { } } - define zone( $enable = true, $view = "world" ) { + define zone( + $enable = true, + $view = false, + $real_name = false + ) { + + exec { "reload_zone_$name_in_$view"] { + command => $view ? { + false => "rndc reload $name", + default => "rndc reload $name IN $view" + }, + refreshonly => true + } + file { "/var/named/$view/$name.zone": + path => $real_name ? { + false => "/var/named/$view/$name.zone", + default => "/var/named/$view/$real_name.zone" + }, mode => 644, owner => "named", group => "named", @@ -38,10 +55,15 @@ class dns { }, source => [ "puppet://$server/private/$environment/dns/$view/$name.zone", + "puppet://$server/private/$environment/dns/$view/$real_name.zone", "puppet://$server/private/$environment/dns/$name.zone", + "puppet://$server/private/$environment/dns/$real_name.zone", "puppet://$server/files/dns/$view/$name.zone", - "puppet://$server/files/dns/$name.zone" - ] + "puppet://$server/files/dns/$view/$real_name.zone", + "puppet://$server/files/dns/$name.zone", + "puppet://$server/files/dns/$real_name.zone" + ], + notify => Exec["reload_zone_$name_in_$view"] } # File["/etc/named.conf"] { From jmeeuwen at puppetmanaged.org Sat May 29 22:47:28 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 29 May 2010 22:47:28 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005292047.o4TKlSgk021688@master.puppetmanaged.org> manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08d62d69c5dc55b03b928959cdf0ea60adc54d2f Author: Jeroen van Meeuwen (Ergo Project) Date: Sat May 29 22:44:48 2010 +0200 Fix syntax errors diff --git a/manifests/init.pp b/manifests/init.pp index b4a730a..173e30a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -33,7 +33,7 @@ class dns { $real_name = false ) { - exec { "reload_zone_$name_in_$view"] { + exec { "reload_zone_$name_in_$view": command => $view ? { false => "rndc reload $name", default => "rndc reload $name IN $view" From jmeeuwen at puppetmanaged.org Sat May 29 22:51:08 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sat, 29 May 2010 22:51:08 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005292051.o4TKp8YB009609@master.puppetmanaged.org> manifests/init.pp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) New commits: commit 64772eee90ec44f5d550bae5f5dda60b11738cf3 Author: Jeroen van Meeuwen (Ergo Project) Date: Sat May 29 22:48:01 2010 +0200 Fix another duplicate definition, this time by variable expansion logic. Meanwhile, also fix the $view/$real_name clause diff --git a/manifests/init.pp b/manifests/init.pp index 173e30a..c4af673 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -33,10 +33,16 @@ class dns { $real_name = false ) { - exec { "reload_zone_$name_in_$view": + exec { "reload_zone_${name}_in_${view}": command => $view ? { - false => "rndc reload $name", - default => "rndc reload $name IN $view" + false => $real_name ? { + false => "rndc reload $name", + default => "rndc reload $real_name" + }, + default => $real_name ? { + false => "rndc reload $name IN $view", + default => "rndc reload $real_name IN $view" + } }, refreshonly => true } @@ -63,7 +69,7 @@ class dns { "puppet://$server/files/dns/$name.zone", "puppet://$server/files/dns/$real_name.zone" ], - notify => Exec["reload_zone_$name_in_$view"] + notify => Exec["reload_zone_${name}_in_${view}"] } # File["/etc/named.conf"] { From jmeeuwen at puppetmanaged.org Sun May 30 11:07:06 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sun, 30 May 2010 11:07:06 +0200 Subject: [Commits] Branch 'development' - 3 commits - files/CentOS files/RedHat Message-ID: <201005300907.o4U976Uo003747@master.puppetmanaged.org> files/CentOS/5/repos/addons.repo | 2 - files/CentOS/5/repos/addons.repo.disabled | 2 - files/CentOS/5/repos/extras.repo | 2 - files/CentOS/5/repos/extras.repo.disabled | 2 - files/CentOS/5/repos/plus.repo | 2 - files/CentOS/5/repos/plus.repo.disabled | 2 - files/CentOS/5/repos/release.repo | 2 - files/CentOS/5/repos/release.repo.disabled | 2 - files/CentOS/5/repos/updates.repo | 2 - files/CentOS/5/repos/updates.repo.disabled | 2 - files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo | 18 ++++++++++ files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo.disabled | 18 ++++++++++ files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo | 18 ++++++++++ files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo.disabled | 18 ++++++++++ 14 files changed, 82 insertions(+), 10 deletions(-) New commits: commit 116d9a5a8a60469ccdf7dc4fd467541a85702b64 Merge: f280c99... b64f706... Author: Jeroen van Meeuwen (Ergo Project) Date: Sun May 30 11:04:33 2010 +0200 Merge branch 'development' of ssh://git.puppetmanaged.org/git/puppet/yum into development commit f280c996be6cdce6cd70ee4ba4228d9079ed3b8d Author: Jeroen van Meeuwen (Ergo Project) Date: Sun May 30 11:04:12 2010 +0200 Remove the baseurl and add the mirrorlist diff --git a/files/CentOS/5/repos/addons.repo b/files/CentOS/5/repos/addons.repo index faaef7f..f879ef6 100644 --- a/files/CentOS/5/repos/addons.repo +++ b/files/CentOS/5/repos/addons.repo @@ -1,7 +1,7 @@ #packages used/produced in the build but not released [addons] name=CentOS Addons -baseurl=http://www.kanarip.com/centos/5/addons/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/addons/$basearch/ #mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=addons enabled=1 gpgcheck=1 diff --git a/files/CentOS/5/repos/addons.repo.disabled b/files/CentOS/5/repos/addons.repo.disabled index 6ca87e8..3aa16d1 100644 --- a/files/CentOS/5/repos/addons.repo.disabled +++ b/files/CentOS/5/repos/addons.repo.disabled @@ -1,7 +1,7 @@ #packages used/produced in the build but not released [addons] name=CentOS Addons -baseurl=http://www.kanarip.com/centos/5/addons/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/addons/$basearch/ #mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=addons enabled=0 gpgcheck=1 diff --git a/files/CentOS/5/repos/extras.repo b/files/CentOS/5/repos/extras.repo index 8565e02..4b40435 100644 --- a/files/CentOS/5/repos/extras.repo +++ b/files/CentOS/5/repos/extras.repo @@ -1,7 +1,7 @@ #additional packages that may be useful [extras] name=CentOS Extras -baseurl=http://www.kanarip.com/centos/5/extras/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/extras/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=extras enabled=1 gpgcheck=1 diff --git a/files/CentOS/5/repos/extras.repo.disabled b/files/CentOS/5/repos/extras.repo.disabled index d49a535..5c853d1 100644 --- a/files/CentOS/5/repos/extras.repo.disabled +++ b/files/CentOS/5/repos/extras.repo.disabled @@ -1,7 +1,7 @@ #additional packages that may be useful [extras] name=CentOS Extras -baseurl=http://www.kanarip.com/centos/5/extras/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/extras/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=extras enabled=0 gpgcheck=1 diff --git a/files/CentOS/5/repos/plus.repo b/files/CentOS/5/repos/plus.repo index 258f9f0..8e84dec 100644 --- a/files/CentOS/5/repos/plus.repo +++ b/files/CentOS/5/repos/plus.repo @@ -1,7 +1,7 @@ #additional packages that extend functionality of existing packages [plus] name=CentOS Plus -baseurl=http://www.kanarip.com/centos/5/centosplus/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/centosplus/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=centosplus enabled=1 gpgcheck=1 diff --git a/files/CentOS/5/repos/plus.repo.disabled b/files/CentOS/5/repos/plus.repo.disabled index dba8f6a..9e4c91e 100644 --- a/files/CentOS/5/repos/plus.repo.disabled +++ b/files/CentOS/5/repos/plus.repo.disabled @@ -1,7 +1,7 @@ #additional packages that extend functionality of existing packages [plus] name=CentOS Plus -baseurl=http://www.kanarip.com/centos/5/centosplus/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/centosplus/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=centosplus enabled=0 gpgcheck=1 diff --git a/files/CentOS/5/repos/release.repo b/files/CentOS/5/repos/release.repo index 456f3c0..6bf73af 100644 --- a/files/CentOS/5/repos/release.repo +++ b/files/CentOS/5/repos/release.repo @@ -1,6 +1,6 @@ [centos-5] name=CentOS Base -baseurl=http://www.kanarip.com/centos/5/os/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/os/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=os enabled=1 gpgcheck=1 diff --git a/files/CentOS/5/repos/release.repo.disabled b/files/CentOS/5/repos/release.repo.disabled index aed6878..9876310 100644 --- a/files/CentOS/5/repos/release.repo.disabled +++ b/files/CentOS/5/repos/release.repo.disabled @@ -1,6 +1,6 @@ [centos-5] name=CentOS Base -baseurl=http://www.kanarip.com/centos/5/os/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/os/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=os enabled=0 gpgcheck=1 diff --git a/files/CentOS/5/repos/updates.repo b/files/CentOS/5/repos/updates.repo index 5d30d39..4f6024a 100644 --- a/files/CentOS/5/repos/updates.repo +++ b/files/CentOS/5/repos/updates.repo @@ -1,6 +1,6 @@ [updates] name=CentOS Updates -baseurl=http://www.kanarip.com/centos/5/updates/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/updates/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=updates enabled=1 gpgcheck=1 diff --git a/files/CentOS/5/repos/updates.repo.disabled b/files/CentOS/5/repos/updates.repo.disabled index 91a0d19..f1b46cf 100644 --- a/files/CentOS/5/repos/updates.repo.disabled +++ b/files/CentOS/5/repos/updates.repo.disabled @@ -1,6 +1,6 @@ [updates] name=CentOS Updates -baseurl=http://www.kanarip.com/centos/5/updates/$basearch/ +#baseurl=http://www.kanarip.com/centos/5/updates/$basearch/ mirrorlist=http://mirrorlist.centos.org/?release=5&arch=$basearch&repo=updates enabled=0 gpgcheck=1 commit 783cd1f07b4b5adb6db31d4d7aaefb73440d524c Author: Jeroen van Meeuwen (Ergo Project) Date: Mon May 24 14:20:24 2010 +0200 Add feature-ruby-1.9.1 updates repositories diff --git a/files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo b/files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo new file mode 100644 index 0000000..2c11db9 --- /dev/null +++ b/files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1-updates-testing] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-testing-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-testing-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo.disabled b/files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo.disabled new file mode 100644 index 0000000..4895f23 --- /dev/null +++ b/files/RedHat/5/repos/feature-ruby-1.9.1-updates-testing.repo.disabled @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1-updates-testing] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-testing-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-testing-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo b/files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo new file mode 100644 index 0000000..92ed70f --- /dev/null +++ b/files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1-updates] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/$basearch/ +enabled=1 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/SRPMS/ +enabled=0 +gpgcheck=0 + diff --git a/files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo.disabled b/files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo.disabled new file mode 100644 index 0000000..efedb7e --- /dev/null +++ b/files/RedHat/5/repos/feature-ruby-1.9.1-updates.repo.disabled @@ -0,0 +1,18 @@ +[feature-ruby-1.9.1-updates] +name=Featured Ruby 1.9.1 Packages +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/$basearch/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-debuginfo] +name=Featured Ruby 1.9.1 packages - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[feature-ruby-1.9.1-updates-source] +name=Featured Ruby 1.9.1 Packages - Sources +baseurl=http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Mon May 31 11:55:40 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 31 May 2010 11:55:40 +0200 Subject: [Commits] Branch 'development' - manifests/init.pp Message-ID: <201005310955.o4V9teRk025702@master.puppetmanaged.org> manifests/init.pp | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) New commits: commit 6811fb6ced31d57d5f9ca8828f6aac5d62fc4004 Author: Jeroen van Meeuwen (Ergo Project) Date: Mon May 31 11:52:52 2010 +0200 Update the dns module so that it actually reloads the nameserver when appropriate diff --git a/manifests/init.pp b/manifests/init.pp index c4af673..dab641a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -11,19 +11,33 @@ class dns { "puppet://$server/files/dns/named.conf.$hostname", "puppet://$server/files/dns/named.conf", "puppet://$server/dns/named.conf" - ] + ], + notify => Service["named"] } file { "/etc/named.root.hints": source => [ "puppet://$server/dns/named.root.hints" - ] + ], + notify => Service["named"] } file { "/var/named/named.root": source => [ "puppet://$server/dns/named.root" - ] + ], + notify => Service["named"] + } + + service { "named": + ensure => running, + enable => true, + require => [ + File["/etc/named.conf"], + File["/etc/named.root.hints"], + File["/var/named/named.root"], + Package["bind"] + ] } } @@ -44,13 +58,29 @@ class dns { default => "rndc reload $real_name IN $view" } }, + onlyif => $view ? { + false => $real_name ? { + false => "named-checkzone $name /var/named/$name.zone", + default => "named-checkzone $name /var/named/$real_name.zone", + }, + default => $real_name ? { + false => "named-checkzone $name /var/named/$view/$name.zone", + default => "named-checkzone $name /var/named/$view/$real_name.zone", + } + }, refreshonly => true } file { "/var/named/$view/$name.zone": - path => $real_name ? { - false => "/var/named/$view/$name.zone", - default => "/var/named/$view/$real_name.zone" + path => $view ? { + false => $real_name ? { + false => "/var/named/$name.zone", + default => "/var/named/$real_name.zone" + }, + default => $real_name ? { + false => "/var/named/$view/$name.zone", + default => "/var/named/$view/$real_name.zone" + } }, mode => 644, owner => "named",