From jmeeuwen at puppetmanaged.org  Tue Jul 13 17:09:20 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Tue, 13 Jul 2010 17:09:20 +0200
Subject: [Commits] Branch 'development' - 4 commits - files/includes.d
	lib/facter	manifests/init.pp plugins
Message-ID: <201007131509.o6DF9KZW029382@master.puppetmanaged.org>

 files/includes.d/virtualhost.conf |    4 +--
 lib/facter/php_version.rb         |   42 +++++++++++++++++++-------------------
 manifests/init.pp                 |   23 ++++++++++----------
 plugins                           |    1 
 4 files changed, 35 insertions(+), 35 deletions(-)

New commits:
commit 74bc23e40fdcc0f6fe77ad2ef53a37306fef8b8c
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Tue Jul 13 17:08:08 2010 +0200

    Fix corner case in which yum over ssl has already specified the ca cert

diff --git a/manifests/init.pp b/manifests/init.pp
index a3ca4ae..a0528b1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -565,18 +565,19 @@ class webserver {
                     notify => Service["httpd"]
                 }
 
-                file { "/etc/pki/tls/certs/$name.ca.cert":
-                    source => [
-                        "puppet://$server/private/$environment/webserver/sites/$name.ca.cert",
-                        "puppet://$server/files/webserver/sites/$name.ca.cert",
-                        "puppet://$server/webserver/sites/$name.ca.cert"
-                    ],
-                    owner => "root",
-                    group => "root",
-                    mode => 644,
-                    notify => Service["httpd"]
+                if !defined(File["/etc/pki/tls/certs/$name.ca.cert"]) {
+                    file { "/etc/pki/tls/certs/$name.ca.cert":
+                        source => [
+                            "puppet://$server/private/$environment/webserver/sites/$name.ca.cert",
+                            "puppet://$server/files/webserver/sites/$name.ca.cert",
+                            "puppet://$server/webserver/sites/$name.ca.cert"
+                        ],
+                        owner => "root",
+                        group => "root",
+                        mode => 644,
+                        notify => Service["httpd"]
+                    }
                 }
-
             }
         }
 


commit b0c0789fceeca07fee2486e3990362cd2d22824a
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Fri May 21 10:51:57 2010 +0200

    Fix indentation on php_version.rb

diff --git a/lib/facter/php_version.rb b/lib/facter/php_version.rb
index 99bc350..e115125 100644
--- a/lib/facter/php_version.rb
+++ b/lib/facter/php_version.rb
@@ -2,36 +2,36 @@ require 'facter'
 
 phpversion = nil
 if FileTest.exists?("/usr/bin/php")
-	phpversion = %x{php -v 2>/dev/null}.split(" ")[1]
+    phpversion = %x{php -v 2>/dev/null}.split(" ")[1]
 else
-	phpversion = "0.0.0"
+    phpversion = "0.0.0"
 end
 
 Facter.add("phpversion") do
-	setcode do
-		phpversion
-	end
+    setcode do
+        phpversion
+    end
 end
 
 Facter.add("phpmversion") do
-	phpmversion = nil
-	if phpversion != nil
-		phpversionsplit = phpversion.split(".")
-		phpmversion = phpversionsplit[0]
-	end
-	setcode do
-		phpmversion
-	end
+    phpmversion = nil
+    if phpversion != nil
+        phpversionsplit = phpversion.split(".")
+        phpmversion = phpversionsplit[0]
+    end
+    setcode do
+        phpmversion
+    end
 end
 
 Facter.add("phpmmversion") do
-	phpmmversion = nil
-	if phpversion != nil
-		phpversionsplit = phpversion.split(".")
-		phpmmversion = phpversionsplit[0] + "." + phpversionsplit[1]
-	end
-	setcode do
-		phpmmversion
-	end
+    phpmmversion = nil
+    if phpversion != nil
+        phpversionsplit = phpversion.split(".")
+        phpmmversion = phpversionsplit[0] + "." + phpversionsplit[1]
+    end
+    setcode do
+        phpmmversion
+    end
 end
 


commit 998a6cfa74e55b89b233d048bf5f8cf6c107e4eb
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date:   Mon Apr 12 13:59:27 2010 +0200

    Remove legacy plugins directory

diff --git a/plugins b/plugins
deleted file mode 120000
index 7951405..0000000
--- a/plugins
+++ /dev/null
@@ -1 +0,0 @@
-lib
\ No newline at end of file


commit c8c82f6a68769e95b8cff35b4e602e99d266654a
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date:   Mon Apr 12 12:38:30 2010 +0200

    Update location for this file as to not obfuscate things ;-)

diff --git a/files/includes.d/virtualhost.conf b/files/includes.d/virtualhost.conf
index 2fe2c29..4671338 100644
--- a/files/includes.d/virtualhost.conf
+++ b/files/includes.d/virtualhost.conf
@@ -1,5 +1,5 @@
-# Managed with puppet
-# ./distr/config/webserver/conf.d/virtualhost.conf
+# Managed with Puppet
+# ./webserver/files/includes.d/virtualhost.conf (webserver module)
 
 NameVirtualHost *:80
 



From jmeeuwen at puppetmanaged.org  Sat Jul 17 16:31:32 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Sat, 17 Jul 2010 16:31:32 +0200
Subject: [Commits] Branch 'development' - puppet/manifests
Message-ID: <201007171431.o6HEVWKd003740@master.puppetmanaged.org>

 puppet/manifests/nodes/master.puppetmanaged.org.pp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e81a7242837f4852be31643a9ea90bbeff86f9e5
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sat Jul 17 16:31:34 2010 +0200

    Add func module

diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp
index 59f0323..e3f4c69 100644
--- a/puppet/manifests/nodes/master.puppetmanaged.org.pp
+++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp
@@ -517,6 +517,7 @@ node 'master.puppetmanaged.org' {
             "dhcp",
             "dns",
             "facts",
+            "func",
             "git",
             "hg",
             "iptables",
@@ -556,6 +557,7 @@ node 'master.puppetmanaged.org' {
             "dhcp",
             "dns",
             "facts",
+            "func",
             "git",
             "hg",
             "iptables",
@@ -594,6 +596,7 @@ node 'master.puppetmanaged.org' {
             "dhcp",
             "dns",
             "facts",
+            "func",
             "git",
             "hg",
             "iptables",



From jmeeuwen at puppetmanaged.org  Sun Jul 18 12:54:33 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Sun, 18 Jul 2010 12:54:33 +0200
Subject: [Commits] Branch 'development' - files/Fedora
Message-ID: <201007181054.o6IAsXP4002782@master.puppetmanaged.org>

 files/Fedora/13/repos/development.repo          |    2 +-
 files/Fedora/13/repos/development.repo.disabled |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 374420d875d319d09899cd046bfecb205a70c909
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun Jul 18 12:54:23 2010 +0200

    Correct enabled development repository

diff --git a/files/Fedora/13/repos/development.repo b/files/Fedora/13/repos/development.repo
index 426ca25..735230e 100644
--- a/files/Fedora/13/repos/development.repo
+++ b/files/Fedora/13/repos/development.repo
@@ -4,7 +4,7 @@
 name=Fedora - $basearch
 baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=0
 
 [development-debuginfo]
diff --git a/files/Fedora/13/repos/development.repo.disabled b/files/Fedora/13/repos/development.repo.disabled
index 426ca25..735230e 100644
--- a/files/Fedora/13/repos/development.repo.disabled
+++ b/files/Fedora/13/repos/development.repo.disabled
@@ -4,7 +4,7 @@
 name=Fedora - $basearch
 baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=0
 
 [development-debuginfo]



From jmeeuwen at puppetmanaged.org  Sun Jul 18 12:56:17 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Sun, 18 Jul 2010 12:56:17 +0200
Subject: [Commits] Branch 'development' - yum/Fedora
Message-ID: <201007181056.o6IAuH6n005229@master.puppetmanaged.org>

 yum/Fedora/13/repos/development.repo                                |   21 +++++++
 yum/Fedora/13/repos/development.repo.disabled                       |   22 +++++++
 yum/Fedora/13/repos/koji.repo                                       |    6 ++
 yum/Fedora/13/repos/koji.repo.disabled                              |    6 ++
 yum/Fedora/13/repos/release.repo                                    |   21 +++++++
 yum/Fedora/13/repos/release.repo.disabled                           |   22 +++++++
 yum/Fedora/13/repos/rpmfusion-free-development.repo                 |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free-development.repo.disabled        |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo             |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo.disabled    |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free-updates.repo                     |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free-updates.repo.disabled            |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free.repo                             |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-free.repo.disabled                    |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree-development.repo              |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree-development.repo.disabled     |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo          |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo.disabled |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo                  |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo.disabled         |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree.repo                          |   28 ++++++++++
 yum/Fedora/13/repos/rpmfusion-nonfree.repo.disabled                 |   28 ++++++++++
 yum/Fedora/13/repos/updates-testing.repo                            |   22 +++++++
 yum/Fedora/13/repos/updates-testing.repo.disabled                   |   22 +++++++
 yum/Fedora/13/repos/updates.repo                                    |   22 +++++++
 yum/Fedora/13/repos/updates.repo.disabled                           |   22 +++++++
 26 files changed, 634 insertions(+)

New commits:
commit 5abfa5f836052720e76c978a9c9b2113a11b7450
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun Jul 18 12:56:15 2010 +0200

    Add Fedora 13 repository configuration

diff --git a/yum/Fedora/13/repos/development.repo b/yum/Fedora/13/repos/development.repo
new file mode 100644
index 0000000..72006a6
--- /dev/null
+++ b/yum/Fedora/13/repos/development.repo
@@ -0,0 +1,21 @@
+# Managed with puppet
+[fedora-13-development]
+name=Fedora Rawhide - $basearch
+baseurl=http://www.kanarip.com/fedora/development/$basearch/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+enabled=1
+gpgcheck=0
+
+[fedora-13-development-debuginfo]
+name=Fedora Rawhide - $basearch - Debug
+baseurl=http://www.kanarip.com/fedora/development/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-development-source]
+name=Fedora Rawhide - Source
+baseurl=http://www.kanarip.com/fedora/development/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/development.repo.disabled b/yum/Fedora/13/repos/development.repo.disabled
new file mode 100644
index 0000000..4f4533c
--- /dev/null
+++ b/yum/Fedora/13/repos/development.repo.disabled
@@ -0,0 +1,22 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/release.repo
+[fedora-13-development]
+name=Fedora Rawhide - $basearch
+baseurl=http://www.kanarip.com/fedora/development/$basearch/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-development-debuginfo]
+name=Fedora Rawhide - $basearch - Debug
+baseurl=http://www.kanarip.com/fedora/development/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-development-source]
+name=Fedora Rawhide - Source
+baseurl=http://www.kanarip.com/fedora/development/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/koji.repo b/yum/Fedora/13/repos/koji.repo
new file mode 100644
index 0000000..70e4c72
--- /dev/null
+++ b/yum/Fedora/13/repos/koji.repo
@@ -0,0 +1,6 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/koji.repo
+[fedora-13-koji]
+name=Fedora 13 - $basearch - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-f13-build-current/$basearch/
+enabled=1
diff --git a/yum/Fedora/13/repos/koji.repo.disabled b/yum/Fedora/13/repos/koji.repo.disabled
new file mode 100644
index 0000000..ba6d3e3
--- /dev/null
+++ b/yum/Fedora/13/repos/koji.repo.disabled
@@ -0,0 +1,6 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/koji.repo.disabled
+[fedora-13-koji]
+name=Fedora 13 - $basearch - Just Born
+baseurl=http://koji.fedoraproject.org/static-repos/dist-f13-build-current/$basearch/
+enabled=0
diff --git a/yum/Fedora/13/repos/release.repo b/yum/Fedora/13/repos/release.repo
new file mode 100644
index 0000000..5ccf08a
--- /dev/null
+++ b/yum/Fedora/13/repos/release.repo
@@ -0,0 +1,21 @@
+# Managed with puppet
+[fedora-13]
+name=Fedora 13 - $basearch
+baseurl=http://www.kanarip.com/fedora/releases/13/Everything/$basearch/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=$basearch
+enabled=1
+gpgcheck=0
+
+[fedora-13-debuginfo]
+name=Fedora 13 - $basearch - Debug
+baseurl=http://www.kanarip.com/fedora/releases/13/Everything/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-source]
+name=Fedora 13 - Source
+baseurl=http://www.kanarip.com/fedora/releases/13/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-13&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/release.repo.disabled b/yum/Fedora/13/repos/release.repo.disabled
new file mode 100644
index 0000000..b2c5df9
--- /dev/null
+++ b/yum/Fedora/13/repos/release.repo.disabled
@@ -0,0 +1,22 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/release.repo.disabled
+[fedora-13]
+name=Fedora 13 - $basearch
+baseurl=http://www.kanarip.com/fedora/releases/13/Everything/$basearch/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-debuginfo]
+name=Fedora 13 - $basearch - Debug
+baseurl=http://www.kanarip.com/fedora/releases/13/Everything/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-source]
+name=Fedora 13 - Source
+baseurl=http://www.kanarip.com/fedora/releases/13/Everything/source/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-13&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/rpmfusion-free-development.repo b/yum/Fedora/13/repos/rpmfusion-free-development.repo
new file mode 100644
index 0000000..63af5be
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free-development.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free-development]
+name=RPM Fusion for Fedora 13 - Free - Rawhide
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/development/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-development-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Rawhide Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/development/$basearch/os/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-debug-rawhide&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-development-source]
+name=RPM Fusion for Fedora 13 - Free - Rawhide Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/development/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide-source&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free-development.repo.disabled b/yum/Fedora/13/repos/rpmfusion-free-development.repo.disabled
new file mode 100644
index 0000000..7e742b9
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free-development.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free-development]
+name=RPM Fusion for Fedora 13 - Free - Rawhide
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/development/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-development-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Rawhide Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/development/$basearch/os/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-debug-rawhide&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-development-source]
+name=RPM Fusion for Fedora 13 - Free - Rawhide Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/development/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide-source&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo b/yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo
new file mode 100644
index 0000000..7bb07fd
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free-updates-testing]
+name=RPM Fusion for Fedora 13 - Free - Test Updates
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/testing/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-13&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-testing-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Test Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/testing/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-testing-source]
+name=RPM Fusion for Fedora 13 - Free - Test Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/testing/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo.disabled b/yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo.disabled
new file mode 100644
index 0000000..d005023
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free-updates-testing.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free-updates-testing]
+name=RPM Fusion for Fedora 13 - Free - Test Updates
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/testing/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-testing-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Test Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/testing/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-testing-source]
+name=RPM Fusion for Fedora 13 - Free - Test Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/testing/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free-updates.repo b/yum/Fedora/13/repos/rpmfusion-free-updates.repo
new file mode 100644
index 0000000..2220a9d
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free-updates.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free-updates]
+name=RPM Fusion for Fedora 13 - Free - Updates
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-13&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-source]
+name=RPM Fusion for Fedora 13 - Free - Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free-updates.repo.disabled b/yum/Fedora/13/repos/rpmfusion-free-updates.repo.disabled
new file mode 100644
index 0000000..bb43532
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free-updates.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free-updates]
+name=RPM Fusion for Fedora 13 - Free - Updates
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-updates-source]
+name=RPM Fusion for Fedora 13 - Free - Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/updates/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free.repo b/yum/Fedora/13/repos/rpmfusion-free.repo
new file mode 100644
index 0000000..07709b4
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free]
+name=RPM Fusion for Fedora 13 - Free
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/releases/13/Everything/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-13&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/releases/13/Everything/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-source]
+name=RPM Fusion for Fedora 13 - Free - Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/releases/13/Everything/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-free.repo.disabled b/yum/Fedora/13/repos/rpmfusion-free.repo.disabled
new file mode 100644
index 0000000..77a1a3f
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-free.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-free]
+name=RPM Fusion for Fedora 13 - Free
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/releases/13/Everything/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-debuginfo]
+name=RPM Fusion for Fedora 13 - Free - Debug
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/releases/13/Everything/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
+[fedora-13-rpmfusion-free-source]
+name=RPM Fusion for Fedora 13 - Free - Source
+baseurl=http://www.kanarip.com/rpmfusion/free/fedora/releases/13/Everything/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree-development.repo b/yum/Fedora/13/repos/rpmfusion-nonfree-development.repo
new file mode 100644
index 0000000..eb6f2b4
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree-development.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree-development]
+name=RPM Fusion for Fedora 13 - Non-Free - Rawhide
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/development/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-development-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Rawhide Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/development/$basearch/os/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-rawhide-debug&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-development-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Rawhide Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/development/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-rawhide-source&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree-development.repo.disabled b/yum/Fedora/13/repos/rpmfusion-nonfree-development.repo.disabled
new file mode 100644
index 0000000..72ef063
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree-development.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree-development]
+name=RPM Fusion for Fedora 13 - Non-Free - Rawhide
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/development/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-rawhide
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-development-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Rawhide Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/development/$basearch/os/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-rawhide-debug&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-development-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Rawhide Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/development/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-rawhide-source&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo b/yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo
new file mode 100644
index 0000000..de2649d
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree-updates-testing]
+name=RPM Fusion for Fedora 13 - Non-Free - Test Updates
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/testing/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-13&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-testing-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Test Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/testing/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-testing-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Test Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/testing/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo.disabled b/yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo.disabled
new file mode 100644
index 0000000..1cbcd48
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree-updates-testing.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree-updates-testing]
+name=RPM Fusion for Fedora 13 - Non-Free - Test Updates
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/testing/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-testing-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Test Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/testing/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-testing-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Test Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/testing/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo b/yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo
new file mode 100644
index 0000000..0923317
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree-updates]
+name=RPM Fusion for Fedora 13 - Non-Free - Updates
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-13&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-updates-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo.disabled b/yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo.disabled
new file mode 100644
index 0000000..57b606a
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree-updates.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree-updates]
+name=RPM Fusion for Fedora 13 - Non-Free - Updates
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/13/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Updates Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/13/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-updates-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-updates-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Updates Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/updates/13/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree.repo b/yum/Fedora/13/repos/rpmfusion-nonfree.repo
new file mode 100644
index 0000000..e393ced
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree.repo
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree]
+name=RPM Fusion for Fedora 13 - Non-Free
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/releases/13/Everything/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-13
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/releases/13/Everything/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/releases/13/Everything/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/rpmfusion-nonfree.repo.disabled b/yum/Fedora/13/repos/rpmfusion-nonfree.repo.disabled
new file mode 100644
index 0000000..f84a1ba
--- /dev/null
+++ b/yum/Fedora/13/repos/rpmfusion-nonfree.repo.disabled
@@ -0,0 +1,28 @@
+# Please note that the mirrorlists URLs are only temporary and will be changed soon.
+# The debuginfo and source repos will also be switching from baseurl to a
+# mirror list.
+
+[fedora-13-rpmfusion-nonfree]
+name=RPM Fusion for Fedora 13 - Non-Free
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/releases/13/Everything/$basearch/os/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-13
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-debuginfo]
+name=RPM Fusion for Fedora 13 - Non-Free - Debug
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/releases/13/Everything/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-debug-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
+[fedora-13-rpmfusion-nonfree-source]
+name=RPM Fusion for Fedora 13 - Non-Free - Source
+baseurl=http://www.kanarip.com/rpmfusion/nonfree/fedora/releases/13/Everything/source/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-source-13&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+
diff --git a/yum/Fedora/13/repos/updates-testing.repo b/yum/Fedora/13/repos/updates-testing.repo
new file mode 100644
index 0000000..7013bbf
--- /dev/null
+++ b/yum/Fedora/13/repos/updates-testing.repo
@@ -0,0 +1,22 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/updates-testing.repo
+[fedora-13-updates-testing]
+name=Fedora 13 - $basearch - Test Updates
+baseurl=http://www.kanarip.com/fedora/updates/testing/13/$basearch/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f13&arch=$basearch
+enabled=1
+gpgcheck=0
+
+[fedora-13-updates-testing-debuginfo]
+name=Fedora 13 - $basearch - Test Updates Debug
+baseurl=http://www.kanarip.com/fedora/updates/testing/13/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-updates-testing-source]
+name=Fedora 13 - Test Updates Source
+baseurl=http://www.kanarip.com/fedora/core/updates/testing/13/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f13&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/updates-testing.repo.disabled b/yum/Fedora/13/repos/updates-testing.repo.disabled
new file mode 100644
index 0000000..c745ce6
--- /dev/null
+++ b/yum/Fedora/13/repos/updates-testing.repo.disabled
@@ -0,0 +1,22 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/updates-testing.repo.disabled
+[fedora-13-updates-testing]
+name=Fedora 13 - $basearch - Test Updates
+baseurl=http://www.kanarip.com/fedora/updates/testing/13/$basearch/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-updates-testing-debuginfo]
+name=Fedora 13 - $basearch - Test Updates Debug
+baseurl=http://www.kanarip.com/fedora/updates/testing/13/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-updates-testing-source]
+name=Fedora 13 - Test Updates Source
+baseurl=http://www.kanarip.com/fedora/core/updates/testing/13/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f13&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/updates.repo b/yum/Fedora/13/repos/updates.repo
new file mode 100644
index 0000000..86a73ca
--- /dev/null
+++ b/yum/Fedora/13/repos/updates.repo
@@ -0,0 +1,22 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/updates.repo
+[fedora-13-updates]
+name=Fedora 13 - $basearch - Updates
+baseurl=http://www.kanarip.com/fedora/updates/13/$basearch/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=$basearch
+enabled=1
+gpgcheck=0
+
+[fedora-13-updates-debuginfo]
+name=Fedora 13 - $basearch - Updates - Debug
+baseurl=http://www.kanarip.com/fedora/updates/13/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-updates-source]
+name=Fedora 13 - Updates Source
+baseurl=http://www.kanarip.com/fedora/updates/13/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f13&arch=$basearch
+enabled=0
+gpgcheck=0
diff --git a/yum/Fedora/13/repos/updates.repo.disabled b/yum/Fedora/13/repos/updates.repo.disabled
new file mode 100644
index 0000000..ca8667b
--- /dev/null
+++ b/yum/Fedora/13/repos/updates.repo.disabled
@@ -0,0 +1,22 @@
+# Managed with puppet
+# ./distr/files/Fedora/13/etc/yum/repos.d/updates.repo.disabled
+[fedora-13-updates]
+name=Fedora 13 - $basearch - Updates
+baseurl=http://www.kanarip.com/fedora/updates/13/$basearch/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-updates-debuginfo]
+name=Fedora 13 - $basearch - Updates - Debug
+baseurl=http://www.kanarip.com/fedora/updates/13/$basearch/debug/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f13&arch=$basearch
+enabled=0
+gpgcheck=0
+
+[fedora-13-updates-source]
+name=Fedora 13 - Updates Source
+baseurl=http://www.kanarip.com/fedora/updates/13/SRPMS/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f13&arch=$basearch
+enabled=0
+gpgcheck=0



From jmeeuwen at puppetmanaged.org  Mon Jul 19 22:59:19 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Mon, 19 Jul 2010 22:59:19 +0200
Subject: [Commits] Branch 'development' - puppet/manifests
Message-ID: <201007192059.o6JKxJ2Q005768@master.puppetmanaged.org>

 puppet/manifests/nodes/ghandalf.kanarip.com.pp |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit dcdc493aa7b12c900378b470a251df5e5d1ceb0b
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Mon Jul 19 22:59:21 2010 +0200

    Remove extra repositories

diff --git a/puppet/manifests/nodes/ghandalf.kanarip.com.pp b/puppet/manifests/nodes/ghandalf.kanarip.com.pp
index 6be64ce..9aaecd5 100644
--- a/puppet/manifests/nodes/ghandalf.kanarip.com.pp
+++ b/puppet/manifests/nodes/ghandalf.kanarip.com.pp
@@ -96,11 +96,4 @@ node 'ghandalf.kanarip.com' {
         enable => true
     }
 
-    yum::repository { [
-            "custom-buildsys",
-            "feature-ruby-1.9.1"
-        ]:
-        enable => true
-    }
-
 }



From jmeeuwen at puppetmanaged.org  Tue Jul 20 13:28:22 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Tue, 20 Jul 2010 13:28:22 +0200
Subject: [Commits] Branch 'development' - 12 commits -
	files/run_puppet	manifests/init.pp templates/puppet.conf.erb
Message-ID: <201007201128.o6KBSMF3006983@master.puppetmanaged.org>

 files/run_puppet          |    6 ++---
 manifests/init.pp         |   52 ++++++++++++++++++++++++++++++++++------------
 templates/puppet.conf.erb |    6 ++++-
 3 files changed, 47 insertions(+), 17 deletions(-)

New commits:
commit 2d7de9f12b8a381a605bebecc87a27ef6929bc1b
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Tue Jul 20 13:28:32 2010 +0200

    Try and resolve debian applying this

diff --git a/manifests/init.pp b/manifests/init.pp
index 48dc964..9e19d50 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,5 +1,7 @@
 class puppet {
 
+    include $os
+
     @package { [
             "puppet",
             "puppet-server",
@@ -695,4 +697,18 @@ class puppet {
             ]
         }
     }
+
+    class debian inherits puppet {
+        File["/usr/local/sbin/run_puppet"] {
+            group => root
+        }
+    }
+    class fedora inherits puppet {
+    }
+
+    class redhat inherits fedora {
+    }
+
+    class centos inherits redhat {
+    }
 }


commit d5a0dec8ce71176574e8b58b2955bc8551ca993d
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu May 20 10:13:40 2010 +0200

    Update run_puppet to only remove the contents of /var/lib/puppet/state/, not the directory itself

diff --git a/files/run_puppet b/files/run_puppet
index 191a918..d0ad768 100644
--- a/files/run_puppet
+++ b/files/run_puppet
@@ -4,7 +4,7 @@
 [ $? -eq 0 ] && /etc/init.d/puppet stop
 
 # Remove local status
-rm -rf /var/lib/puppet/state >/dev/null 2>&1
+rm -rf /var/lib/puppet/state/* >/dev/null 2>&1
 rm -rf /var/lib/puppet/localconfig.yaml >/dev/null 2>&1
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet


commit 68843dbf8f1d0850ddfed162a6f69d43a4c3c4e9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date:   Mon Apr 12 13:01:11 2010 +0200

    Further update puppet.conf.erb

diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index bad7c2d..d08c001 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -9,6 +9,8 @@
     vardir = /var/lib/puppet
 
     pluginsync = true
+    pluginsource = puppet://$server/plugins
+    plugindest = $vardir/lib
     factpath = $vardir/lib/facter
 
 [puppetca]


commit f0437c30b1f1cab299d8f0643e762ef6f2a16387
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date:   Mon Apr 12 12:46:50 2010 +0200

    Update puppet.conf.erb for 0.25.x

diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index 6a11721..bad7c2d 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -1,15 +1,16 @@
 [main]
     autoflush = true
     environments = production,testing,development
-    pluginsync = true
     logdir = /var/log/puppet
     report = true
     rundir = /var/run/puppet
     ssldir = /var/lib/puppet/ssl
     tagmap = /etc/puppet/tagmail.conf
-    libdir = /var/lib/puppet
     vardir = /var/lib/puppet
 
+    pluginsync = true
+    factpath = $vardir/lib/facter
+
 [puppetca]
     autosign = false
 


commit 7a88353c934e00e2f08ce2be4763ad80ed16e59a
Merge: 72aaffc... 09b9bd1...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date:   Mon Apr 12 12:31:13 2010 +0200

    Merge branch 'development' of ssh://puppet.ogd.nl/git/puppet/puppet into development



commit 72aaffca53f20e514cb279f56e01ecbd10ac37fc
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip at fedoraunity.org>
Date:   Mon Apr 12 12:30:28 2010 +0200

    Update puppet.conf.erb for 0.25.x

diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index 3590b55..6a11721 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -1,12 +1,13 @@
 [main]
     autoflush = true
     environments = production,testing,development
-    factsync = true
+    pluginsync = true
     logdir = /var/log/puppet
     report = true
     rundir = /var/run/puppet
     ssldir = /var/lib/puppet/ssl
     tagmap = /etc/puppet/tagmail.conf
+    libdir = /var/lib/puppet
     vardir = /var/lib/puppet
 
 [puppetca]


commit 09b9bd1fb07b77b989c52f78ced675ae245d8fce
Author: Sandro Janke <s.janke at ogd.nl>
Date:   Fri Feb 12 16:34:08 2010 +0100

    Fix typo in path

diff --git a/manifests/init.pp b/manifests/init.pp
index 40102d3..48dc964 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -115,7 +115,7 @@ class puppet {
         )
 
         cron { "puppet_service":
-            command => "/usr/bin/pgrep -x puppetd > dev/null || /sbin/service puppet restart > /dev/null 2>&1",
+            command => "/usr/bin/pgrep -x puppetd > /dev/null || /sbin/service puppet restart > /dev/null 2>&1",
             user => "root",
             minute => "0",
             hour => [ 0,4,8,12,16,20 ]


commit b473a943f9e610e274feb4cb19a1f168d8e5a000
Author: Sandro Janke <s.janke at ogd.nl>
Date:   Mon Feb 8 12:21:25 2010 +0100

    Check for running proces and restart puppetd if none is found

diff --git a/manifests/init.pp b/manifests/init.pp
index 11c58ea..40102d3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -115,7 +115,7 @@ class puppet {
         )
 
         cron { "puppet_service":
-            command => "service puppet start >/dev/null 2>&1",
+            command => "/usr/bin/pgrep -x puppetd > dev/null || /sbin/service puppet restart > /dev/null 2>&1",
             user => "root",
             minute => "0",
             hour => [ 0,4,8,12,16,20 ]


commit 80293636f731a4cf6d22c2b253b1e6d44b5150d0
Author: Sandro Janke <sandro at vaya.muppetshow.lan>
Date:   Mon Oct 26 12:40:52 2009 +0100

    Use pgrep at script start as well

diff --git a/files/run_puppet b/files/run_puppet
index 08a8124..191a918 100644
--- a/files/run_puppet
+++ b/files/run_puppet
@@ -1,6 +1,6 @@
 #!/bin/bash -l
 
-/etc/init.d/puppet status >/dev/null 2>&1
+/usr/bin/pgrep puppetd >/dev/null 2>&1
 [ $? -eq 0 ] && /etc/init.d/puppet stop
 
 # Remove local status


commit 5d211854863cd32b64c979e388703ff910acb6f9
Author: Sandro Janke <sandro at vaya.muppetshow.lan>
Date:   Mon Oct 26 10:51:57 2009 +0100

    Use pgrep to check if service is running.
    Init script returns 0 on F11 even if service is not running.
    Thus puppet is not restarted after run_puppet.

diff --git a/files/run_puppet b/files/run_puppet
index d4c77d4..08a8124 100644
--- a/files/run_puppet
+++ b/files/run_puppet
@@ -14,5 +14,5 @@ rm -rf /var/lib/puppet/localconfig.yaml >/dev/null 2>&1
 /usr/sbin/puppetd --debug --onetime --no-daemonize ${PUPPET_SERVER_CMD} ${PUPPET_EXTRA_OPTS}
 
 # Ensure the service is started afterwards
-/etc/init.d/puppet status >/dev/null 2>&1
+/usr/bin/pgrep puppetd >/dev/null 2>&1
 [ $? -ne 0 ] && /etc/init.d/puppet start


commit 8d1ec479adcdc6aa03c50ee294b67d88efe7d09f
Author: Jeroen van Meeuwen (OGD) <j.van.meeuwen at ogd.nl>
Date:   Mon Aug 10 18:43:29 2009 +0200

    Fix syntax error

diff --git a/manifests/init.pp b/manifests/init.pp
index f1955f9..11c58ea 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -339,20 +339,19 @@ class puppet {
             case $real_puppet_storeconfigs_mysql_hostname {
                 "127.0.0.1", "localhost", "localhost.localdomain": {
                     include mysql::server
-                }
 
-                exec { "$puppet_type-storeconfigs_mysql_create_db":
-                    command => "/usr/bin/mysqladmin create $puppet_storeconfigs_mysql_database",
-                    unless => "/usr/bin/mysqlcheck -u $real_puppet_storeconfigs_mysql_username --password=$real_puppet_storeconfigs_mysql_password -s puppet",
-                    notify => Exec["$puppet_type-storeconfigs_mysql_create_user"],
-                    creates => "/var/lib/mysql/$puppet_storeconfigs_mysql_database/"
-                }
+                    exec { "$puppet_type-storeconfigs_mysql_create_db":
+                        command => "/usr/bin/mysqladmin create $puppet_storeconfigs_mysql_database",
+                        unless => "/usr/bin/mysqlcheck -u $real_puppet_storeconfigs_mysql_username --password=$real_puppet_storeconfigs_mysql_password -s puppet",
+                        notify => Exec["$puppet_type-storeconfigs_mysql_create_user"],
+                        creates => "/var/lib/mysql/$puppet_storeconfigs_mysql_database/"
+                    }
 
-                exec { "$puppet_type-storeconfigs_mysql_create_user":
-                    command => "/usr/bin/mysql -e 'grant all privileges on puppet.* to $real_puppet_storeconfigs_mysql_username@$fqdn identified by \"$real_puppet_storeconfigs_mysql_password\"'",
-                    refreshonly => true
+                    exec { "$puppet_type-storeconfigs_mysql_create_user":
+                        command => "/usr/bin/mysql -e 'grant all privileges on puppet.* to $real_puppet_storeconfigs_mysql_username@$fqdn identified by \"$real_puppet_storeconfigs_mysql_password\"'",
+                        refreshonly => true
+                    }
                 }
-
             }
 
             File["/etc/puppet/puppet.conf"] {


commit 9fe19014bd8b0a3e01a4337e2aaa742a3d8ed834
Author: Jeroen van Meeuwen (OGD) <j.van.meeuwen at ogd.nl>
Date:   Mon Aug 10 18:41:37 2009 +0200

    Add some debug messages

diff --git a/manifests/init.pp b/manifests/init.pp
index 5e0d7fb..f1955f9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -124,6 +124,8 @@ class puppet {
         $puppet_type = "client"
         $puppet_storeconfigs = "none"
 
+        debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password")
+
         $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username ? {
             '' => "puppet",
             default => $puppet_storeconfigs_mysql_username
@@ -182,6 +184,8 @@ class puppet {
             default => $environments
         }
 
+        debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password")
+
         $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username ? {
             '' => "puppet",
             default => $puppet_storeconfigs_mysql_username
@@ -315,6 +319,8 @@ class puppet {
             $puppet_type = "server"
             $puppet_storeconfigs = "mysql"
 
+            debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password")
+
             $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username ? {
                 '' => "puppet",
                 default => $puppet_storeconfigs_mysql_username
@@ -334,6 +340,19 @@ class puppet {
                 "127.0.0.1", "localhost", "localhost.localdomain": {
                     include mysql::server
                 }
+
+                exec { "$puppet_type-storeconfigs_mysql_create_db":
+                    command => "/usr/bin/mysqladmin create $puppet_storeconfigs_mysql_database",
+                    unless => "/usr/bin/mysqlcheck -u $real_puppet_storeconfigs_mysql_username --password=$real_puppet_storeconfigs_mysql_password -s puppet",
+                    notify => Exec["$puppet_type-storeconfigs_mysql_create_user"],
+                    creates => "/var/lib/mysql/$puppet_storeconfigs_mysql_database/"
+                }
+
+                exec { "$puppet_type-storeconfigs_mysql_create_user":
+                    command => "/usr/bin/mysql -e 'grant all privileges on puppet.* to $real_puppet_storeconfigs_mysql_username@$fqdn identified by \"$real_puppet_storeconfigs_mysql_password\"'",
+                    refreshonly => true
+                }
+
             }
 
             File["/etc/puppet/puppet.conf"] {
@@ -342,18 +361,6 @@ class puppet {
 
             realize(File["/etc/puppet/puppet.conf"])
 
-            exec { "$puppet_type-storeconfigs_mysql_create_db":
-                command => "/usr/bin/mysqladmin -h $real_storeconfigs_mysql_hostname create $puppet_storeconfigs_mysql_database",
-                unless => "/usr/bin/mysqlcheck -h $real_storeconfigs_mysql_hostname -u $real_puppet_storeconfigs_mysql_username --password=$real_puppet_storeconfigs_mysql_password -s puppet",
-                notify => Exec["$puppet_type-storeconfigs_mysql_create_user"],
-                creates => "/var/lib/mysql/$puppet_storeconfigs_mysql_database/"
-             }
-
-             exec { "$puppet_type-storeconfigs_mysql_create_user":
-                 command => "/usr/bin/mysql -h $real_storeconfigs_mysql_hostname -e 'grant all privileges on puppet.* to $real_puppet_storeconfigs_mysql_username@$fqdn identified by \"$real_puppet_storeconfigs_mysql_password\"'",
-                 refreshonly => true
-             }
-
         }
     }
 
@@ -364,6 +371,8 @@ class puppet {
         $puppet_type = "satellite"
         $puppet_storeconfigs = "none"
 
+        debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password")
+
         $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username ? {
             '' => "puppet",
             default => $puppet_storeconfigs_mysql_username
@@ -391,6 +400,8 @@ class puppet {
             $puppet_type = "satellite"
             $puppet_storeconfigs = "mysql"
 
+            debug("Current value of puppet_storeconfigs_mysql_password = $puppet_storeconfigs_mysql_password")
+
             $real_puppet_storeconfigs_mysql_username = $puppet_storeconfigs_mysql_username ? {
                 '' => "puppet",
                 default => $puppet_storeconfigs_mysql_username



From jmeeuwen at puppetmanaged.org  Tue Jul 20 13:33:43 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Tue, 20 Jul 2010 13:33:43 +0200
Subject: [Commits] Branch 'development' - manifests/init.pp
Message-ID: <201007201133.o6KBXhVK031256@master.puppetmanaged.org>

 manifests/init.pp |   20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 052dd7615c0a704d838c8fcfe5aca3501eeb8724
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Tue Jul 20 13:31:17 2010 +0200

    Try and resolve debian applying this

diff --git a/manifests/init.pp b/manifests/init.pp
index 9e19d50..04afe69 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,5 @@
 class puppet {
 
-    include $os
-
     @package { [
             "puppet",
             "puppet-server",
@@ -69,6 +67,10 @@ class puppet {
             path => "/etc/default/puppet"
         }
 
+        File["/usr/local/sbin/run_puppet"] {
+            group => "root"
+        }
+
         Package["puppet-server"] {
             name => "puppetmaster"
         }
@@ -697,18 +699,4 @@ class puppet {
             ]
         }
     }
-
-    class debian inherits puppet {
-        File["/usr/local/sbin/run_puppet"] {
-            group => root
-        }
-    }
-    class fedora inherits puppet {
-    }
-
-    class redhat inherits fedora {
-    }
-
-    class centos inherits redhat {
-    }
 }



From jmeeuwen at puppetmanaged.org  Thu Jul 22 13:49:18 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Thu, 22 Jul 2010 13:49:18 +0200
Subject: [Commits] Branch 'development' - files/tagmail.conf
Message-ID: <201007221149.o6MBnICf031503@master.puppetmanaged.org>

 files/tagmail.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf87e545c31cac387c8e1ca7da0f0cf1118bc8f0
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Thu Jul 22 13:49:14 2010 +0200

    Send email to root at localhost by default

diff --git a/files/tagmail.conf b/files/tagmail.conf
index 1c1c4f2..624f9a5 100644
--- a/files/tagmail.conf
+++ b/files/tagmail.conf
@@ -1 +1 @@
-all: kanarip at puppetmanaged.org
\ No newline at end of file
+all: root at localhost



From jmeeuwen at puppetmanaged.org  Sun Jul 25 10:31:38 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Sun, 25 Jul 2010 10:31:38 +0200
Subject: [Commits] Branch 'development' - files/mash
Message-ID: <201007250831.o6P8Vc0T017123@master.puppetmanaged.org>

 files/mash/custom-f11-ruby.mash |   16 ----------------
 files/mash/custom-f13-ruby.mash |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 2c08f7990db3d48137c980e9f5322065e0795c34
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun Jul 25 10:31:42 2010 +0200

    Add custom-f13-ruby.mash

diff --git a/files/mash/custom-f11-ruby.mash b/files/mash/custom-f11-ruby.mash
deleted file mode 100644
index 1b13100..0000000
--- a/files/mash/custom-f11-ruby.mash
+++ /dev/null
@@ -1,16 +0,0 @@
-# mash config file
-[custom-f11-ruby]
-rpm_path = %(arch)s/
-repodata_path = %(arch)s/
-source_path = SRPMS
-debuginfo = True
-multilib = True
-multilib_method = devel
-tag = custom-f11-ruby
-repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-f11-ruby/%(arch)s/
-repoviewtitle = "Fedora 11 - Custom Ruby Packages from Ergo Project - %(arch)s"
-use_repoview = True
-inherit = True
-latest = False
-arches = i386 x86_64
-
diff --git a/files/mash/custom-f13-ruby.mash b/files/mash/custom-f13-ruby.mash
new file mode 100644
index 0000000..0df4898
--- /dev/null
+++ b/files/mash/custom-f13-ruby.mash
@@ -0,0 +1,16 @@
+# mash config file
+[custom-f13-ruby]
+rpm_path = %(arch)s/
+repodata_path = %(arch)s/
+source_path = SRPMS
+debuginfo = True
+multilib = True
+multilib_method = devel
+tag = custom-f13-ruby
+repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-f13-ruby/%(arch)s/
+repoviewtitle = "Fedora 13 - Custom Ruby Packages from Ergo Project - %(arch)s"
+use_repoview = True
+inherit = False
+latest = False
+arches = i386 x86_64
+



From jmeeuwen at puppetmanaged.org  Sun Jul 25 15:48:47 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Sun, 25 Jul 2010 15:48:47 +0200
Subject: [Commits] Branch 'development' - puppet/manifests
Message-ID: <201007251348.o6PDmlF8031356@master.puppetmanaged.org>

 puppet/manifests/nodes/master.puppetmanaged.org.pp |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 13a19747ee118f274c8d5bb048bfe790989e368b
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun Jul 25 15:48:54 2010 +0200

    Add Hudson GIT repository

diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp
index e3f4c69..47322a4 100644
--- a/puppet/manifests/nodes/master.puppetmanaged.org.pp
+++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp
@@ -154,6 +154,18 @@ node 'master.puppetmanaged.org' {
     }
 
     git::repository { [
+            "hudson.git"
+        ]:
+        localtree => "/data/scm/git/git.ergo-project.org/",
+        shared => true,
+        public => true,
+        owner => "jmeeuwen",
+        description => "Hudson Continuous Integration",
+        group => "git-ergo-project.org-hudson",
+        recipients => [ "jeroen.van.meeuwen at ergo-project.org" ]
+    }
+
+    git::repository { [
             "busby.git",
             "koji.git",
             "mash.git",



From jmeeuwen at puppetmanaged.org  Wed Jul 28 16:51:40 2010
From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen)
Date: Wed, 28 Jul 2010 16:51:40 +0200
Subject: [Commits] Branch 'development' - files/run_puppet
Message-ID: <201007281451.o6SEpe9b019043@master.puppetmanaged.org>

 files/run_puppet |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit e8c1d8086ad013b2db80b01f329b262c631b31cc
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Wed Jul 28 16:51:36 2010 +0200

    Check /etc/default/puppet as well as /etc/sysconfig/puppet

diff --git a/files/run_puppet b/files/run_puppet
index d0ad768..a6a406c 100644
--- a/files/run_puppet
+++ b/files/run_puppet
@@ -8,6 +8,7 @@ rm -rf /var/lib/puppet/state/* >/dev/null 2>&1
 rm -rf /var/lib/puppet/localconfig.yaml >/dev/null 2>&1
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
+[ -f /etc/default/puppet ] && . /etc/default/puppet
 
 [ -z "${PUPPET_SERVER}" ] && PUPPET_SERVER_CMD="--server master.puppetmanaged.org" || PUPPET_SERVER_CMD="--server ${PUPPET_SERVER}"