From jmeeuwen at puppetmanaged.org Tue Apr 6 13:34:04 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 6 Apr 2010 13:34:04 +0200 Subject: [Commits] Branch 'development' - 6 commits - files/post-commit manifests/init.pp templates/commit-list.erb Message-ID: <201004061134.o36BY41P000912@master.puppetmanaged.org> files/post-commit | 9 ++++++++- manifests/init.pp | 13 ++++++++++++- templates/commit-list.erb | 3 ++- 3 files changed, 22 insertions(+), 3 deletions(-) New commits: commit 7f482799ce193c9550739b4d8a60bf2935096c1d Author: Sandro Janke Date: Wed Mar 31 21:14:09 2010 +0200 Fix off by one \n (+1 this time) diff --git a/templates/commit-list.erb b/templates/commit-list.erb index d37ba26..1cd031b 100644 --- a/templates/commit-list.erb +++ b/templates/commit-list.erb @@ -1,3 +1,2 @@ -<% recipients.each do |val| %> -<%= val %> +<% recipients.each do |val| %><%= val %> <% end -%> commit 66872326f0a5bce97d2828b68ab2de1f3a6a36d7 Author: Sandro Janke Date: Wed Mar 31 16:26:14 2010 +0200 Fix \n in template diff --git a/templates/commit-list.erb b/templates/commit-list.erb index fac1d56..d37ba26 100644 --- a/templates/commit-list.erb +++ b/templates/commit-list.erb @@ -1 +1,3 @@ -<% recipients.each do |val| %><%= val %><% end -%> +<% recipients.each do |val| %> +<%= val %> +<% end -%> commit eb01dfe87f5b35148e6f64fd2faf878c71146122 Merge: 0467be6... f55df42... Author: Sandro Janke Date: Wed Mar 31 09:43:22 2010 +0200 Merge branch 'development' of ssh://puppet.ogd.nl/git/git into development commit 0467be6077f195453f6fa17158ab43148fab2d3a Author: Sandro Janke Date: Wed Mar 31 09:35:17 2010 +0200 Fix composition of 'To: ' since format of commit-list has changed diff --git a/files/post-commit b/files/post-commit index 1cee946..073a40f 100755 --- a/files/post-commit +++ b/files/post-commit @@ -59,7 +59,14 @@ else echo "Subject: $subject" fi -echo "To: $recipients" +# Compose string for To: field +to_field="" +for rcpt in $recipients; do + [ -n $rcpt ] && to_field=`echo -n "$to_field$rcpt;"` +done +# Strip final ';' +to_field=`echo $to_field | sed -e 's/;$//'` +echo "To: $to_field" echo "X-Project: $project" module=$(basename `readlink -f $GIT_DIR`) echo "X-Git-Module: $module" commit fb59896977c479a760bf459dd6a15a411e93158f Author: Sandro Janke Date: Wed Mar 31 09:34:45 2010 +0200 Produce the recipient list in a format that send-unicode-email.py can handle diff --git a/templates/commit-list.erb b/templates/commit-list.erb index 7cf14a3..fac1d56 100644 --- a/templates/commit-list.erb +++ b/templates/commit-list.erb @@ -1 +1 @@ -<% recipients.each do |val| -%><%= val -%>;<% end -%> \ No newline at end of file +<% recipients.each do |val| %><%= val %><% end -%> commit f55df4288b7f051171428d0371f70dc6cc3d0f8a Author: Jeroen van Meeuwen (OGD) Date: Wed Oct 21 13:46:15 2009 +0200 Add the installation of package xinetd diff --git a/manifests/init.pp b/manifests/init.pp index f38025d..25bd69a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -29,6 +29,16 @@ class git { # service is running # + if defined(Package["xinetd"]) { + realize(Package["xinetd"]) + } else { + @package { "xinetd": + ensure => installed + } + + realize(Package["xinetd"]) + } + package { [ "diffstat", "git-daemon" @@ -45,7 +55,8 @@ class git { service { "xinetd": enable => true, - ensure => running + ensure => running, + require => Package["xinetd"] } file { "/git/": From jmeeuwen at puppetmanaged.org Thu Apr 8 14:58:00 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 8 Apr 2010 14:58:00 +0200 Subject: [Commits] Branch 'development' - 5 commits - files/configs.d manifests/init.pp Message-ID: <201004081258.o38Cw0BQ025141@master.puppetmanaged.org> files/configs.d/wordpress.conf | 2 +- manifests/init.pp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 766a0b8ddc2394e25c9e5149f6cd630c495436a9 Merge: 10fb950... 3e13264... Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 8 14:56:06 2010 +0200 Merge branch 'development' of ssh://puppet.ogd.nl/git/webserver into development commit 10fb950da824722a04cba90de19a39bbc14d3b05 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 8 14:55:42 2010 +0200 Switch default for nagios checks to false diff --git a/manifests/init.pp b/manifests/init.pp index ac80c63..3021a5c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -489,7 +489,7 @@ class webserver { $serveradmin = "root at localhost.localdomain", $filename = false, $documentroot = "/var/www/html", - $nagios_check = true, + $nagios_check = false, $webalizer = false, $webalizer_dir = false) { commit 3e13264634a61b7468f634c02b4fe53b52336101 Merge: 1fe5528... ea9c008... Author: Jeroen van Meeuwen (OGD) Date: Tue Mar 9 14:24:46 2010 +0100 Merge branch 'development' of ssh://git.puppetmanaged.org/git/puppet/webserver into development commit 191c5b61e7a4f9cf79f71d2cd23031bd1ce5f5fc Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Mar 9 14:23:38 2010 +0100 Fix indentation diff --git a/files/configs.d/wordpress.conf b/files/configs.d/wordpress.conf index 5552c00..e510c6d 100644 --- a/files/configs.d/wordpress.conf +++ b/files/configs.d/wordpress.conf @@ -1,5 +1,5 @@ Alias /wordpress /usr/share/wordpress - AllowOverride Options + AllowOverride Options commit 1fe55289bef1cd60f569d10211d31a593debefa5 Author: Jeroen van Meeuwen (OGD) Date: Tue Jan 26 17:06:49 2010 +0100 Shut up the webalizer cronjob diff --git a/manifests/init.pp b/manifests/init.pp index ac80c63..356ff3a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -620,7 +620,7 @@ class webserver { realize(Cron["webalizer"]) } else { @cron { "webalizer": - command => "find /etc/webalizer/ -type f -exec webalizer -c {} \;", + command => "find /etc/webalizer/ -type f -exec webalizer -c {} \; >>/var/log/webalizer.log 2>&1", hour => "*/3", minute => "0", require => Package["webalizer"] From jmeeuwen at puppetmanaged.org Thu Apr 8 15:12:50 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 8 Apr 2010 15:12:50 +0200 Subject: [Commits] Branch 'development' - 4 commits - manifests/init.pp Message-ID: <201004081312.o38DCo3I016926@master.puppetmanaged.org> manifests/init.pp | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) New commits: commit f95775d396c4e63967f1d0c14a3de0b8f5d754d3 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 8 15:07:10 2010 +0200 Correct inheritance diff --git a/manifests/init.pp b/manifests/init.pp index 294cdaa..079e1bd 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -205,7 +205,7 @@ class nagios { } } - class nsca inherits server { + class nsca inherits nagios { realize( Package["nsca"], File["/etc/nagios/nsca.cfg"], @@ -224,6 +224,10 @@ class nagios { } class active inherits client { + realize( + Package["nsca-client"], + File["/etc/nagios/send_nsca.cfg"] + ) } class passive inherits client { @@ -237,11 +241,14 @@ class nagios { } - class nsca inherits client { - realize( - Package["nsca-client"], - File["/etc/nagios/send_nsca.cfg"] - ) + # These are aliases for active/passive clients, by application name. + + class nsca { + include nagios::client::passive + } + + class nrpe { + include nagios::client::active } } } commit 32ae2ca6413eae38161c78f72bc9250ae2211a05 Author: Sandro Janke Date: Thu Apr 8 09:53:44 2010 +0200 Fix typo diff --git a/manifests/init.pp b/manifests/init.pp index 78698da..294cdaa 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -46,7 +46,7 @@ class nagios { "puppet://$server/files/nagios/client/send_nsca.cfg", "puppet://$server/nagios/client/send_nsca.cfg" ], - require => Pckage["nsca-client"] + require => Package["nsca-client"] } @package { [ commit e8cbc09ea2b72af193e1ef0f0ea90e312b0b4fe7 Author: Sandro Janke Date: Wed Apr 7 14:01:56 2010 +0200 Add NSCA to the mix for passive checks (i.e. munin --> nagios) diff --git a/manifests/init.pp b/manifests/init.pp index 1c292e1..78698da 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,9 +18,42 @@ class nagios { require => Package["nrpe"] } + @file { "/etc/nagios/nsca.cfg": + ensure => file, + mode => 644, + owner => "root", + group => "root", + source => [ + "puppet://$server/private/$environment/nagios/server/nsca.cfg.$hostname", + "puppet://$server/private/$environment/nagios/server/nsca.cfg", + "puppet://$server/files/nagios/server/nsca.cfg.$hostname", + "puppet://$server/files/nagios/server/nsca.cfg", + "puppet://$server/nagios/server/nsca.cfg" + ], + notify => Service["nsca"], + require => Package["nsca"] + } + + @file { "/etc/nagios/send_nsca.cfg": + ensure => file, + mode => 600, + owner => "root", + group => "root", + source => [ + "puppet://$server/private/$environment/nagios/client/send_nsca.cfg.$hostname", + "puppet://$server/private/$environment/nagios/client/send_nsca.cfg", + "puppet://$server/files/nagios/client/send_nsca.cfg.$hostname", + "puppet://$server/files/nagios/client/send_nsca.cfg", + "puppet://$server/nagios/client/send_nsca.cfg" + ], + require => Pckage["nsca-client"] + } + @package { [ "nagios", - "nrpe" + "nrpe", + "nsca", + "nsca-client" ]: ensure => installed } @@ -131,6 +164,15 @@ class nagios { } } + @service { "nsca": + enable => true, + ensure => running, + require => [ + Package["nsca"], + File["/etc/nagios/nsca.cfg"] + ] + } + class server inherits nagios { Nagios_host <<| tag == $domain |>> @@ -162,6 +204,14 @@ class nagios { notify => Service["nagios"] } } + + class nsca inherits server { + realize( + Package["nsca"], + File["/etc/nagios/nsca.cfg"], + Service["nsca"] + ) + } } class client inherits nagios { @@ -186,5 +236,12 @@ class nagios { Package <| tag == "nagios-plugins" |> } + + class nsca inherits client { + realize( + Package["nsca-client"], + File["/etc/nagios/send_nsca.cfg"] + ) + } } } commit dbd055744a14d9f41984cbe98fe11d093abf8dc8 Author: Jeroen van Meeuwen (OGD) Date: Mon Nov 23 00:32:35 2009 +0100 Add plugin distribution diff --git a/manifests/init.pp b/manifests/init.pp index 23045d1..1c292e1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -115,6 +115,22 @@ class nagios { enable => true } + define plugin($enable) { + file { "/usr/lib64/nagios/plugins/$name": + ensure => file, + mode => 755, + owner => "root", + group => "root", + source => [ + "puppet://$server/private/$environment/nagios/plugins/$name.$hostname", + "puppet://$server/private/$environment/nagios/plugins/$name", + "puppet://$server/files/nagios/plugins/$name.$hostname", + "puppet://$server/files/nagios/plugins/$name", + "puppet://$server/nagios/plugins/$name" + ] + } + } + class server inherits nagios { Nagios_host <<| tag == $domain |>> From jmeeuwen at puppetmanaged.org Mon Apr 12 12:39:52 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Mon, 12 Apr 2010 12:39:52 +0200 Subject: [Commits] Branch 'development' - lib/facter plugins plugins/facter Message-ID: <201004121039.o3CAdqUM014446@master.puppetmanaged.org> lib/facter/gem_passenger_version.rb | 5 ++++ lib/facter/php_version.rb | 37 ++++++++++++++++++++++++++++++++ plugins | 1 plugins/facter/gem_passenger_version.rb | 5 ---- plugins/facter/php_version.rb | 37 -------------------------------- 5 files changed, 43 insertions(+), 42 deletions(-) New commits: commit a36997c8a262f10853768d19f3f2662a1fe3c240 Author: Jeroen van Meeuwen (Fedora Unity) Date: Mon Apr 12 12:38:04 2010 +0200 Update location for facts and plugins diff --git a/lib/facter/gem_passenger_version.rb b/lib/facter/gem_passenger_version.rb new file mode 100644 index 0000000..3979d1e --- /dev/null +++ b/lib/facter/gem_passenger_version.rb @@ -0,0 +1,5 @@ +require 'facter' +Facter.add(:gem_passenger_version) do + setcode do %x{rpmquery --qf='%{VERSION}' rubygem-passenger} end +end + diff --git a/lib/facter/php_version.rb b/lib/facter/php_version.rb new file mode 100644 index 0000000..99bc350 --- /dev/null +++ b/lib/facter/php_version.rb @@ -0,0 +1,37 @@ +require 'facter' + +phpversion = nil +if FileTest.exists?("/usr/bin/php") + phpversion = %x{php -v 2>/dev/null}.split(" ")[1] +else + phpversion = "0.0.0" +end + +Facter.add("phpversion") do + 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 +end + +Facter.add("phpmmversion") do + phpmmversion = nil + if phpversion != nil + phpversionsplit = phpversion.split(".") + phpmmversion = phpversionsplit[0] + "." + phpversionsplit[1] + end + setcode do + phpmmversion + end +end + diff --git a/plugins b/plugins new file mode 120000 index 0000000..7951405 --- /dev/null +++ b/plugins @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/plugins/facter/gem_passenger_version.rb b/plugins/facter/gem_passenger_version.rb deleted file mode 100644 index 3979d1e..0000000 --- a/plugins/facter/gem_passenger_version.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'facter' -Facter.add(:gem_passenger_version) do - setcode do %x{rpmquery --qf='%{VERSION}' rubygem-passenger} end -end - diff --git a/plugins/facter/php_version.rb b/plugins/facter/php_version.rb deleted file mode 100644 index 99bc350..0000000 --- a/plugins/facter/php_version.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'facter' - -phpversion = nil -if FileTest.exists?("/usr/bin/php") - phpversion = %x{php -v 2>/dev/null}.split(" ")[1] -else - phpversion = "0.0.0" -end - -Facter.add("phpversion") do - 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 -end - -Facter.add("phpmmversion") do - phpmmversion = nil - if phpversion != nil - phpversionsplit = phpversion.split(".") - phpmmversion = phpversionsplit[0] + "." + phpversionsplit[1] - end - setcode do - phpmmversion - end -end - From jmeeuwen at puppetmanaged.org Tue Apr 13 21:05:33 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 13 Apr 2010 21:05:33 +0200 Subject: [Commits] Branch 'production' - files/plugins Message-ID: <201004131905.o3DJ5X6Y009670@master.puppetmanaged.org> files/plugins/mysql_queries_average | 13 +++++++++++++ 1 file changed, 13 insertions(+) New commits: commit ff217c3a47581d13306aef4d6176c412bf538a8e Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 13 21:03:39 2010 +0200 Add mysql_queries_average for trending diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average new file mode 100755 index 0000000..4d929b5 --- /dev/null +++ b/files/plugins/mysql_queries_average @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ "$1" = "config" ]; then + echo "graph_title MySQL Queries Average" + echo 'graph_category mysql' + echo "graph_info This graph shows the MySQL average queries per second" + echo 'mysql_queries_average.label Queries' + echo "mysql_queries_average.type GAUGE" + exit 0 +fi + +echo -n "mysql_queries_average.value " +echo $(for val in `mysql -e 'show status\g' | grep -E "(Uptime|Queries)" | awk '{print $2}' | head -n 2`; do echo -n "$val "; done; echo "") | awk '{print $1/$2}' From jmeeuwen at puppetmanaged.org Tue Apr 13 21:05:58 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 13 Apr 2010 21:05:58 +0200 Subject: [Commits] Branch 'development' - files/plugins Message-ID: <201004131905.o3DJ5wSK009724@master.puppetmanaged.org> files/plugins/mysql_queries_average | 13 +++++++++++++ 1 file changed, 13 insertions(+) New commits: commit ff217c3a47581d13306aef4d6176c412bf538a8e Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 13 21:03:39 2010 +0200 Add mysql_queries_average for trending diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average new file mode 100755 index 0000000..4d929b5 --- /dev/null +++ b/files/plugins/mysql_queries_average @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ "$1" = "config" ]; then + echo "graph_title MySQL Queries Average" + echo 'graph_category mysql' + echo "graph_info This graph shows the MySQL average queries per second" + echo 'mysql_queries_average.label Queries' + echo "mysql_queries_average.type GAUGE" + exit 0 +fi + +echo -n "mysql_queries_average.value " +echo $(for val in `mysql -e 'show status\g' | grep -E "(Uptime|Queries)" | awk '{print $2}' | head -n 2`; do echo -n "$val "; done; echo "") | awk '{print $1/$2}' From jmeeuwen at puppetmanaged.org Tue Apr 13 21:05:58 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 13 Apr 2010 21:05:58 +0200 Subject: [Commits] Branch 'testing' - files/plugins Message-ID: <201004131905.o3DJ5wOL009757@master.puppetmanaged.org> files/plugins/mysql_queries_average | 13 +++++++++++++ 1 file changed, 13 insertions(+) New commits: commit ff217c3a47581d13306aef4d6176c412bf538a8e Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 13 21:03:39 2010 +0200 Add mysql_queries_average for trending diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average new file mode 100755 index 0000000..4d929b5 --- /dev/null +++ b/files/plugins/mysql_queries_average @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ "$1" = "config" ]; then + echo "graph_title MySQL Queries Average" + echo 'graph_category mysql' + echo "graph_info This graph shows the MySQL average queries per second" + echo 'mysql_queries_average.label Queries' + echo "mysql_queries_average.type GAUGE" + exit 0 +fi + +echo -n "mysql_queries_average.value " +echo $(for val in `mysql -e 'show status\g' | grep -E "(Uptime|Queries)" | awk '{print $2}' | head -n 2`; do echo -n "$val "; done; echo "") | awk '{print $1/$2}' From jmeeuwen at puppetmanaged.org Tue Apr 13 22:25:58 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 13 Apr 2010 22:25:58 +0200 Subject: [Commits] Branch 'development' - files/plugins Message-ID: <201004132025.o3DKPwUJ026215@master.puppetmanaged.org> files/plugins/mysql_queries_average | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 778516102ac44cd4188fdad5045b0542af2e3a2c Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 13 22:24:06 2010 +0200 Use mysqlopts diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average index 4d929b5..f8d2c44 100755 --- a/files/plugins/mysql_queries_average +++ b/files/plugins/mysql_queries_average @@ -10,4 +10,4 @@ if [ "$1" = "config" ]; then fi echo -n "mysql_queries_average.value " -echo $(for val in `mysql -e 'show status\g' | grep -E "(Uptime|Queries)" | awk '{print $2}' | head -n 2`; do echo -n "$val "; done; echo "") | awk '{print $1/$2}' +echo $(for val in `mysql ${mysqlopts} -e 'show status\g' | grep -E "(Uptime|Queries)" | awk '{print $2}' | head -n 2`; do echo -n "$val "; done; echo "") | awk '{print $1/$2}' From jmeeuwen at puppetmanaged.org Wed Apr 14 11:31:44 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 14 Apr 2010 11:31:44 +0200 Subject: [Commits] Branch 'development' - files/plugins Message-ID: <201004140931.o3E9ViHx009242@master.puppetmanaged.org> files/plugins/mysql_queries_average | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) New commits: commit e0589a104cf3a57f7f1f99ff47c682265d90d0ea Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 14 11:29:42 2010 +0200 Rewrite mysql_queries_average to be a little more robust diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average index f8d2c44..5738817 100755 --- a/files/plugins/mysql_queries_average +++ b/files/plugins/mysql_queries_average @@ -9,5 +9,21 @@ if [ "$1" = "config" ]; then exit 0 fi +# Depending on the MySQL version, mysql status displays the following relevant: +# +# - uptime, queries +# - uptime, questions + +uptime=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Uptime[^_]\s*" | awk '{print $2}'` +questions=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Questions[^_]\s*" | awk '{print $2}'` +queries=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Questions[^_]\s*" | awk '{print $2}'` + +if [ $questions -gt $queries ]; then + # Here we assume we need questions here + real_queries=$questions +else + real_queries=$queries +fi + echo -n "mysql_queries_average.value " -echo $(for val in `mysql ${mysqlopts} -e 'show status\g' | grep -E "(Uptime|Queries)" | awk '{print $2}' | head -n 2`; do echo -n "$val "; done; echo "") | awk '{print $1/$2}' +echo "$real_queries $uptime" | awk '{print $1/$2}' From jmeeuwen at puppetmanaged.org Wed Apr 14 12:40:38 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 14 Apr 2010 12:40:38 +0200 Subject: [Commits] Branch 'development' - files/plugins Message-ID: <201004141040.o3EAecoU014677@master.puppetmanaged.org> files/plugins/mysql_queries_average | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0a360d2ca76bba17bae129a802dfa9212e3ca8b6 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 14 12:38:42 2010 +0200 Update mysql_queries_average munin plugin diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average index 5738817..4cfcf6f 100755 --- a/files/plugins/mysql_queries_average +++ b/files/plugins/mysql_queries_average @@ -16,9 +16,9 @@ fi uptime=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Uptime[^_]\s*" | awk '{print $2}'` questions=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Questions[^_]\s*" | awk '{print $2}'` -queries=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Questions[^_]\s*" | awk '{print $2}'` +queries=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Queries[^_]\s*" | awk '{print $2}'` -if [ $questions -gt $queries ]; then +if [ $questions -ge $queries ]; then # Here we assume we need questions here real_queries=$questions else From jmeeuwen at puppetmanaged.org Sun Apr 18 16:58:56 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Sun, 18 Apr 2010 16:58:56 +0200 Subject: [Commits] Branch 'development' - puppet/manifests webserver/sites Message-ID: <201004181458.o3IEwurW013618@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 1 webserver/sites/webmail.ergo-project.org.conf | 74 +++++++++++++++++++++ 2 files changed, 75 insertions(+) New commits: commit 20a6fc3c48a20dadf3d1356f55f99842d8948bcf Author: Jeroen van Meeuwen (Fedora Unity) Date: Sun Apr 18 16:56:52 2010 +0200 Add webmail.ergo-project.org to the mix diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index fed113f..2401474 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -630,6 +630,7 @@ node 'master.puppetmanaged.org' { "git.puppetmanaged.org", "mirror.nl.ergo-project.org", "mirror.nl.kanarip.com", + "webmail.ergo-project.org", "www.orangesombrero.org" ]: certificate => false diff --git a/webserver/sites/webmail.ergo-project.org.conf b/webserver/sites/webmail.ergo-project.org.conf new file mode 100644 index 0000000..97ed274 --- /dev/null +++ b/webserver/sites/webmail.ergo-project.org.conf @@ -0,0 +1,74 @@ +# Managed by puppet + + + ServerAdmin sysadmin-main at ergo-project.org + ServerName webmail.ergo-project.org + DocumentRoot /var/www/html/ + + ErrorLog logs/webmail.ergo-project.org-error_log + CustomLog logs/webmail.ergo-project.org-access_log combined + + RedirectMatch ^[/]*(.*)$ https://webmail.ergo-project.org/$1 + + + + ServerAdmin sysadmin-main at ergo-project.org + ServerName webmail.ergo-project.org + DocumentRoot /var/www/ergo-project.org/webmail/public_html/ + + ErrorLog logs/webmail.ergo-project.org-error_log + CustomLog logs/webmail.ergo-project.org-access_log combined + + SSLEngine on + SSLProxyEngine on + SSLProtocol all -SSLv2 + SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW + SSLCertificateFile /etc/pki/tls/certs/webmail.ergo-project.org.cert + SSLCertificateKeyFile /etc/pki/tls/private/webmail.ergo-project.org.key + SSLCACertificateFile /etc/pki/tls/certs/webmail.ergo-project.org.ca.cert + + + SSLOptions +StdEnvVars + + + + SSLOptions +StdEnvVars + + + ## + ## Zarafa configuration + ## + Alias /Microsoft-Server-ActiveSync /usr/share/zarafa/z-push/index.php + RedirectMatch ^/mobile https://webmail.ergo-project.org/webaccess-mobile/ + RedirectMatch ^/classic https://webmail.ergo-project.org/webaccess-classic/ + RedirectMatch ^/$ https://webmail.ergo-project.org/webaccess/ + + ProxyRequests Off + ProxyPass /ical/ https://localhost:8443/ical/ keepalive=on retry=0 + ProxyPassReverse /ical/ https://localhost:8443/ical/ + + KeepAlive On + KeepAliveTimeout 300 + MaxKeepAliveRequests 0 + + # If the PHP settings are not set up correctly, login will fail + # + + + SecRuleRemoveById 960015 + + + php_value magic_quotes_gpc off + php_value register_globals off + php_value magic_quotes_runtime off + php_value short_open_tag on + php_value allow_call_time_pass_reference on + + + + AllowOverride Options + Order Allow,Deny + Allow from all + + + From jmeeuwen at puppetmanaged.org Tue Apr 27 11:37:00 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 27 Apr 2010 11:37:00 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004270937.o3R9b0jL030799@master.puppetmanaged.org> files/mash/custom-el4-ogd.nl.mash | 15 --------------- files/mash/custom-el5-kanarip.com.mash | 16 ---------------- files/mash/custom-el5-ogd.nl.mash | 16 ---------------- files/mash/custom-f12-kanarip.com.mash | 15 --------------- files/mash/devel-el5-kolabsys.com.mash | 16 ---------------- files/mash/devel-f12-kolabsys.com.mash | 16 ---------------- files/mash/dist-f12-ruby.mash | 15 --------------- files/mash/feature-el5-ruby-1.8.6.mash | 16 ---------------- files/mash/feature-el5-ruby-1.9.1.mash | 16 ---------------- files/mash/feature-f12-ruby.mash | 15 --------------- files/mash/mash.conf | 4 ++-- files/mash/rpmfusion-f12-free-release.mash | 15 --------------- files/mash/rpmfusion-f12-free-updates.mash | 15 --------------- files/mash/rpmfusion-f12-nonfree-release.mash | 15 --------------- files/mash/rpmfusion-f12-nonfree-updates.mash | 15 --------------- 15 files changed, 2 insertions(+), 218 deletions(-) New commits: commit 882a170ad181257cfa53788d80ea16779e2194c8 Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 27 11:35:02 2010 +0200 Start over on mash diff --git a/files/mash/custom-el4-ogd.nl.mash b/files/mash/custom-el4-ogd.nl.mash deleted file mode 100644 index 8036b56..0000000 --- a/files/mash/custom-el4-ogd.nl.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[custom-el4-ogd.nl] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = custom-el4-ogd.nl -repoviewurl = http://mirror.nl.kanarip.com/custom/custom-el4-ogd.nl/%(arch)s/ -repoviewtitle = "Enterprise Linux 4 Custom Packages for ogd.nl - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/custom-el5-kanarip.com.mash b/files/mash/custom-el5-kanarip.com.mash deleted file mode 100644 index 34f09ac..0000000 --- a/files/mash/custom-el5-kanarip.com.mash +++ /dev/null @@ -1,16 +0,0 @@ -# mash config file -[custom-el5-kanarip.com] -hash = md5 -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = custom-el5-kanarip.com -repoviewurl = http://mirror.nl.kanarip.com/custom/custom-el5-kanarip.com/%(arch)s/ -repoviewtitle = "Enterprise Linux 5 Custom Packages for kanarip.com - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/custom-el5-ogd.nl.mash b/files/mash/custom-el5-ogd.nl.mash deleted file mode 100644 index e8a4893..0000000 --- a/files/mash/custom-el5-ogd.nl.mash +++ /dev/null @@ -1,16 +0,0 @@ -# mash config file -[custom-el5-ogd.nl] -hash = md5 -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = custom-el5-ogd.nl -repoviewurl = http://mirror.nl.kanarip.com/custom/custom-el5-ogd.nl/%(arch)s/ -repoviewtitle = "Enterprise Linux 5 Custom Packages for ogd.nl - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/custom-f12-kanarip.com.mash b/files/mash/custom-f12-kanarip.com.mash deleted file mode 100644 index c6d1831..0000000 --- a/files/mash/custom-f12-kanarip.com.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[custom-f12-kanarip.com] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = custom-f12-kanarip.com -repoviewurl = http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/%(arch)s/ -repoviewtitle = "Fedora 12 Custom Packages for kanarip.com - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/devel-el5-kolabsys.com.mash b/files/mash/devel-el5-kolabsys.com.mash deleted file mode 100644 index f48abc4..0000000 --- a/files/mash/devel-el5-kolabsys.com.mash +++ /dev/null @@ -1,16 +0,0 @@ -# mash config file -[devel-el5-kolabsys.com] -hash = md5 -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = devel-el5-kolabsys.com -repoviewurl = http://mirror.nl.kanarip.com/custom/devel-el5-kolabsys.com/%(arch)s/ -repoviewtitle = "Enterprise Linux 5 Custom Packages for Kolab - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/devel-f12-kolabsys.com.mash b/files/mash/devel-f12-kolabsys.com.mash deleted file mode 100644 index 3a3ee31..0000000 --- a/files/mash/devel-f12-kolabsys.com.mash +++ /dev/null @@ -1,16 +0,0 @@ -# mash config file -[devel-f12-kolabsys.com] -hash = md5 -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = devel-f12-kolabsys.com -repoviewurl = http://mirror.nl.kanarip.com/custom/devel-f12-kolabsys.com/%(arch)s/ -repoviewtitle = "Fedora 12 Custom Packages for Kolab - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/dist-f12-ruby.mash b/files/mash/dist-f12-ruby.mash deleted file mode 100644 index fec769b..0000000 --- a/files/mash/dist-f12-ruby.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[dist-f12-ruby] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = dist-f12-ruby -repoviewurl = http://mirror.nl.kanarip.com/custom/dist-f12-ruby/%(arch)s/ -repoviewtitle = "Fedora 12 Ruby - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/feature-el5-ruby-1.8.6.mash b/files/mash/feature-el5-ruby-1.8.6.mash deleted file mode 100644 index 0da45db..0000000 --- a/files/mash/feature-el5-ruby-1.8.6.mash +++ /dev/null @@ -1,16 +0,0 @@ -# mash config file -[feature-el5-ruby-1.8.6] -hash = md5 -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = feature-el5-ruby-1.8.6 -repoviewurl = http://mirror.nl.kanarip.com/custom/feature-el5-ruby-1.8.6/%(arch)s/ -repoviewtitle = "Enterprise Linux 5 Ruby 1.8.6 Packages - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/feature-el5-ruby-1.9.1.mash b/files/mash/feature-el5-ruby-1.9.1.mash deleted file mode 100644 index 8c48ddf..0000000 --- a/files/mash/feature-el5-ruby-1.9.1.mash +++ /dev/null @@ -1,16 +0,0 @@ -# mash config file -[feature-el5-ruby-1.9.1] -hash = md5 -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = feature-el5-ruby-1.9.1 -repoviewurl = http://mirror.nl.kanarip.com/custom/feature-el5-ruby-1.9.1/%(arch)s/ -repoviewtitle = "Enterprise Linux 5 Ruby 1.9.1 Packages - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/feature-f12-ruby.mash b/files/mash/feature-f12-ruby.mash deleted file mode 100644 index 1c6b138..0000000 --- a/files/mash/feature-f12-ruby.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[feature-f12-ruby] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = feature-f12-ruby -repoviewurl = http://mirror.nl.kanarip.com/custom/feature-f12-ruby/%(arch)s/ -repoviewtitle = "Fedora 12 Ruby - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/mash.conf b/files/mash/mash.conf index 23b8a84..874b3b3 100644 --- a/files/mash/mash.conf +++ b/files/mash/mash.conf @@ -1,7 +1,7 @@ [defaults] configdir = /etc/mash -buildhost = http://koji.green-beret.org/kojihub +buildhost = http://koji.ergo-project.org/kojihub repodir = file:///data/koji -outputdir = /data/os/repos/custom/ +outputdir = /srv/ergo-project/mash use_sqlite = True use_repoview = True diff --git a/files/mash/rpmfusion-f12-free-release.mash b/files/mash/rpmfusion-f12-free-release.mash deleted file mode 100644 index 72b49cc..0000000 --- a/files/mash/rpmfusion-f12-free-release.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[rpmfusion-f12-free-release] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = rpmfusion-f12-free-release -repoviewurl = http://mirror.nl.kanarip.com/custom/rpmfusion-f12-free-release/%(arch)s/ -repoviewtitle = "Fedora 12 RPMFusion Free Packages - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/rpmfusion-f12-free-updates.mash b/files/mash/rpmfusion-f12-free-updates.mash deleted file mode 100644 index da4921e..0000000 --- a/files/mash/rpmfusion-f12-free-updates.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[rpmfusion-f12-free-updates] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = rpmfusion-f12-free-updates -repoviewurl = http://mirror.nl.kanarip.com/custom/rpmfusion-f12-free-updates/%(arch)s/ -repoviewtitle = "Fedora 12 RPMFusion Free Packages - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/rpmfusion-f12-nonfree-release.mash b/files/mash/rpmfusion-f12-nonfree-release.mash deleted file mode 100644 index d95da22..0000000 --- a/files/mash/rpmfusion-f12-nonfree-release.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[rpmfusion-f12-nonfree-release] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = rpmfusion-f12-nonfree-release -repoviewurl = http://mirror.nl.kanarip.com/custom/rpmfusion-f12-nonfree-release/%(arch)s/ -repoviewtitle = "Fedora 12 RPMFusion non-Free Packages - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 diff --git a/files/mash/rpmfusion-f12-nonfree-updates.mash b/files/mash/rpmfusion-f12-nonfree-updates.mash deleted file mode 100644 index 2cc7d0d..0000000 --- a/files/mash/rpmfusion-f12-nonfree-updates.mash +++ /dev/null @@ -1,15 +0,0 @@ -# mash config file -[rpmfusion-f12-nonfree-updates] -rpm_path = %(arch)s/ -repodata_path = %(arch)s/ -source_path = SRPMS -debuginfo = True -multilib = True -multilib_method = devel -tag = rpmfusion-f12-nonfree-updates -repoviewurl = http://mirror.nl.kanarip.com/custom/rpmfusion-f12-nonfree-updates/%(arch)s/ -repoviewtitle = "Fedora 12 RPMFusion non-Free Packages - %(arch)s" -use_repoview = True -inherit = True -latest = False -arches = i386 x86_64 From jmeeuwen at puppetmanaged.org Tue Apr 27 11:44:05 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 27 Apr 2010 11:44:05 +0200 Subject: [Commits] Branch 'development' - 3 commits - puppet/manifests yum/CentOS yum/Fedora yum/RedHat Message-ID: <201004270944.o3R9i5G5012846@master.puppetmanaged.org> puppet/manifests/nodes/anakin.kanarip.com.pp | 3 -- puppet/manifests/nodes/animal.kanarip.com.pp | 3 -- puppet/manifests/nodes/casper.kanarip.com.pp | 3 -- puppet/manifests/nodes/clyde.kanarip.com.pp | 3 -- puppet/manifests/nodes/donnie.kanarip.com.pp | 3 -- puppet/manifests/nodes/eleanor.kanarip.com.pp | 3 -- puppet/manifests/nodes/elwood.kanarip.com.pp | 3 -- puppet/manifests/nodes/finkel.kanarip.com.pp | 3 -- puppet/manifests/nodes/ghandalf.kanarip.com.pp | 6 ----- puppet/manifests/nodes/laurel.kanarip.com.pp | 3 -- puppet/manifests/nodes/pinky.kanarip.com.pp | 4 --- puppet/manifests/nodes/santino.kanarip.com.pp | 3 -- puppet/manifests/nodes/slevin.kanarip.com.pp | 3 -- puppet/manifests/nodes/tom.kanarip.com.pp | 3 -- puppet/manifests/nodes/vito.kanarip.com.pp | 4 --- puppet/manifests/nodes/weee.kanarip.com.pp | 5 ---- yum/CentOS/4/repos/custom.repo | 5 ---- yum/CentOS/4/repos/custom.repo.disabled | 5 ---- yum/CentOS/5/repos/custom-kanarip.com.repo | 5 ---- yum/CentOS/5/repos/custom-kanarip.com.repo.disabled | 5 ---- yum/Fedora/10.91/repos/custom.repo | 5 ---- yum/Fedora/10.91/repos/custom.repo.disabled | 5 ---- yum/Fedora/10.91/repos/ruby.repo | 19 ---------------- yum/Fedora/10.91/repos/ruby.repo.disabled | 19 ---------------- yum/Fedora/10/repos/custom.repo | 5 ---- yum/Fedora/10/repos/custom.repo.disabled | 5 ---- yum/Fedora/10/repos/ruby.repo | 19 ---------------- yum/Fedora/10/repos/ruby.repo.disabled | 19 ---------------- yum/Fedora/11/repos/custom.repo | 5 ---- yum/Fedora/11/repos/custom.repo.disabled | 5 ---- yum/Fedora/11/repos/ruby.repo | 19 ---------------- yum/Fedora/11/repos/ruby.repo.disabled | 19 ---------------- yum/Fedora/12/repos/custom-kanarip.com.repo | 20 ----------------- yum/Fedora/12/repos/custom-kanarip.com.repo.disabled | 20 ----------------- yum/Fedora/12/repos/dist-ruby.repo | 22 ------------------- yum/Fedora/12/repos/dist-ruby.repo.disabled | 22 ------------------- yum/Fedora/12/repos/feature-ruby.repo | 22 ------------------- yum/Fedora/12/repos/feature-ruby.repo.disabled | 22 ------------------- yum/Fedora/12/repos/ruby.repo | 22 ------------------- yum/Fedora/12/repos/ruby.repo.disabled | 22 ------------------- yum/Fedora/8/repos/custom.repo | 5 ---- yum/Fedora/8/repos/custom.repo.disabled | 5 ---- yum/Fedora/9/repos/custom.repo | 5 ---- yum/Fedora/9/repos/custom.repo.disabled | 5 ---- yum/RedHat/4/repos/custom.repo | 5 ---- yum/RedHat/4/repos/custom.repo.disabled | 5 ---- yum/RedHat/5/repos/custom.repo | 5 ---- yum/RedHat/5/repos/custom.repo.disabled | 5 ---- 48 files changed, 431 deletions(-) New commits: commit 5131fe0c0fb629cedeb7ee76aa904410a9732fd0 Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 27 11:42:02 2010 +0200 Remove custom and ruby repositories from nodes diff --git a/puppet/manifests/nodes/anakin.kanarip.com.pp b/puppet/manifests/nodes/anakin.kanarip.com.pp index 4ea1ad3..05d33ec 100644 --- a/puppet/manifests/nodes/anakin.kanarip.com.pp +++ b/puppet/manifests/nodes/anakin.kanarip.com.pp @@ -7,7 +7,4 @@ node 'anakin.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/animal.kanarip.com.pp b/puppet/manifests/nodes/animal.kanarip.com.pp index 3c63885..5249bfd 100644 --- a/puppet/manifests/nodes/animal.kanarip.com.pp +++ b/puppet/manifests/nodes/animal.kanarip.com.pp @@ -6,7 +6,4 @@ node 'animal.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/casper.kanarip.com.pp b/puppet/manifests/nodes/casper.kanarip.com.pp index 29d5992..614ba81 100644 --- a/puppet/manifests/nodes/casper.kanarip.com.pp +++ b/puppet/manifests/nodes/casper.kanarip.com.pp @@ -6,7 +6,4 @@ node 'casper.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/clyde.kanarip.com.pp b/puppet/manifests/nodes/clyde.kanarip.com.pp index 86db7d0..02b4c10 100644 --- a/puppet/manifests/nodes/clyde.kanarip.com.pp +++ b/puppet/manifests/nodes/clyde.kanarip.com.pp @@ -6,7 +6,4 @@ node 'clyde.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/donnie.kanarip.com.pp b/puppet/manifests/nodes/donnie.kanarip.com.pp index 4078273..c481044 100644 --- a/puppet/manifests/nodes/donnie.kanarip.com.pp +++ b/puppet/manifests/nodes/donnie.kanarip.com.pp @@ -265,7 +265,4 @@ node 'donnie.kanarip.com' { webserver::virtualhost { "munin.kanarip.com": } - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/eleanor.kanarip.com.pp b/puppet/manifests/nodes/eleanor.kanarip.com.pp index 8259cce..e177c9d 100644 --- a/puppet/manifests/nodes/eleanor.kanarip.com.pp +++ b/puppet/manifests/nodes/eleanor.kanarip.com.pp @@ -6,7 +6,4 @@ node 'eleanor.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index a35cace..5e705ae 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -111,7 +111,4 @@ node 'elwood.kanarip.com' { certificate => false } - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/finkel.kanarip.com.pp b/puppet/manifests/nodes/finkel.kanarip.com.pp index 5ed22ef..11d99ed 100644 --- a/puppet/manifests/nodes/finkel.kanarip.com.pp +++ b/puppet/manifests/nodes/finkel.kanarip.com.pp @@ -6,7 +6,4 @@ node 'finkel.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/ghandalf.kanarip.com.pp b/puppet/manifests/nodes/ghandalf.kanarip.com.pp index 7564c06..3dee9a4 100644 --- a/puppet/manifests/nodes/ghandalf.kanarip.com.pp +++ b/puppet/manifests/nodes/ghandalf.kanarip.com.pp @@ -89,10 +89,4 @@ node 'ghandalf.kanarip.com' { enable => true } - yum::repository { [ - "custom-kanarip.com", - "dist-ruby" - ]: - enable => true - } } diff --git a/puppet/manifests/nodes/laurel.kanarip.com.pp b/puppet/manifests/nodes/laurel.kanarip.com.pp index c21469d..4d9a9e2 100644 --- a/puppet/manifests/nodes/laurel.kanarip.com.pp +++ b/puppet/manifests/nodes/laurel.kanarip.com.pp @@ -25,7 +25,4 @@ node 'laurel.kanarip.com' { remounts => true } - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/pinky.kanarip.com.pp b/puppet/manifests/nodes/pinky.kanarip.com.pp index d570c48..f90511e 100644 --- a/puppet/manifests/nodes/pinky.kanarip.com.pp +++ b/puppet/manifests/nodes/pinky.kanarip.com.pp @@ -83,10 +83,6 @@ node 'pinky.kanarip.com' { certificate => false } - yum::repository { "custom": - enable => true - } - mount { "/data/backup/": atboot => true, device => "elwood:/data/backup/", diff --git a/puppet/manifests/nodes/santino.kanarip.com.pp b/puppet/manifests/nodes/santino.kanarip.com.pp index 549d11b..6bce9b8 100644 --- a/puppet/manifests/nodes/santino.kanarip.com.pp +++ b/puppet/manifests/nodes/santino.kanarip.com.pp @@ -25,7 +25,4 @@ node 'santino.kanarip.com' { remounts => true } - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/slevin.kanarip.com.pp b/puppet/manifests/nodes/slevin.kanarip.com.pp index 8d69561..7e8ff6a 100644 --- a/puppet/manifests/nodes/slevin.kanarip.com.pp +++ b/puppet/manifests/nodes/slevin.kanarip.com.pp @@ -35,7 +35,4 @@ node 'slevin.kanarip.com' { enable => true } - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/tom.kanarip.com.pp b/puppet/manifests/nodes/tom.kanarip.com.pp index be93fce..7db8ba5 100644 --- a/puppet/manifests/nodes/tom.kanarip.com.pp +++ b/puppet/manifests/nodes/tom.kanarip.com.pp @@ -6,7 +6,4 @@ node 'tom.kanarip.com' { include sudo include yum::standard - yum::repository { "custom": - enable => true - } } diff --git a/puppet/manifests/nodes/vito.kanarip.com.pp b/puppet/manifests/nodes/vito.kanarip.com.pp index dc7c5ba..645140f 100644 --- a/puppet/manifests/nodes/vito.kanarip.com.pp +++ b/puppet/manifests/nodes/vito.kanarip.com.pp @@ -23,10 +23,6 @@ node 'vito.kanarip.com' { certificate => false } - yum::repository { "custom": - enable => true - } - mount { "/data/backup/": atboot => true, device => "elwood:/data/backup/", diff --git a/puppet/manifests/nodes/weee.kanarip.com.pp b/puppet/manifests/nodes/weee.kanarip.com.pp index 6d8da76..b909703 100644 --- a/puppet/manifests/nodes/weee.kanarip.com.pp +++ b/puppet/manifests/nodes/weee.kanarip.com.pp @@ -10,9 +10,4 @@ node 'weee.kanarip.com' { ensure => present } - yum::repository { [ - "custom", - "ruby" - ]: - } } commit 85c61f1839b376742652ea2d257fcededfa7dff4 Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 27 11:38:56 2010 +0200 Remove ruby repository configuration as well diff --git a/yum/Fedora/10.91/repos/ruby.repo b/yum/Fedora/10.91/repos/ruby.repo deleted file mode 100644 index 376f134..0000000 --- a/yum/Fedora/10.91/repos/ruby.repo +++ /dev/null @@ -1,19 +0,0 @@ -# Managed with puppet -# ./distr/files/Fedora/10/etc/yum/repos.d/updates.repo -[fedora-11-ruby] -name=Fedora 11 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f11-ruby/$basearch/ -enabled=1 -gpgcheck=0 - -[fedora-11-ruby-debuginfo] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/fedora/updates/11/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-11-ruby-source] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f11-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/10.91/repos/ruby.repo.disabled b/yum/Fedora/10.91/repos/ruby.repo.disabled deleted file mode 100644 index a6ace0b..0000000 --- a/yum/Fedora/10.91/repos/ruby.repo.disabled +++ /dev/null @@ -1,19 +0,0 @@ -# Managed with puppet -# ./distr/files/Fedora/10/etc/yum/repos.d/updates.repo -[fedora-11-ruby] -name=Fedora 11 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f11-ruby/$basearch/ -enabled=0 -gpgcheck=0 - -[fedora-11-ruby-debuginfo] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/fedora/updates/11/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-11-ruby-source] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f11-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/10/repos/ruby.repo b/yum/Fedora/10/repos/ruby.repo deleted file mode 100644 index 2484ab5..0000000 --- a/yum/Fedora/10/repos/ruby.repo +++ /dev/null @@ -1,19 +0,0 @@ -# Managed with puppet -# ./distr/files/Fedora/10/etc/yum/repos.d/updates.repo -[fedora-10-ruby] -name=Fedora 10 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f10-ruby/$basearch/ -enabled=1 -gpgcheck=0 - -[fedora-10-ruby-debuginfo] -name=Fedora 10 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/fedora/updates/10/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-10-ruby-source] -name=Fedora 10 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f10-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/10/repos/ruby.repo.disabled b/yum/Fedora/10/repos/ruby.repo.disabled deleted file mode 100644 index 2e11464..0000000 --- a/yum/Fedora/10/repos/ruby.repo.disabled +++ /dev/null @@ -1,19 +0,0 @@ -# Managed with puppet -# ./distr/files/Fedora/10/etc/yum/repos.d/updates.repo -[fedora-10-ruby] -name=Fedora 10 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f10-ruby/$basearch/ -enabled=0 -gpgcheck=0 - -[fedora-10-ruby-debuginfo] -name=Fedora 10 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/fedora/updates/10/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-10-ruby-source] -name=Fedora 10 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f10-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/11/repos/ruby.repo b/yum/Fedora/11/repos/ruby.repo deleted file mode 100644 index 9b5c460..0000000 --- a/yum/Fedora/11/repos/ruby.repo +++ /dev/null @@ -1,19 +0,0 @@ -# Managed with puppet - -[fedora-11-ruby] -name=Fedora 11 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f11-ruby/$basearch/ -enabled=1 -gpgcheck=0 - -[fedora-11-ruby-debuginfo] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/custom/f11-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-11-ruby-source] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f11-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/11/repos/ruby.repo.disabled b/yum/Fedora/11/repos/ruby.repo.disabled deleted file mode 100644 index a0f614d..0000000 --- a/yum/Fedora/11/repos/ruby.repo.disabled +++ /dev/null @@ -1,19 +0,0 @@ -# Managed with puppet - -[fedora-11-ruby] -name=Fedora 11 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f11-ruby/$basearch/ -enabled=0 -gpgcheck=0 - -[fedora-11-ruby-debuginfo] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/custom/f11-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-11-ruby-source] -name=Fedora 11 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f11-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/dist-ruby.repo b/yum/Fedora/12/repos/dist-ruby.repo deleted file mode 100644 index 1b0831d..0000000 --- a/yum/Fedora/12/repos/dist-ruby.repo +++ /dev/null @@ -1,22 +0,0 @@ -# Managed with puppet - -[dist-f12-ruby] -name=Fedora 12 - $basearch - Ruby Packages -baseurl=http://www.kanarip.com/custom/dist-f12-ruby/$basearch/ - http://mirror.nl.kanarip.com/custom/dist-f12-ruby/$basearch/ -enabled=1 -gpgcheck=0 - -[dist-f12-ruby-debuginfo] -name=Fedora 12 - $basearch - Ruby Packages - Debug -baseurl=http://www.kanarip.com/custom/dist-f12-ruby/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/dist-f12-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[dist-f12-ruby-source] -name=Fedora 12 - $basearch - Ruby Packages - Sources -baseurl=http://www.kanarip.com/custom/dist-f12-ruby/SRPMS/ - http://mirror.nl.kanarip.com/custom/dist-f12-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/dist-ruby.repo.disabled b/yum/Fedora/12/repos/dist-ruby.repo.disabled deleted file mode 100644 index 54dabab..0000000 --- a/yum/Fedora/12/repos/dist-ruby.repo.disabled +++ /dev/null @@ -1,22 +0,0 @@ -# Managed with puppet - -[dist-f12-ruby] -name=Fedora 12 - $basearch - Ruby Packages -baseurl=http://www.kanarip.com/custom/dist-f12-ruby/$basearch/ - http://mirror.nl.kanarip.com/custom/dist-f12-ruby/$basearch/ -enabled=0 -gpgcheck=0 - -[dist-f12-ruby-debuginfo] -name=Fedora 12 - $basearch - Ruby Packages - Debug -baseurl=http://www.kanarip.com/custom/dist-f12-ruby/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/dist-f12-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[dist-f12-ruby-source] -name=Fedora 12 - $basearch - Ruby Packages - Sources -baseurl=http://www.kanarip.com/custom/dist-f12-ruby/SRPMS/ - http://mirror.nl.kanarip.com/custom/dist-f12-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/feature-ruby.repo b/yum/Fedora/12/repos/feature-ruby.repo deleted file mode 100644 index a6ad5a0..0000000 --- a/yum/Fedora/12/repos/feature-ruby.repo +++ /dev/null @@ -1,22 +0,0 @@ -# Managed with puppet - -[feature-f12-ruby] -name=Fedora 12 - $basearch - Ruby Packages -baseurl=http://www.kanarip.com/custom/feature-f12-ruby/$basearch/ - http://mirror.nl.kanarip.com/custom/feature-f12-ruby/$basearch/ -enabled=1 -gpgcheck=0 - -[feature-f12-ruby-debuginfo] -name=Fedora 12 - $basearch - Ruby Packages - Debug -baseurl=http://www.kanarip.com/custom/feature-f12-ruby/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/feature-f12-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[feature-f12-ruby-source] -name=Fedora 12 - $basearch - Ruby Packages - Sources -baseurl=http://www.kanarip.com/custom/feature-f12-ruby/SRPMS/ - http://mirror.nl.kanarip.com/custom/feature-f12-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/feature-ruby.repo.disabled b/yum/Fedora/12/repos/feature-ruby.repo.disabled deleted file mode 100644 index 63e21a9..0000000 --- a/yum/Fedora/12/repos/feature-ruby.repo.disabled +++ /dev/null @@ -1,22 +0,0 @@ -# Managed with puppet - -[feature-f12-ruby] -name=Fedora 12 - $basearch - Ruby Packages -baseurl=http://www.kanarip.com/custom/feature-f12-ruby/$basearch/ - http://mirror.nl.kanarip.com/custom/feature-f12-ruby/$basearch/ -enabled=0 -gpgcheck=0 - -[feature-f12-ruby-debuginfo] -name=Fedora 12 - $basearch - Ruby Packages - Debug -baseurl=http://www.kanarip.com/custom/feature-f12-ruby/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/feature-f12-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[feature-f12-ruby-source] -name=Fedora 12 - $basearch - Ruby Packages - Sources -baseurl=http://www.kanarip.com/custom/feature-f12-ruby/SRPMS/ - http://mirror.nl.kanarip.com/custom/feature-f12-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/ruby.repo b/yum/Fedora/12/repos/ruby.repo deleted file mode 100644 index 2d9e9e5..0000000 --- a/yum/Fedora/12/repos/ruby.repo +++ /dev/null @@ -1,22 +0,0 @@ -# Managed with puppet - -[fedora-12-ruby] -name=Fedora 12 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f12-ruby/$basearch/ - http://mirror.nl.kanarip.com/custom/f12-ruby/$basearch/ -enabled=1 -gpgcheck=0 - -[fedora-12-ruby-debuginfo] -name=Fedora 12 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/custom/f12-ruby/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/f12-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-12-ruby-source] -name=Fedora 12 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f12-ruby/SRPMS/ - http://mirror.nl.kanarip.com/custom/f12-ruby/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/ruby.repo.disabled b/yum/Fedora/12/repos/ruby.repo.disabled deleted file mode 100644 index f5769d7..0000000 --- a/yum/Fedora/12/repos/ruby.repo.disabled +++ /dev/null @@ -1,22 +0,0 @@ -# Managed with puppet - -[fedora-12-ruby] -name=Fedora 12 - $basearch - Ruby 1.9.1 -baseurl=http://www.kanarip.com/custom/f12-ruby/$basearch/ - http://mirror.nl.kanarip.com/custom/f12-ruby/$basearch/ -enabled=0 -gpgcheck=0 - -[fedora-12-ruby-debuginfo] -name=Fedora 12 - $basearch - Ruby 1.9.1 - Debug -baseurl=http://www.kanarip.com/custom/f12-ruby/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/f12-ruby/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[fedora-12-ruby-source] -name=Fedora 12 - $basearch - Ruby 1.9.1 - Sources -baseurl=http://www.kanarip.com/custom/f12-ruby/SRPMS/ - http://mirror.nl.kanarip.com/custom/f12-ruby/SRPMS/ -enabled=0 -gpgcheck=0 commit 68ab08a41d8db70e28dc2f1ef5ccf6342d9fdb7b Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 27 11:38:39 2010 +0200 Remove custom repository configurations diff --git a/yum/CentOS/4/repos/custom.repo b/yum/CentOS/4/repos/custom.repo deleted file mode 100644 index ae8bfed..0000000 --- a/yum/CentOS/4/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[centos-4-custom] -name=CentOS 4 - Custom Packages -baseurl=http://www.kanarip.com/custom/el4/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/CentOS/4/repos/custom.repo.disabled b/yum/CentOS/4/repos/custom.repo.disabled deleted file mode 100644 index 1c003f9..0000000 --- a/yum/CentOS/4/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[centos-4-custom] -name=CentOS 4 - Custom Packages -baseurl=http://www.kanarip.com/custom/el4/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/CentOS/5/repos/custom-kanarip.com.repo b/yum/CentOS/5/repos/custom-kanarip.com.repo deleted file mode 100644 index 1e56d83..0000000 --- a/yum/CentOS/5/repos/custom-kanarip.com.repo +++ /dev/null @@ -1,5 +0,0 @@ -[custom-el5-kanarip.com] -name=CentOS 5 - Custom Packages -baseurl=http://www.kanarip.com/custom/custom-el5-kanarip.com/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/CentOS/5/repos/custom-kanarip.com.repo.disabled b/yum/CentOS/5/repos/custom-kanarip.com.repo.disabled deleted file mode 100644 index b9c2256..0000000 --- a/yum/CentOS/5/repos/custom-kanarip.com.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[custom-el5-kanarip.com] -name=CentOS 5 - Custom Packages -baseurl=http://www.kanarip.com/custom/custom-el5-kanarip.com/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/10.91/repos/custom.repo b/yum/Fedora/10.91/repos/custom.repo deleted file mode 100644 index 22c5a0b..0000000 --- a/yum/Fedora/10.91/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-10-custom] -name=Fedora 10 - Custom Packages -baseurl=http://www.kanarip.com/custom/f11/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/Fedora/10.91/repos/custom.repo.disabled b/yum/Fedora/10.91/repos/custom.repo.disabled deleted file mode 100644 index c83fa58..0000000 --- a/yum/Fedora/10.91/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-10-custom] -name=Fedora 10 - Custom Packages -baseurl=http://www.kanarip.com/custom/f10/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/10/repos/custom.repo b/yum/Fedora/10/repos/custom.repo deleted file mode 100644 index 8ae8440..0000000 --- a/yum/Fedora/10/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-10-custom] -name=Fedora 10 - Custom Packages -baseurl=http://www.kanarip.com/custom/f10/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/Fedora/10/repos/custom.repo.disabled b/yum/Fedora/10/repos/custom.repo.disabled deleted file mode 100644 index c83fa58..0000000 --- a/yum/Fedora/10/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-10-custom] -name=Fedora 10 - Custom Packages -baseurl=http://www.kanarip.com/custom/f10/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/11/repos/custom.repo b/yum/Fedora/11/repos/custom.repo deleted file mode 100644 index d54522a..0000000 --- a/yum/Fedora/11/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-11-custom] -name=Fedora 11 - Custom Packages -baseurl=http://www.kanarip.com/custom/f11/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/Fedora/11/repos/custom.repo.disabled b/yum/Fedora/11/repos/custom.repo.disabled deleted file mode 100644 index faffc97..0000000 --- a/yum/Fedora/11/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-11-custom] -name=Fedora 11 - Custom Packages -baseurl=http://www.kanarip.com/custom/f11/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/custom-kanarip.com.repo b/yum/Fedora/12/repos/custom-kanarip.com.repo deleted file mode 100644 index b80a163..0000000 --- a/yum/Fedora/12/repos/custom-kanarip.com.repo +++ /dev/null @@ -1,20 +0,0 @@ -[custom-f12-kanarip.com] -name=Fedora 12 - Custom Packages -baseurl=http://www.kanarip.com/custom/custom-f12-kanarip.com/$basearch/ - http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/$basearch/ -enabled=1 -gpgcheck=0 - -[custom-f12-kanarip.com-debuginfo] -name=Fedora 12 - Custom Packages Debuginfo -baseurl=http://www.kanarip.com/custom/custom-f12-kanarip.com/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[custom-f12-kanarip.com-source] -name=Fedora 12 - Custom Packages Sources -baseurl=http://www.kanarip.com/custom/custom-f12-kanarip.com/SRPMS/ - http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/12/repos/custom-kanarip.com.repo.disabled b/yum/Fedora/12/repos/custom-kanarip.com.repo.disabled deleted file mode 100644 index 9da11e9..0000000 --- a/yum/Fedora/12/repos/custom-kanarip.com.repo.disabled +++ /dev/null @@ -1,20 +0,0 @@ -[custom-f12-kanarip.com] -name=Fedora 12 - Custom Packages -baseurl=http://www.kanarip.com/custom/custom-f12-kanarip.com/$basearch/ - http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/$basearch/ -enabled=0 -gpgcheck=0 - -[custom-f12-kanarip.com-debuginfo] -name=Fedora 12 - Custom Packages Debuginfo -baseurl=http://www.kanarip.com/custom/custom-f12-kanarip.com/$basearch/debug/ - http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/$basearch/debug/ -enabled=0 -gpgcheck=0 - -[custom-f12-kanarip.com-source] -name=Fedora 12 - Custom Packages Sources -baseurl=http://www.kanarip.com/custom/custom-f12-kanarip.com/SRPMS/ - http://mirror.nl.kanarip.com/custom/custom-f12-kanarip.com/SRPMS/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/8/repos/custom.repo b/yum/Fedora/8/repos/custom.repo deleted file mode 100644 index 47ab707..0000000 --- a/yum/Fedora/8/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-8-custom] -name=Fedora 8 - Custom Packages -baseurl=http://www.kanarip.com/custom/f8/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/Fedora/8/repos/custom.repo.disabled b/yum/Fedora/8/repos/custom.repo.disabled deleted file mode 100644 index 81e8182..0000000 --- a/yum/Fedora/8/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-8-custom] -name=Fedora 8 - Custom Packages -baseurl=http://www.kanarip.com/custom/f8/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/Fedora/9/repos/custom.repo b/yum/Fedora/9/repos/custom.repo deleted file mode 100644 index 5c47943..0000000 --- a/yum/Fedora/9/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-9-custom] -name=Fedora 9 - Custom Packages -baseurl=http://www.kanarip.com/custom/f9/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/Fedora/9/repos/custom.repo.disabled b/yum/Fedora/9/repos/custom.repo.disabled deleted file mode 100644 index 7d07af5..0000000 --- a/yum/Fedora/9/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[fedora-9-custom] -name=Fedora 9 - Custom Packages -baseurl=http://www.kanarip.com/custom/f9/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/RedHat/4/repos/custom.repo b/yum/RedHat/4/repos/custom.repo deleted file mode 100644 index 10a8334..0000000 --- a/yum/RedHat/4/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[rhel-4-custom] -name=Red Hat Enterprise Linux 4 - Custom Packages -baseurl=http://www.kanarip.com/custom/el4/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/RedHat/4/repos/custom.repo.disabled b/yum/RedHat/4/repos/custom.repo.disabled deleted file mode 100644 index 71346b3..0000000 --- a/yum/RedHat/4/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[rhel-4-custom] -name=Red Hat Enterprise Linux 4 - Custom Packages -baseurl=http://www.kanarip.com/custom/el4/$basearch/ -enabled=0 -gpgcheck=0 diff --git a/yum/RedHat/5/repos/custom.repo b/yum/RedHat/5/repos/custom.repo deleted file mode 100644 index ad1d14e..0000000 --- a/yum/RedHat/5/repos/custom.repo +++ /dev/null @@ -1,5 +0,0 @@ -[rhel-5-custom] -name=Red Hat Enterprise Linux 5 - Custom Packages -baseurl=http://www.kanarip.com/custom/el5/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/yum/RedHat/5/repos/custom.repo.disabled b/yum/RedHat/5/repos/custom.repo.disabled deleted file mode 100644 index c499d0c..0000000 --- a/yum/RedHat/5/repos/custom.repo.disabled +++ /dev/null @@ -1,5 +0,0 @@ -[rhel-5-custom] -name=Red Hat Enterprise Linux 5 - Custom Packages -baseurl=http://www.kanarip.com/custom/el5/$basearch/ -enabled=0 -gpgcheck=0 From jmeeuwen at puppetmanaged.org Tue Apr 27 19:25:38 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 27 Apr 2010 19:25:38 +0200 Subject: [Commits] Branch 'development' - files/plugins Message-ID: <201004271725.o3RHPccR009349@master.puppetmanaged.org> files/plugins/mysql_queries_average | 3 +++ 1 file changed, 3 insertions(+) New commits: commit c79cb7fa7bfa71654ee2b1f702a199be44417234 Author: Jeroen van Meeuwen (Fedora Unity) Date: Sat Apr 17 14:06:56 2010 +0200 Update mysql_queries_average plugin to prevent empty variables diff --git a/files/plugins/mysql_queries_average b/files/plugins/mysql_queries_average index 4cfcf6f..ef8fbdf 100755 --- a/files/plugins/mysql_queries_average +++ b/files/plugins/mysql_queries_average @@ -18,6 +18,9 @@ uptime=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Uptime[^_]\s*" | awk ' questions=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Questions[^_]\s*" | awk '{print $2}'` queries=`mysql ${mysqlopts} -e 'show status\g' | grep -E "^Queries[^_]\s*" | awk '{print $2}'` +[ -z "$questions" ] && questions=0 +[ -z "$queries" ] && queries=0 + if [ $questions -ge $queries ]; then # Here we assume we need questions here real_queries=$questions From jmeeuwen at puppetmanaged.org Tue Apr 27 23:16:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Tue, 27 Apr 2010 23:16:48 +0200 Subject: [Commits] Branch 'development' - webserver/sites Message-ID: <201004272116.o3RLGmXt023510@master.puppetmanaged.org> webserver/sites/fedora.kanarip.com.conf | 1 + webserver/sites/www.kanarip.com.conf | 3 +++ 2 files changed, 4 insertions(+) New commits: commit fd283b07a8530d9439938a146796034c60b5c435 Author: Jeroen van Meeuwen (Fedora Unity) Date: Tue Apr 27 23:14:49 2010 +0200 Add /redhat diff --git a/webserver/sites/fedora.kanarip.com.conf b/webserver/sites/fedora.kanarip.com.conf index 64e5991..f293734 100644 --- a/webserver/sites/fedora.kanarip.com.conf +++ b/webserver/sites/fedora.kanarip.com.conf @@ -13,6 +13,7 @@ Alias /rpmfusion /data/os/repos/rpmfusion/ Alias /centos /data/os/distr/centos/ + Alias /redhat /data/os/distr/redhat/ Alias /epel /data/os/repos/epel/ Alias /custom /data/os/repos/custom/ diff --git a/webserver/sites/www.kanarip.com.conf b/webserver/sites/www.kanarip.com.conf index 306789b..8d1230b 100644 --- a/webserver/sites/www.kanarip.com.conf +++ b/webserver/sites/www.kanarip.com.conf @@ -65,6 +65,9 @@ ProxyPass /centos http://fedora.kanarip.com/centos ProxyPassReverse /centos http://fedora.kanarip.com/centos + ProxyPass /redhat http://fedora.kanarip.com/redhat + ProxyPassReverse /redhat http://fedora.kanarip.com/redhat + ProxyPass /livna http://fedora.kanarip.com/livna ProxyPassReverse /livna http://fedora.kanarip.com/livna From jmeeuwen at puppetmanaged.org Wed Apr 28 00:51:40 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 00:51:40 +0200 Subject: [Commits] Branch 'development' - webserver/webalizer Message-ID: <201004272251.o3RMpeFi032397@master.puppetmanaged.org> webserver/webalizer/koji.ergo-project.org.conf | 74 +++++++++++++++++++++++++ 1 file changed, 74 insertions(+) New commits: commit 9898cdc1720ea630c3fd380a8ac7f8d0bb2456bf Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 00:49:19 2010 +0200 Add koji.ergo-project.org webalizer configuration diff --git a/webserver/webalizer/koji.ergo-project.org.conf b/webserver/webalizer/koji.ergo-project.org.conf new file mode 100644 index 0000000..2e375cb --- /dev/null +++ b/webserver/webalizer/koji.ergo-project.org.conf @@ -0,0 +1,74 @@ +# Managed with Puppet +# +LogFile /var/log/httpd/koji.ergo-project.org-access_log +OutputDir /var/www/ergo-project.org/koji/public_html/usage/ +HistoryName /var/www/ergo-project.org/koji/webalizer-koji.ergo-project.org.hist +Incremental yes +IncrementalName /var/www/ergo-project.org/koji/webalizer-koji.ergo-project.org.current +HostName koji.ergo-project.org +UseHTTPS yes +DNSCache /var/lib/webalizer/dns_cache.db +DNSChildren 10 +Quiet yes +ReallyQuiet no +TimeMe no +GMTTime yes +FoldSeqErr yes +CountryGraph no +DailyGraph yes +DailyStats yes +HourlyGraph yes +HourlyStats yes +TopCountries 0 +TopUsers 0 +AllSites yes +AllURLs yes +AllReferrers yes +AllAgents yes +AllSearchStr yes +AllUsers yes +HideReferrer koji.ergo-project.org +HideReferrer Direct Request +HideURL *.gif +HideURL *.GIF +HideURL *.jpg +HideURL *.JPG +HideURL *.jpeg +HideURL *.JPEG +HideURL *.png +HideURL *.PNG +HideURL *.ra +HideURL *.js +HideURL *.css + +GroupURL /kojihub* Koji Hub +HideURL /kojihub* + +HideAllSites yes +GroupDomains 1 +GroupHighlight no +SearchEngine yahoo.com p= +SearchEngine altavista.com q= +SearchEngine google.com q= +SearchEngine eureka.com q= +SearchEngine lycos.com query= +SearchEngine hotbot.com MT= +SearchEngine msn.com MT= +SearchEngine infoseek.com qt= +SearchEngine webcrawler searchText= +SearchEngine excite search= +SearchEngine netscape.com search= +SearchEngine mamma.com query= +SearchEngine alltheweb.com query= +SearchEngine northernlight.com qr= + +DumpPath /var/www/ergo-project.org/koji/public_html/usage/ +DumpHeader yes +DumpExtension csv +DumpSites yes +DumpURLs yes +DumpReferrers yes +DumpAgents yes +DumpUsers yes +DumpSearchStr yes + From jmeeuwen at puppetmanaged.org Wed Apr 28 01:30:54 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 01:30:54 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004272330.o3RNUsTV008423@master.puppetmanaged.org> files/mash/custom-el5-buildsys.mash | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) New commits: commit d8720dee083caec5947a74c2fa8b2432db0cd30f Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 01:28:37 2010 +0200 Add custom-el5-buildsys mash configuration diff --git a/files/mash/custom-el5-buildsys.mash b/files/mash/custom-el5-buildsys.mash new file mode 100644 index 0000000..3ae8301 --- /dev/null +++ b/files/mash/custom-el5-buildsys.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-el5-buildsys] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-el5-buildsys +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/el5/buildsys/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Custom Build System Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Wed Apr 28 03:01:30 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 03:01:30 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004280101.o3S11U9b017850@master.puppetmanaged.org> files/mash/custom-f12-buildsys.mash | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) New commits: commit 10d46ebddb90db372671f9e22a599bacfede8b97 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 02:59:26 2010 +0200 Add custom-f12-builsys mash configuration diff --git a/files/mash/custom-f12-buildsys.mash b/files/mash/custom-f12-buildsys.mash new file mode 100644 index 0000000..8586773 --- /dev/null +++ b/files/mash/custom-f12-buildsys.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-f12-buildsys] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-f12-buildsys +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/f12/buildsys/%(arch)s/ +repoviewtitle = "Fedora 12 - Custom Build System Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Wed Apr 28 03:39:16 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 03:39:16 +0200 Subject: [Commits] Branch 'development' - 3 commits - puppet/manifests webserver/sites Message-ID: <201004280139.o3S1dGgw018908@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 webserver/sites/koji.green-beret.org.conf | 158 ------------------------ webserver/sites/koji.kanarip.com.conf | 171 +-------------------------- 3 files changed, 16 insertions(+), 315 deletions(-) New commits: commit 2160a8f59a3f31d51cf3d16df3d986d17129e4d3 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 03:36:55 2010 +0200 Add back these virtualhosts making sure they redirect to the right places diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 5e705ae..10b2ea7 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -107,6 +107,8 @@ node 'elwood.kanarip.com' { webserver::virtualhost { [ "cobbler.kanarip.com", "fedora.kanarip.com", + "koji.green-beret.org", + "koji.kanarip.com" ]: certificate => false } commit bc1b8b1eb7abd6b365ac15b2297d53cb2fa7f409 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 03:35:54 2010 +0200 Redirect all traffic to koji.k.c to koji.e-p.o diff --git a/webserver/sites/koji.kanarip.com.conf b/webserver/sites/koji.kanarip.com.conf index ea158b5..9aad400 100644 --- a/webserver/sites/koji.kanarip.com.conf +++ b/webserver/sites/koji.kanarip.com.conf @@ -3,177 +3,24 @@ # - ServerAdmin systems at kanarip.com + ServerAdmin info at lists.ergo-project.org ServerName koji.kanarip.com - ServerAlias koji - DocumentRoot "/var/www/html" + DocumentRoot /var/www/kanarip.com/koji/public_html - RewriteRule ^/$ /koji/ [R,L] - - Alias /koji "/usr/share/koji-web/scripts/" - Alias /koji-static/ "/usr/share/koji-web/static/" - Alias /kojihub "/usr/share/koji-hub/XMLRPC/" - Alias /packages "/data/koji/packages/" - Alias /static-repos "/data/koji/repos/" - - CustomLog logs/koji.kanarip.com-access_log combined - ErrorLog logs/koji.kanarip.com-error_log - -# -# AuthType Basic -# AuthBasicProvider ldap -# AuthLDAPUrl ldap://ldap.kanarip.com/ou=People,dc=kanarip,dc=com?uid?sub?(uid=*) -# AuthzLDAPAuthoritative on -# AuthLDAPGroupAttribute uniqueMember -# AuthLDAPGroupAttributeIsDN on -# AuthName "Koji Build Service" -# Require valid-user -# - - - SetHandler mod_python - PythonHandler kojiweb.publisher - - PythonDebug On - PythonOption SiteName Koji - PythonOption KojiHubURL http://koji.kanarip.com/kojihub - PythonOption KojiWebURL http://koji.kanarip.com/koji - PythonOption KojiPackagesURL http://koji.kanarip.com/packages - - PythonOption LoginTimeout 7200 - PythonOption Secret changeme123 - PythonOption LDAPAuth True - - PythonPath "sys.path + ['/usr/share/koji-web/lib']" - PythonCleanupHandler kojiweb.handlers::cleanup - PythonAutoReload Off - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - - SetHandler mod_python - PythonHandler kojixmlrpc - PythonOption ConfigFile /etc/koji-hub/hub.conf - PythonDebug On - PythonAutoReload Off - - - - Order Allow,Deny - Allow from All - - - - Order Allow,Deny - Allow from All - + RewriteEngine on + RewriteRule ^[/]*(.*)$ http://koji.ergo-project.org/$1 [R,L] - ServerAdmin systems at kanarip.com + ServerAdmin info at lists.ergo-project.org ServerName koji.kanarip.com - ServerAlias koji - - DocumentRoot "/var/www/html" - - RewriteRule ^/$ /koji/ [R,L] - - Alias /koji "/usr/share/koji-web/scripts/" - Alias /koji-static/ "/usr/share/koji-web/static/" - Alias /kojihub "/usr/share/koji-hub/XMLRPC" - Alias /packages "/data/koji/packages/" - Alias /static-repos "/data/koji/repos/" - Alias /pgadmin "/usr/share/phpPgAdmin/" - - AuthType Basic - AuthBasicProvider ldap - AuthLDAPUrl ldap://ldap.kanarip.com/ou=People,dc=kanarip,dc=com?uid?sub?(uid=*) - AuthzLDAPAuthoritative on - AuthLDAPGroupAttribute uniqueMember - AuthLDAPGroupAttributeIsDN on - AuthName "Koji Build Service" - Require valid-user - + DocumentRoot /var/www/kanarip.com/koji/public_html - SSLEngine On - SSLCertificateFile /var/lib/puppet/ssl/certs/koji.kanarip.com.pem - SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/koji.kanarip.com.pem - SSLCertificateChainFile /var/lib/puppet/ssl/certs/ca.pem - SSLCACertificateFile /var/lib/puppet/ssl/certs/ca.pem - - SSLVerifyClient optional - SSLVerifyDepth 10 - SSLOptions +StdEnvVars - - ErrorLog logs/koji.kanarip.com-error_log - CustomLog logs/koji.kanarip.com-access_log combined - - - SSLOptions +StdEnvVars - - -# -# SSLOptions +StdEnvVars -# - - - SetHandler mod_python - PythonHandler kojiweb.publisher - - PythonDebug On - PythonOption SiteName Koji - PythonOption KojiHubURL http://koji.kanarip.com/kojihub - PythonOption KojiWebURL http://koji.kanarip.com/koji - PythonOption KojiPackagesURL http://koji.kanarip.com/packages - - PythonOption LoginTimeout 7200 - PythonOption Secret changeme123 - PythonOption LDAPAuth True - - PythonPath "sys.path + ['/usr/share/koji-web/lib']" - PythonCleanupHandler kojiweb.handlers::cleanup - PythonAutoReload Off - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - - SetHandler mod_python - PythonHandler kojixmlrpc - PythonOption ConfigFile /etc/koji-hub/hub.conf - PythonDebug On - PythonAutoReload Off - - - - Order Allow,Deny - Allow from All - - - - Order Allow,Deny - Allow from All - + RewriteEngine on + RewriteRule ^[/]*(.*)$ https://koji.ergo-project.org/$1 [R,L] + commit d4bde613059d53c62e265757297bfc8ccdc01740 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 03:34:57 2010 +0200 Redirect all traffic from koji.g-b.o to koji.e-p.o diff --git a/webserver/sites/koji.green-beret.org.conf b/webserver/sites/koji.green-beret.org.conf index 5b3a2fd..0da16ab 100644 --- a/webserver/sites/koji.green-beret.org.conf +++ b/webserver/sites/koji.green-beret.org.conf @@ -3,172 +3,24 @@ # - ServerAdmin info at lists.green-beret.org + ServerAdmin info at lists.ergo-project.org ServerName koji.green-beret.org - ServerAlias koji DocumentRoot /var/www/green-beret.org/koji/public_html RewriteEngine on - - RewriteRule ^/koji/login.*$ https://koji.green-beret.org/koji/login [R,L] - RewriteRule ^/$ /koji/ [R,L] - - Alias /koji /usr/share/koji-web/scripts/ - Alias /koji-static/ /usr/share/koji-web/static/ - Alias /kojihub /usr/share/koji-hub/XMLRPC/ - Alias /packages /data/koji/packages/ - Alias /static-repos /data/koji/repos/ - Alias /usage /var/www/green-beret.org/koji/public_html/usage - - CustomLog logs/koji.green-beret.org-access_log combined - ErrorLog logs/koji.green-beret.org-error_log - - - Order Allow,Deny - Allow from All - - - - Order Allow,Deny - Allow from All - - - - SetHandler mod_python - PythonHandler kojiweb.publisher - - PythonDebug On - PythonOption SiteName Koji - PythonOption KojiHubURL http://koji.green-beret.org/kojihub - PythonOption KojiWebURL http://koji.green-beret.org/koji - PythonOption KojiPackagesURL http://koji.green-beret.org/packages - - PythonOption LoginTimeout 7200 - PythonOption Secret changeme123 - PythonOption LDAPAuth True - - PythonPath "sys.path + ['/usr/share/koji-web/lib']" - PythonCleanupHandler kojiweb.handlers::cleanup - PythonAutoReload Off - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - - SetHandler mod_python - PythonHandler kojixmlrpc - PythonOption ConfigFile /etc/koji-hub/hub.conf - PythonDebug On - PythonAutoReload Off - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - + RewriteRule ^[/]*(.*)$ http://koji.ergo-project.org/$1 [R,L] - ServerAdmin info at lists.green-beret.org + ServerAdmin info at lists.ergo-project.org ServerName koji.green-beret.org DocumentRoot /var/www/green-beret.org/koji/public_html - RewriteRule ^/$ /koji/ [R,L] - - Alias /koji /usr/share/koji-web/scripts/ - Alias /koji-static/ /usr/share/koji-web/static/ - Alias /kojihub /usr/share/koji-hub/XMLRPC - Alias /packages /data/koji/packages/ - Alias /static-repos /data/koji/repos/ - Alias /usage /var/www/green-beret.org/koji/public_html/usage - - SSLEngine On - SSLCertificateFile /etc/pki/koji/kojiweb.pem - SSLCertificateKeyFile /etc/pki/koji/kojiweb.pem - SSLCertificateChainFile /etc/pki/koji/koji_ca_cert.crt - SSLCACertificateFile /etc/pki/koji/koji_ca_cert.crt - - SSLVerifyClient optional - SSLVerifyDepth 10 - - ErrorLog logs/koji.green-beret.org-error_log - CustomLog logs/koji.green-beret.org-access_log combined - - - SSLOptions +StdEnvVars - - - - SSLOptions +StdEnvVars - - - - Order Allow,Deny - Allow from All - - - - Order Allow,Deny - Allow from All - - - - SetHandler mod_python - PythonHandler kojiweb.publisher - - PythonDebug On - PythonOption SiteName Koji - PythonOption KojiHubURL http://koji.green-beret.org/kojihub - PythonOption KojiWebURL http://koji.green-beret.org/koji - PythonOption KojiPackagesURL http://koji.green-beret.org/packages - - PythonOption WebCCache /var/tmp/kojiweb.ccache - PythonOption WebCert /etc/pki/koji/kojiweb.pem - PythonOption ClientCA /etc/pki/koji/koji_ca_cert.crt - PythonOption KojiHubCA /etc/pki/koji/koji_ca_cert.crt - - PythonOption DNUsernameComponent CN - PythonOption ProxyDNs "/C=NL/ST=Utrecht/O=Green Beret/CN=kojiweb" - - PythonOption LoginTimeout 7200 - PythonOption Secret changeme123 - - PythonPath "sys.path + ['/usr/share/koji-web/lib']" - PythonCleanupHandler kojiweb.handlers::cleanup - PythonAutoReload Off - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - - - - SetHandler mod_python - PythonHandler kojixmlrpc - PythonOption ConfigFile /etc/koji-hub/hub.conf - PythonDebug On - PythonAutoReload Off - - - - Options None - AllowOverride None - Order allow,deny - Allow from all - + RewriteEngine on + RewriteRule ^[/]*(.*)$ https://koji.ergo-project.org/$1 [R,L] From jmeeuwen at puppetmanaged.org Wed Apr 28 05:36:18 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 05:36:18 +0200 Subject: [Commits] Branch 'development' - webserver/includes.d Message-ID: <201004280336.o3S3aIjZ006993@master.puppetmanaged.org> webserver/includes.d/virtualhost.conf | 6 +----- webserver/includes.d/virtualhost.conf.ghandalf | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-) New commits: commit 2e45ce2282920c9bdca29f3c7a62557554d7eaf1 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 05:34:01 2010 +0200 Make sure *:443 is a NameVirtualHost as well diff --git a/webserver/includes.d/virtualhost.conf b/webserver/includes.d/virtualhost.conf index c936272..b3d91ba 100644 --- a/webserver/includes.d/virtualhost.conf +++ b/webserver/includes.d/virtualhost.conf @@ -1,9 +1,5 @@ # Managed with puppet NameVirtualHost *:80 +NameVirtualHost *:443 - - ServerName kanarip.com - ServerAdmin systems at kanarip.com - DocumentRoot /var/www/html - \ No newline at end of file diff --git a/webserver/includes.d/virtualhost.conf.ghandalf b/webserver/includes.d/virtualhost.conf.ghandalf deleted file mode 100644 index b3d91ba..0000000 --- a/webserver/includes.d/virtualhost.conf.ghandalf +++ /dev/null @@ -1,5 +0,0 @@ -# Managed with puppet - -NameVirtualHost *:80 -NameVirtualHost *:443 - From jmeeuwen at puppetmanaged.org Wed Apr 28 05:36:39 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 05:36:39 +0200 Subject: [Commits] Branch 'development' - webserver/sites Message-ID: <201004280336.o3S3adVL007048@master.puppetmanaged.org> webserver/sites/koji.green-beret.org.conf | 9 +++++++++ webserver/sites/koji.kanarip.com.conf | 9 +++++++++ 2 files changed, 18 insertions(+) New commits: commit dbbc0637d1933f8aa6b753671b0ad1e9c264eec8 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 05:34:33 2010 +0200 Make sure these have certificates diff --git a/webserver/sites/koji.green-beret.org.conf b/webserver/sites/koji.green-beret.org.conf index 0da16ab..ddebf59 100644 --- a/webserver/sites/koji.green-beret.org.conf +++ b/webserver/sites/koji.green-beret.org.conf @@ -19,6 +19,15 @@ DocumentRoot /var/www/green-beret.org/koji/public_html + SSLEngine On + SSLCertificateFile /etc/pki/koji/kojiweb.pem + SSLCertificateKeyFile /etc/pki/koji/kojiweb.pem + SSLCertificateChainFile /etc/pki/koji/koji_ca_cert.crt + SSLCACertificateFile /etc/pki/koji/koji_ca_cert.crt + + SSLVerifyClient optional + SSLVerifyDepth 10 + RewriteEngine on RewriteRule ^[/]*(.*)$ https://koji.ergo-project.org/$1 [R,L] diff --git a/webserver/sites/koji.kanarip.com.conf b/webserver/sites/koji.kanarip.com.conf index 9aad400..0ed4249 100644 --- a/webserver/sites/koji.kanarip.com.conf +++ b/webserver/sites/koji.kanarip.com.conf @@ -19,6 +19,15 @@ DocumentRoot /var/www/kanarip.com/koji/public_html + SSLEngine On + SSLCertificateFile /etc/pki/koji/kojiweb.pem + SSLCertificateKeyFile /etc/pki/koji/kojiweb.pem + SSLCertificateChainFile /etc/pki/koji/koji_ca_cert.crt + SSLCACertificateFile /etc/pki/koji/koji_ca_cert.crt + + SSLVerifyClient optional + SSLVerifyDepth 10 + RewriteEngine on RewriteRule ^[/]*(.*)$ https://koji.ergo-project.org/$1 [R,L] From jmeeuwen at puppetmanaged.org Wed Apr 28 05:54:24 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 05:54:24 +0200 Subject: [Commits] Branch 'development' - 2 commits - puppet/manifests yum/Fedora Message-ID: <201004280354.o3S3sO06029287@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 6 ++++++ puppet/manifests/nodes/ghandalf.kanarip.com.pp | 6 ++++++ puppet/manifests/nodes/pinky.kanarip.com.pp | 7 +++++++ yum/Fedora/12/repos/custom-buildsys.repo | 18 ++++++++++++++++++ yum/Fedora/12/repos/custom-buildsys.repo.disabled | 18 ++++++++++++++++++ 5 files changed, 55 insertions(+) New commits: commit bdf4264d0b392f92c14ff225bd683675f5913132 Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 05:52:04 2010 +0200 Add back the custom build system repository for these nodes diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 10b2ea7..6217145 100644 --- a/puppet/manifests/nodes/elwood.kanarip.com.pp +++ b/puppet/manifests/nodes/elwood.kanarip.com.pp @@ -113,4 +113,10 @@ node 'elwood.kanarip.com' { certificate => false } + yum::repository { [ + "custom-buildsys" + ]: + enable => true + } + } diff --git a/puppet/manifests/nodes/ghandalf.kanarip.com.pp b/puppet/manifests/nodes/ghandalf.kanarip.com.pp index 3dee9a4..118f8a7 100644 --- a/puppet/manifests/nodes/ghandalf.kanarip.com.pp +++ b/puppet/manifests/nodes/ghandalf.kanarip.com.pp @@ -89,4 +89,10 @@ node 'ghandalf.kanarip.com' { enable => true } + yum::repository { [ + "custom-buildsys" + ]: + enable => true + } + } diff --git a/puppet/manifests/nodes/pinky.kanarip.com.pp b/puppet/manifests/nodes/pinky.kanarip.com.pp index f90511e..e042870 100644 --- a/puppet/manifests/nodes/pinky.kanarip.com.pp +++ b/puppet/manifests/nodes/pinky.kanarip.com.pp @@ -123,4 +123,11 @@ node 'pinky.kanarip.com' { minute => "0", weekday => "Sun" } + + yum::repository { [ + "custom-buildsys" + ]: + enable => true + } + } commit bfad62e1e80b29d8d907029299583e7ace165c8a Author: Jeroen van Meeuwen (Fedora Unity) Date: Wed Apr 28 05:50:13 2010 +0200 Add back the buildsys repository diff --git a/yum/Fedora/12/repos/custom-buildsys.repo b/yum/Fedora/12/repos/custom-buildsys.repo new file mode 100644 index 0000000..592704d --- /dev/null +++ b/yum/Fedora/12/repos/custom-buildsys.repo @@ -0,0 +1,18 @@ +[custom-buildsys] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/$basearch/ +enabled=1 +gpgcheck=0 + +[custom-buildsys-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/custom/fc12/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 new file mode 100644 index 0000000..3b11344 --- /dev/null +++ b/yum/Fedora/12/repos/custom-buildsys.repo.disabled @@ -0,0 +1,18 @@ +[custom-buildsys] +name=Custom Packages for Build Systems +baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/$basearch/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-debuginfo] +name=Custom Packages for Build Systems - Debuginfo +baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/$basearch/debug/ +enabled=0 +gpgcheck=0 + +[custom-buildsys-source] +name=Custom Packages for Build Systems - Sources +baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/SRPMS/ +enabled=0 +gpgcheck=0 + From jmeeuwen at puppetmanaged.org Wed Apr 28 09:11:11 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 09:11:11 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004280711.o3S7BBe7010669@master.puppetmanaged.org> files/mash/dist-el6-beta-rebuild.mash | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) New commits: commit d817afe31714b927dcf29be09dab452626cbc537 Author: Jeroen van Meeuwen Date: Wed Apr 28 09:10:47 2010 +0200 Add dist-el6-beta-rebuild mash configuration diff --git a/files/mash/dist-el6-beta-rebuild.mash b/files/mash/dist-el6-beta-rebuild.mash new file mode 100644 index 0000000..a43c486 --- /dev/null +++ b/files/mash/dist-el6-beta-rebuild.mash @@ -0,0 +1,16 @@ +# mash config file +[dist-el6-beta-rebuild] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = dist-el6-beta-rebuild +repoviewurl = http://mirror.nl.ergo-project.org/repositories/dist-el6-beta-rebuild/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta Packages Rebuilt by Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Wed Apr 28 09:48:48 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 09:48:48 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004280748.o3S7mmCH011633@master.puppetmanaged.org> files/mash/custom-f11-ruby.mash | 16 ++++++++++++++++ files/mash/custom-f12-ruby.mash | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) New commits: commit 8ca85a5020bf3e37e2fbf07fe7118ffd65e2489d Author: Jeroen van Meeuwen Date: Wed Apr 28 09:48:30 2010 +0200 Add custom-f11-ruby and custom-f12-ruby mash configuration diff --git a/files/mash/custom-f11-ruby.mash b/files/mash/custom-f11-ruby.mash new file mode 100644 index 0000000..dbd79ec --- /dev/null +++ b/files/mash/custom-f11-ruby.mash @@ -0,0 +1,16 @@ +# 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-f12-ruby.mash b/files/mash/custom-f12-ruby.mash new file mode 100644 index 0000000..515e912 --- /dev/null +++ b/files/mash/custom-f12-ruby.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-f12-ruby] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-f12-ruby +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/f12/ruby/%(arch)s/ +repoviewtitle = "Fedora 12 - Custom Ruby Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Wed Apr 28 10:08:29 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 10:08:29 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004280808.o3S88TrE008978@master.puppetmanaged.org> files/mash/custom-el5-buildsys.mash | 2 +- files/mash/custom-f11-ruby.mash | 2 +- files/mash/custom-f12-buildsys.mash | 2 +- files/mash/custom-f12-ruby.mash | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit f6b13aba794f656e112a78dde00be0c54e14827b Author: Jeroen van Meeuwen Date: Wed Apr 28 10:08:21 2010 +0200 Update mash configuration diff --git a/files/mash/custom-el5-buildsys.mash b/files/mash/custom-el5-buildsys.mash index 3ae8301..f54e71e 100644 --- a/files/mash/custom-el5-buildsys.mash +++ b/files/mash/custom-el5-buildsys.mash @@ -7,7 +7,7 @@ debuginfo = True multilib = True multilib_method = devel tag = custom-el5-buildsys -repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/el5/buildsys/%(arch)s/ +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys/%(arch)s/ repoviewtitle = "Enterprise Linux 5 - Custom Build System Packages from Ergo Project - %(arch)s" use_repoview = True inherit = True diff --git a/files/mash/custom-f11-ruby.mash b/files/mash/custom-f11-ruby.mash index dbd79ec..1b13100 100644 --- a/files/mash/custom-f11-ruby.mash +++ b/files/mash/custom-f11-ruby.mash @@ -7,7 +7,7 @@ debuginfo = True multilib = True multilib_method = devel tag = custom-f11-ruby -repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/f11/ruby/%(arch)s/ +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 diff --git a/files/mash/custom-f12-buildsys.mash b/files/mash/custom-f12-buildsys.mash index 8586773..e3668d2 100644 --- a/files/mash/custom-f12-buildsys.mash +++ b/files/mash/custom-f12-buildsys.mash @@ -7,7 +7,7 @@ debuginfo = True multilib = True multilib_method = devel tag = custom-f12-buildsys -repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/f12/buildsys/%(arch)s/ +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/%(arch)s/ repoviewtitle = "Fedora 12 - Custom Build System Packages from Ergo Project - %(arch)s" use_repoview = True inherit = True diff --git a/files/mash/custom-f12-ruby.mash b/files/mash/custom-f12-ruby.mash index 515e912..1f08128 100644 --- a/files/mash/custom-f12-ruby.mash +++ b/files/mash/custom-f12-ruby.mash @@ -7,7 +7,7 @@ debuginfo = True multilib = True multilib_method = devel tag = custom-f12-ruby -repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom/f12/ruby/%(arch)s/ +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-f12-ruby/%(arch)s/ repoviewtitle = "Fedora 12 - Custom Ruby Packages from Ergo Project - %(arch)s" use_repoview = True inherit = True From jmeeuwen at puppetmanaged.org Wed Apr 28 10:15:07 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 10:15:07 +0200 Subject: [Commits] Branch 'development' - 2 commits - programs/bin Message-ID: <201004280815.o3S8F71d018682@master.puppetmanaged.org> programs/bin/mirror-ergo-project | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 3d55546615c4995f0df9a94f6b58448cdca2fda0 Merge: 602d2ea... 20a6fc3... Author: Jeroen van Meeuwen Date: Wed Apr 28 10:15:05 2010 +0200 Merge branch 'development' of ssh://git.puppetmanaged.org/git/puppet/domain-puppetmanaged.org into development commit 602d2ea7e0987ecc1d0d722a7821c0a5467caced Author: Jeroen van Meeuwen Date: Wed Apr 28 10:14:48 2010 +0200 Add mirror script for ergo-project diff --git a/programs/bin/mirror-ergo-project b/programs/bin/mirror-ergo-project new file mode 100755 index 0000000..3552ec5 --- /dev/null +++ b/programs/bin/mirror-ergo-project @@ -0,0 +1,3 @@ +#!/bin/bash + +rsync -aHz rsync://elwood.kanarip.com/ergo-project/ /var/www/ergo-project.org/mirror.nl/public_html/ From jmeeuwen at puppetmanaged.org Wed Apr 28 10:22:40 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 10:22:40 +0200 Subject: [Commits] Branch 'development' - 2 commits - programs/bin puppet/manifests Message-ID: <201004280822.o3S8Merf000772@master.puppetmanaged.org> programs/bin/mirror-ergo-project | 2 +- puppet/manifests/nodes/master.puppetmanaged.org.pp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 8511a44a156ce3d525b04162f58399aab6dce907 Author: Jeroen van Meeuwen Date: Wed Apr 28 10:22:28 2010 +0200 Update mirror-ergo-project script diff --git a/programs/bin/mirror-ergo-project b/programs/bin/mirror-ergo-project index 3552ec5..dab565e 100755 --- a/programs/bin/mirror-ergo-project +++ b/programs/bin/mirror-ergo-project @@ -1,3 +1,3 @@ #!/bin/bash -rsync -aHz rsync://elwood.kanarip.com/ergo-project/ /var/www/ergo-project.org/mirror.nl/public_html/ +rsync -rltHz --delete-after rsync://elwood.kanarip.com/ergo-project/ /var/www/ergo-project.org/mirror.nl/public_html/ commit a816b87b9757b011e137407e6b0275520cb867b7 Author: Jeroen van Meeuwen Date: Wed Apr 28 10:21:09 2010 +0200 Add cronjob for user jmeeuwen (mirror ergo project) diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 2401474..76b4f07 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -27,6 +27,12 @@ node 'master.puppetmanaged.org' { weekday => [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ] } + cron { "mirror_ergo_project": + command => "/usr/local/bin/mirror-ergo-project >/dev/null 2>&1", + minute => "45", + user => "jmeeuwen" + } + cron { "repo_maintenance": command => "/usr/local/sbin/repo_maintenance >/dev/null 2>&1", minute => "*/30" From jmeeuwen at puppetmanaged.org Wed Apr 28 10:42:25 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 10:42:25 +0200 Subject: [Commits] Branch 'development' - programs/bin Message-ID: <201004280842.o3S8gPIf020021@master.puppetmanaged.org> programs/bin/mirror-ergo-project | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit fc9d49e634d327a03aefd6e286874106dd7b2bb7 Author: Jeroen van Meeuwen Date: Wed Apr 28 10:42:08 2010 +0200 Update mirror-ergo-project some more, and don't sync the mash directories diff --git a/programs/bin/mirror-ergo-project b/programs/bin/mirror-ergo-project index dab565e..7040696 100755 --- a/programs/bin/mirror-ergo-project +++ b/programs/bin/mirror-ergo-project @@ -1,3 +1,5 @@ #!/bin/bash -rsync -rltHz --delete-after rsync://elwood.kanarip.com/ergo-project/ /var/www/ergo-project.org/mirror.nl/public_html/ +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 Wed Apr 28 10:47:12 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 10:47:12 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201004280847.o3S8lCiu022521@master.puppetmanaged.org> puppet/manifests/nodes/elwood.kanarip.com.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5183f343c85b05a70f831fff7d9fc64a36b355b7 Author: Jeroen van Meeuwen Date: Wed Apr 28 10:46:51 2010 +0200 Make the mashing be followed by an instant copy to the repositories directory. diff --git a/puppet/manifests/nodes/elwood.kanarip.com.pp b/puppet/manifests/nodes/elwood.kanarip.com.pp index 6217145..21de277 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", + 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/", hour => "*/2", minute => "15" } From jmeeuwen at puppetmanaged.org Wed Apr 28 11:31:52 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Wed, 28 Apr 2010 11:31:52 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004280931.o3S9VqSD017345@master.puppetmanaged.org> files/mash/custom-el5-buildsys-updates-testing.mash | 16 ++++++++++++++++ files/mash/custom-el5-buildsys-updates.mash | 16 ++++++++++++++++ files/mash/custom-el5-ruby-updates-testing.mash | 16 ++++++++++++++++ files/mash/custom-el5-ruby-updates.mash | 16 ++++++++++++++++ files/mash/custom-el5-ruby.mash | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) New commits: commit 1fc57946e6d89d372c74b20b2f8cfc1349860ae5 Author: Jeroen van Meeuwen Date: Wed Apr 28 11:31:38 2010 +0200 Add more mash configuration files diff --git a/files/mash/custom-el5-buildsys-updates-testing.mash b/files/mash/custom-el5-buildsys-updates-testing.mash new file mode 100644 index 0000000..7f32c61 --- /dev/null +++ b/files/mash/custom-el5-buildsys-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-el5-buildsys-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-el5-buildsys-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Custom Build System Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + diff --git a/files/mash/custom-el5-buildsys-updates.mash b/files/mash/custom-el5-buildsys-updates.mash new file mode 100644 index 0000000..890636e --- /dev/null +++ b/files/mash/custom-el5-buildsys-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-el5-buildsys-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-el5-buildsys-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Custom Build System Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + diff --git a/files/mash/custom-el5-ruby-updates-testing.mash b/files/mash/custom-el5-ruby-updates-testing.mash new file mode 100644 index 0000000..a65e764 --- /dev/null +++ b/files/mash/custom-el5-ruby-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-el5-ruby-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-el5-ruby-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - 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-el5-ruby-updates.mash b/files/mash/custom-el5-ruby-updates.mash new file mode 100644 index 0000000..c08a708 --- /dev/null +++ b/files/mash/custom-el5-ruby-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-el5-ruby-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-el5-ruby-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - 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-el5-ruby.mash b/files/mash/custom-el5-ruby.mash new file mode 100644 index 0000000..b07bea2 --- /dev/null +++ b/files/mash/custom-el5-ruby.mash @@ -0,0 +1,16 @@ +# mash config file +[custom-el5-ruby] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = custom-el5-ruby +repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Custom Ruby Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Thu Apr 29 12:52:16 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 12:52:16 +0200 Subject: [Commits] Branch 'development' - 3 commits - puppet/manifests webserver/sites Message-ID: <201004291052.o3TAqGg5008719@master.puppetmanaged.org> puppet/manifests/nodes/donnie.kanarip.com.pp | 248 --------------------------- webserver/sites/fedora.kanarip.com.conf | 2 2 files changed, 2 insertions(+), 248 deletions(-) New commits: commit a4cd7d4c5f6dd509a02d698fabd4a81f70e5fb9a Merge: 7d840d5... 1fc5794... Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 12:50:21 2010 +0200 Merge branch 'development' of ssh://git.puppetmanaged.org/git/puppet/domain-kanarip.com into development commit 7d840d5bbec930c8d4bd491c31abd1bf8b7844ec Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 12:25:24 2010 +0200 Add /rhel location for the temporary repository created from rhel 6 beta diff --git a/webserver/sites/fedora.kanarip.com.conf b/webserver/sites/fedora.kanarip.com.conf index f293734..6f4b47a 100644 --- a/webserver/sites/fedora.kanarip.com.conf +++ b/webserver/sites/fedora.kanarip.com.conf @@ -14,6 +14,8 @@ Alias /rpmfusion /data/os/repos/rpmfusion/ Alias /centos /data/os/distr/centos/ Alias /redhat /data/os/distr/redhat/ + # "Temporary" location for the re-created repository of rhel-6-beta + Alias /rhel /data/os/distr/rhel/ Alias /epel /data/os/repos/epel/ Alias /custom /data/os/repos/custom/ commit 8f1bafb40ef5eae64be393ba04d795a5175bf0b9 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 11:23:50 2010 +0200 Remove all puppet from donnie diff --git a/puppet/manifests/nodes/donnie.kanarip.com.pp b/puppet/manifests/nodes/donnie.kanarip.com.pp index c481044..13009e2 100644 --- a/puppet/manifests/nodes/donnie.kanarip.com.pp +++ b/puppet/manifests/nodes/donnie.kanarip.com.pp @@ -8,254 +8,6 @@ node 'donnie.kanarip.com' { include webserver include yum::standard - ## - ## GIT Configuration - ## - - # Git repositories for puppetmanaged.org modules - git::repository { [ - "authconfig", - "cacti", - "classroom", - "cobbler", - "dhcp", - "dns", - "facts", - "git", - "hg", - "iptables", - "koji", - "mail", - "memcached", - "mirror", - "mock", - "monit", - "munin", - "mysql", - "nagios", - "openvpn", - "postfix", - "programs", - "puppet", - "rsync", - "selinux", - "sendmail", - "ssh", - "svn", - "sudo", - "trac", - "virtualization", - "webserver", - "xen", - "yum" - ]: - - localtree => "/data/scm/git/puppet.kanarip.com/", - shared => true, - public => true, - owner => "jmeeuwen", - group => "git-kanarip.com-modules", - symlink_prefix => "puppet-module", - description => "Puppet Module", - recipients => [ "systems at kanarip.com" ] - } - - # GIT Repositories for public, domain specific trees - git::repository::domain { [ - "kanarip.com" - ]: - localtree => "/data/scm/git/puppet.kanarip.com/", - shared => true, - public => true, - owner => "jmeeuwen", - group => "git-$name", - symlink_prefix => "puppet", - description => "Domain specific configuration", - recipients => [ "systems at kanarip.com" ] - } - - # Special symlink for external users of the puppetmanaged.org modules - file { "/git/puppet": - backup => false, - ensure => "/data/scm/git/puppet.kanarip.com/", - links => manage - } - - $puppet_storeconfigs_mysql_username = "puppet" - $puppet_storeconfigs_mysql_password = "puppet" - $puppet_storeconfigs_mysql_hostname = "127.0.0.1" - - include puppet::server::storeconfigs_mysql - - puppet::server::domain::development { [ - "kanarip.com" - ]: - base_url => "git://puppet.kanarip.com/puppet/", - prefix => "domain" - } - - puppet::server::domain::testing { [ - "kanarip.com" - ]: - base_url => "git://puppet.kanarip.com/puppet/", - prefix => "domain" - } - - puppet::server::domain::production { [ - "kanarip.com" - ]: - base_url => "git://puppet.kanarip.com/puppet/", - prefix => "domain" - } - - puppet::server::module::development { [ - "authconfig", - "cacti", - "classroom", - "cobbler", - "dhcp", - "dns", - "facts", - "git", - "hg", - "iptables", - "koji", - "mail", - "memcached", - "mirror", - "mock", - "munin", - "mysql", - "nagios", - "openvpn", - "programs", - "puppet", - "rsync", - "selinux", - "sendmail", - "ssh", - "svn", - "sudo", - "trac", - "virtualization", - "webserver", - "xen", - "yum" - ]: - base_url => "git://puppet.kanarip.com/puppet/" - } - - puppet::server::module::testing { [ - "authconfig", - "cacti", - "classroom", - "cobbler", - "dhcp", - "dns", - "facts", - "git", - "hg", - "iptables", - "koji", - "mail", - "memcached", - "mirror", - "mock", - "munin", - "mysql", - "nagios", - "openvpn", - "programs", - "puppet", - "rsync", - "sendmail", - "ssh", - "svn", - "sudo", - "trac", - "virtualization", - "webserver", - "xen", - "yum" - ]: - base_url => "git://puppet.kanarip.com/puppet/" - } - - puppet::server::module::production { [ - "authconfig", - "cacti", - "classroom", - "cobbler", - "dhcp", - "dns", - "facts", - "git", - "hg", - "iptables", - "koji", - "mail", - "memcached", - "mirror", - "mock", - "munin", - "mysql", - "nagios", - "openvpn", - "programs", - "puppet", - "rsync", - "sendmail", - "ssh", - "svn", - "sudo", - "trac", - "virtualization", - "webserver", - "xen", - "yum" - ]: - base_url => "git://puppet.kanarip.com/" - } - - trac::instance { [ - "authconfig", - "cacti", - "cobbler", - "dhcp", - "dns", - "facts", - "git", - "hg", - "iptables", - "koji", - "mail", - "memcached", - "mirror", - "mock", - "munin", - "mysql", - "nagios", - "openvpn", - "postfix", - "programs", - "puppet", - "rsync", - "sendmail", - "ssh", - "svn", - "sudo", - "trac", - "virtualization", - "webserver", - "xen", - "yum" - ]: - - base_directory => "/data/www/kanarip.com/trac", - base_repository => "/data/scm/git/puppet.kanarip.com/", - base_url => "http://puppet.kanarip.com/" - } - webserver::module::enable { [ "php", "phpMyAdmin" From jmeeuwen at puppetmanaged.org Thu Apr 29 13:06:20 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 13:06:20 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201004291106.o3TB6KOX019318@master.puppetmanaged.org> puppet/manifests/nodes/donnie.kanarip.com.pp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) New commits: commit ba634385ac46e9d6b0d0e5ec9cc4d4d8849b1fc7 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 13:04:08 2010 +0200 Clean out the node manifest for donnie and add the custom-buildsys repository diff --git a/puppet/manifests/nodes/donnie.kanarip.com.pp b/puppet/manifests/nodes/donnie.kanarip.com.pp index 13009e2..c0dfb4b 100644 --- a/puppet/manifests/nodes/donnie.kanarip.com.pp +++ b/puppet/manifests/nodes/donnie.kanarip.com.pp @@ -1,20 +1,14 @@ node 'donnie.kanarip.com' { include iptables - include nagios::client::passive include ssh::denyhosts -# include ssh::rsakeys include sudo - include trac include webserver include yum::standard - webserver::module::enable { [ - "php", - "phpMyAdmin" + yum::repository { [ + "custom-buildsys" ]: - } - - webserver::virtualhost { "munin.kanarip.com": + enable => true } } From jmeeuwen at puppetmanaged.org Thu Apr 29 15:25:45 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 15:25:45 +0200 Subject: [Commits] Branch 'development' - 3 commits - munin/munin.conf munin/munin-node.conf.ghandalf puppet/manifests Message-ID: <201004291325.o3TDPjVR004460@master.puppetmanaged.org> munin/munin-node.conf.ghandalf | 1 munin/munin.conf | 77 --------------------------- puppet/manifests/nodes/donnie.kanarip.com.pp | 5 + 3 files changed, 5 insertions(+), 78 deletions(-) New commits: commit ec3968c3e3040f465ef52db5845a2a4e613d461d Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 15:23:40 2010 +0200 Update munin-node.conf for ghandalf diff --git a/munin/munin-node.conf.ghandalf b/munin/munin-node.conf.ghandalf index d52d37b..8afb812 100644 --- a/munin/munin-node.conf.ghandalf +++ b/munin/munin-node.conf.ghandalf @@ -33,6 +33,7 @@ ignore_file \.pod$ # the allow line as many times as you'd like allow ^127\.0\.0\.1$ +allow ^10\.10\.10\.53$ host 127.0.0.1 port 4949 commit 74345ca968bb960f3934ae660add741eb93c32a0 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 15:23:05 2010 +0200 Update munin.conf diff --git a/munin/munin.conf b/munin/munin.conf index 777ec98..89265a6 100644 --- a/munin/munin.conf +++ b/munin/munin.conf @@ -35,14 +35,6 @@ tmpldir /etc/munin/templates address anakin.kanarip.com use_node_name yes -[animal.kanarip.com] - address animal.kanarip.com - use_node_name yes - -[casper.kanarip.com] - address casper.kanarip.com - use_node_name yes - [donnie.kanarip.com] address donnie.kanarip.com use_node_name yes @@ -51,80 +43,11 @@ tmpldir /etc/munin/templates address elwood.kanarip.com use_node_name yes -#[eleanor.kanarip.com] -# address eleanor.kanarip.com -# use_node_name yes - -#[eowyn.kanarip.com] -# address eowyn.kanarip.com -# use_node_name yes - -[finkel.kanarip.com] - address finkel.kanarip.com - use_node_name yes - -[laurel.kanarip.com] - address laurel.kanarip.com - use_node_name yes - [pinky.kanarip.com] address pinky.kanarip.com use_node_name yes -[santino.kanarip.com] - address santino.kanarip.com - use_node_name yes - -[slevin.kanarip.com] - address slevin.kanarip.com - use_node_name yes - [tom.kanarip.com] address tom.kanarip.com use_node_name yes -[vito.kanarip.com] - address vito.kanarip.com - use_node_name yes - -# -# A more complex example of a host tree -# -## First our "normal" host. -# [fii.foo.com] -# address foo -# -## Then our other host... -# [fay.foo.com] -# address fay -# -## Then we want totals... -# [foo.com;Totals] #Force it into the "foo.com"-domain... -# update no # Turn off data-fetching for this "host". -# -# # The graph "load1". We want to see the loads of both machines... -# # "fii=fii.foo.com:load.load" means "label=machine:graph.field" -# load1.graph_title Loads side by side -# load1.graph_order fii=fii.foo.com:load.load fay=fay.foo.com:load.load -# -# # The graph "load2". Now we want them stacked on top of each other. -# load2.graph_title Loads on top of each other -# load2.dummy_field.stack fii=fii.foo.com:load.load fay=fay.foo.com:load.load -# load2.dummy_field.draw AREA # We want area instead the default LINE2. -# load2.dummy_field.label dummy # This is needed. Silly, really. -# -# # The graph "load3". Now we want them summarised into one field -# load3.graph_title Loads summarised -# load3.combined_loads.sum fii.foo.com:load.load fay.foo.com:load.load -# load3.combined_loads.label Combined loads # Must be set, as this is -# # not a dummy field! -# -## ...and on a side note, I want them listen in another order (default is -## alphabetically) -# -# # Since [foo.com] would be interpreted as a host in the domain "com", we -# # specify that this is a domain by adding a semicolon. -# [foo.com;] -# node_order Totals fii.foo.com fay.foo.com -# - commit 2f7c766399c3de7e8d1a74eed9101c3fbce1d2df Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 15:22:04 2010 +0200 Add back munin to donnie diff --git a/puppet/manifests/nodes/donnie.kanarip.com.pp b/puppet/manifests/nodes/donnie.kanarip.com.pp index c0dfb4b..c858b7c 100644 --- a/puppet/manifests/nodes/donnie.kanarip.com.pp +++ b/puppet/manifests/nodes/donnie.kanarip.com.pp @@ -1,14 +1,17 @@ node 'donnie.kanarip.com' { include iptables + include munin include ssh::denyhosts include sudo include webserver include yum::standard + webserver::virtualhost { "munin.kanarip.com": + } + yum::repository { [ "custom-buildsys" ]: enable => true } - } From jmeeuwen at puppetmanaged.org Thu Apr 29 16:05:58 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 16:05:58 +0200 Subject: [Commits] Branch 'development' - 4 commits - puppet/manifests webserver/webalizer Message-ID: <201004291405.o3TE5wh9014928@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 8 +- webserver/webalizer/mirror.nl.ergo-project.org.conf | 71 ++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) New commits: commit 775873841005d3533aab078e712e57b19d63bac4 Merge: ca61b43... fc9d49e... Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:03:59 2010 +0200 Merge branch 'development' of ssh://git.puppetmanaged.org/git/puppet/domain-puppetmanaged.org into development commit ca61b43eee2742ec84c4cc01662df274126c014a Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:03:36 2010 +0200 Remove comma diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 3e93d28..b0dd265 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -639,7 +639,7 @@ node 'master.puppetmanaged.org' { "mirror.nl.ergo-project.org", ]: certificate => false, - webalizer => true, + webalizer => true } webserver::virtualhost { [ commit f03e6be64bdc88c6f4a32b8d5af327165d957ee1 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:03:17 2010 +0200 Add webalizer configuration for mirror.nl.ergo-project.org diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 2401474..3e93d28 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -628,7 +628,6 @@ node 'master.puppetmanaged.org' { "git.kanarip.com", "git.orangesombrero.org", "git.puppetmanaged.org", - "mirror.nl.ergo-project.org", "mirror.nl.kanarip.com", "webmail.ergo-project.org", "www.orangesombrero.org" @@ -637,6 +636,13 @@ node 'master.puppetmanaged.org' { } webserver::virtualhost { [ + "mirror.nl.ergo-project.org", + ]: + certificate => false, + webalizer => true, + } + + webserver::virtualhost { [ "cgit.ergo-project.org", "www.ergo-project.org", "www.puppetmanaged.org", commit cb3a254ffee519079d0c4ba2e9f02bf2975d7e1b Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:01:44 2010 +0200 Add mirror.nl.ergo-project.org Webalizer configuration diff --git a/webserver/webalizer/mirror.nl.ergo-project.org.conf b/webserver/webalizer/mirror.nl.ergo-project.org.conf new file mode 100644 index 0000000..9177040 --- /dev/null +++ b/webserver/webalizer/mirror.nl.ergo-project.org.conf @@ -0,0 +1,71 @@ +LogFile /var/log/httpd/mirror.nl.ergo-project.org-access_log +OutputDir /var/www/ergo-project.org/mirror.nl/usage/ +HistoryName /var/www/ergo-project.org/mirror.nl/webalizer.hist +Incremental yes +IncrementalName /var/www/ergo-project.org/mirror.nl/webalizer.current +HostName mirror.nl.ergo-project.org +PageType htm* +PageType cgi +PageType php +PageType shtml +#PageType phtml +#PageType php3 +#PageType pl +Quiet yes +ReallyQuiet yes +FoldSeqErr yes +CountryGraph yes +IgnoreReferrer *ergo-project.org* +IgnoreURL /mysql* +IgnoreURL /cron.php +IgnoreURL /usage* +IgnoreUser root + +GroupURL /repositories/custom-el5-buildsys* Enterprise Linux 5 Build System packages +HideURL /repositories/custom-el5-buildsys* +GroupURL /repositories/custom-el5-ruby* Enterprise Linux 5 Ruby packages +HideURL /repositories/custom-el5-ruby* + +GroupURL /repositories/custom-el6-beta-buildsys* Enterprise Linux 6 Beta Build System packages +HideURL /repositories/custom-el6-beta-buildsys* +GroupURL /repositories/custom-el6-beta-ruby* Enterprise Linux 6 Beta Ruby packages +HideURL /repositories/custom-el6-beta-ruby* +GroupURL /repositories/custom-el6-buildsys* Enterprise Linux 6 Build System packages +HideURL /repositories/custom-el6-buildsys* +GroupURL /repositories/custom-el6-ruby* Enterprise Linux 6 Ruby packages +HideURL /repositories/custom-el6-ruby* + +GroupURL /repositories/custom-f11-buildsys* Fedora 11 Build System packages +HideURL /repositories/custom-f11-buildsys* +GroupURL /repositories/custom-f11-ruby* Fedora 11 Ruby packages +HideURL /repositories/custom-f11-ruby* + +GroupURL /repositories/custom-f12-buildsys* Fedora 12 Build System packages +HideURL /repositories/custom-f12-buildsys* +GroupURL /repositories/custom-f12-ruby* Fedora 12 Ruby packages +HideURL /repositories/custom-f12-ruby* + +GroupURL /repositories/custom-f13-buildsys* Fedora 13 Build System packages +HideURL /repositories/custom-f13-buildsys* +GroupURL /repositories/custom-f13-ruby* Fedora 13 Ruby packages +HideURL /repositories/custom-f13-ruby* + +HideURL /repositories/dist-el6-beta* + +HideAllSites yes +GroupDomains 1 +GroupShading yes +SearchEngine yahoo.com p= +SearchEngine altavista.com q= +SearchEngine google.com q= +SearchEngine eureka.com q= +SearchEngine lycos.com query= +SearchEngine hotbot.com MT= +SearchEngine msn.com MT= +SearchEngine infoseek.com qt= +SearchEngine webcrawler searchText= +SearchEngine excite search= +SearchEngine netscape.com search= +SearchEngine mamma.com query= +SearchEngine alltheweb.com query= +SearchEngine northernlight.com qr= From jmeeuwen at puppetmanaged.org Thu Apr 29 16:06:15 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 16:06:15 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201004291406.o3TE6FL2014983@master.puppetmanaged.org> puppet/manifests/nodes/master.puppetmanaged.org.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0342313ef9a362fa229a1eb57fa097830dc933e2 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:04:22 2010 +0200 Remove another comma too much diff --git a/puppet/manifests/nodes/master.puppetmanaged.org.pp b/puppet/manifests/nodes/master.puppetmanaged.org.pp index 0e10782..881972d 100644 --- a/puppet/manifests/nodes/master.puppetmanaged.org.pp +++ b/puppet/manifests/nodes/master.puppetmanaged.org.pp @@ -642,7 +642,7 @@ node 'master.puppetmanaged.org' { } webserver::virtualhost { [ - "mirror.nl.ergo-project.org", + "mirror.nl.ergo-project.org" ]: certificate => false, webalizer => true From jmeeuwen at puppetmanaged.org Thu Apr 29 16:10:11 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 16:10:11 +0200 Subject: [Commits] Branch 'development' - webserver/sites Message-ID: <201004291410.o3TEABi7017842@master.puppetmanaged.org> webserver/sites/mirror.nl.ergo-project.org.conf | 9 +++++++++ 1 file changed, 9 insertions(+) New commits: commit 1d1c7bb8c91a18ceb7577a48851c8d72ae568342 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:08:08 2010 +0200 Update mirror.nl configuration diff --git a/webserver/sites/mirror.nl.ergo-project.org.conf b/webserver/sites/mirror.nl.ergo-project.org.conf index ebb6a82..3f2c370 100644 --- a/webserver/sites/mirror.nl.ergo-project.org.conf +++ b/webserver/sites/mirror.nl.ergo-project.org.conf @@ -5,13 +5,22 @@ DocumentRoot /var/www/ergo-project.org/mirror.nl/public_html/ ServerName mirror.nl.ergo-project.org ServerAlias mirror.ergo-project.org + ErrorLog logs/mirror.nl.ergo-project.org-error_log CustomLog logs/mirror.nl.ergo-project.org-access_log combined + Alias /usage /var/www/ergo-project.org/mirror.nl/usage + Options +Indexes Order Allow,Deny Allow from All + + DirectoryIndex index.html + Order Allow,Deny + Allow from All + + From jmeeuwen at puppetmanaged.org Thu Apr 29 16:49:13 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 16:49:13 +0200 Subject: [Commits] Branch 'development' - yum/Fedora Message-ID: <201004291449.o3TEnDJq023685@master.puppetmanaged.org> yum/Fedora/12/repos/custom-buildsys.repo | 6 +++--- yum/Fedora/12/repos/custom-buildsys.repo.disabled | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 3bf7c0b5fe1619113487ecb158c108285c39b4fe Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:46:50 2010 +0200 Update custom-buildsys repositories diff --git a/yum/Fedora/12/repos/custom-buildsys.repo b/yum/Fedora/12/repos/custom-buildsys.repo index 592704d..445b54a 100644 --- a/yum/Fedora/12/repos/custom-buildsys.repo +++ b/yum/Fedora/12/repos/custom-buildsys.repo @@ -1,18 +1,18 @@ [custom-buildsys] name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/$basearch/ +baseurl=http://mirror.nl.ergo-project.org/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/custom/fc12/buildsys/$basearch/debug/ +baseurl=http://mirror.nl.ergo-project.org/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/custom/fc12/buildsys/SRPMS/ +baseurl=http://mirror.nl.ergo-project.org/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 index 3b11344..038325e 100644 --- a/yum/Fedora/12/repos/custom-buildsys.repo.disabled +++ b/yum/Fedora/12/repos/custom-buildsys.repo.disabled @@ -1,18 +1,18 @@ [custom-buildsys] name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/custom/fc12/buildsys/$basearch/ +baseurl=http://mirror.nl.ergo-project.org/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/custom/fc12/buildsys/$basearch/debug/ +baseurl=http://mirror.nl.ergo-project.org/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/custom/fc12/buildsys/SRPMS/ +baseurl=http://mirror.nl.ergo-project.org/custom-f12-buildsys/SRPMS/ enabled=0 gpgcheck=0 From jmeeuwen at puppetmanaged.org Thu Apr 29 16:51:37 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 16:51:37 +0200 Subject: [Commits] Branch 'development' - yum/Fedora Message-ID: <201004291451.o3TEpb2u031113@master.puppetmanaged.org> yum/Fedora/12/repos/custom-buildsys.repo | 6 +++--- yum/Fedora/12/repos/custom-buildsys.repo.disabled | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 09c8a6a58945292f18eb1b7056ecab3328eb3857 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 16:49:37 2010 +0200 Update custom-buildsys repos diff --git a/yum/Fedora/12/repos/custom-buildsys.repo b/yum/Fedora/12/repos/custom-buildsys.repo index 445b54a..84acebe 100644 --- a/yum/Fedora/12/repos/custom-buildsys.repo +++ b/yum/Fedora/12/repos/custom-buildsys.repo @@ -1,18 +1,18 @@ [custom-buildsys] name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/custom-f12-buildsys/$basearch/ +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/custom-f12-buildsys/$basearch/debug/ +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/custom-f12-buildsys/SRPMS/ +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 index 038325e..aa694da 100644 --- a/yum/Fedora/12/repos/custom-buildsys.repo.disabled +++ b/yum/Fedora/12/repos/custom-buildsys.repo.disabled @@ -1,18 +1,18 @@ [custom-buildsys] name=Custom Packages for Build Systems -baseurl=http://mirror.nl.ergo-project.org/custom-f12-buildsys/$basearch/ +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/custom-f12-buildsys/$basearch/debug/ +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/custom-f12-buildsys/SRPMS/ +baseurl=http://mirror.nl.ergo-project.org/repositories/custom-f12-buildsys/SRPMS/ enabled=0 gpgcheck=0 From jmeeuwen at puppetmanaged.org Thu Apr 29 18:17:17 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 18:17:17 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201004291617.o3TGHHSr018342@master.puppetmanaged.org> puppet/manifests/nodes/donnie.kanarip.com.pp | 2 ++ puppet/manifests/nodes/ghandalf.kanarip.com.pp | 7 +++++++ 2 files changed, 9 insertions(+) New commits: commit 995fb111db297558a7746bb50f93b39f6047fc17 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 18:15:04 2010 +0200 Make sure ghandalf's IP address ends up with donnie diff --git a/puppet/manifests/nodes/donnie.kanarip.com.pp b/puppet/manifests/nodes/donnie.kanarip.com.pp index c858b7c..41aaac2 100644 --- a/puppet/manifests/nodes/donnie.kanarip.com.pp +++ b/puppet/manifests/nodes/donnie.kanarip.com.pp @@ -6,6 +6,8 @@ node 'donnie.kanarip.com' { include webserver include yum::standard + Host <<| tag == "kanarip-munin" |>> + webserver::virtualhost { "munin.kanarip.com": } diff --git a/puppet/manifests/nodes/ghandalf.kanarip.com.pp b/puppet/manifests/nodes/ghandalf.kanarip.com.pp index 118f8a7..e0b63dd 100644 --- a/puppet/manifests/nodes/ghandalf.kanarip.com.pp +++ b/puppet/manifests/nodes/ghandalf.kanarip.com.pp @@ -24,6 +24,13 @@ node 'ghandalf.kanarip.com' { user => "jmeeuwen" } + @@host { "$fqdn": + ensure => present, + ip => $ipaddress, + host_aliases => $hostname, + tag => "kanarip-munin" + } + # Bugzilla packages package { [ "perl-Authen-SASL", From jmeeuwen at puppetmanaged.org Thu Apr 29 18:17:45 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Thu, 29 Apr 2010 18:17:45 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004291617.o3TGHjpa018397@master.puppetmanaged.org> files/mash/custom-el5-buildsys-updates-testing.mash | 2 +- files/mash/custom-el5-buildsys-updates.mash | 2 +- files/mash/custom-el5-ruby-updates-testing.mash | 2 +- files/mash/custom-el5-ruby-updates.mash | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 37756d06cc2c8c3973176412a1c0ee8f2d79ab53 Author: Jeroen van Meeuwen (Fedora Unity) Date: Thu Apr 29 18:15:36 2010 +0200 The updates repositories should not inherit anything diff --git a/files/mash/custom-el5-buildsys-updates-testing.mash b/files/mash/custom-el5-buildsys-updates-testing.mash index 7f32c61..d077468 100644 --- a/files/mash/custom-el5-buildsys-updates-testing.mash +++ b/files/mash/custom-el5-buildsys-updates-testing.mash @@ -10,7 +10,7 @@ tag = custom-el5-buildsys-updates-testing repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys-updates-testing/%(arch)s/ repoviewtitle = "Enterprise Linux 5 - Custom Build System Packages from Ergo Project - %(arch)s" use_repoview = True -inherit = True +inherit = False latest = False arches = i386 x86_64 diff --git a/files/mash/custom-el5-buildsys-updates.mash b/files/mash/custom-el5-buildsys-updates.mash index 890636e..33c05a3 100644 --- a/files/mash/custom-el5-buildsys-updates.mash +++ b/files/mash/custom-el5-buildsys-updates.mash @@ -10,7 +10,7 @@ tag = custom-el5-buildsys-updates repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-buildsys-updates/%(arch)s/ repoviewtitle = "Enterprise Linux 5 - Custom Build System Packages from Ergo Project - %(arch)s" use_repoview = True -inherit = True +inherit = False latest = False arches = i386 x86_64 diff --git a/files/mash/custom-el5-ruby-updates-testing.mash b/files/mash/custom-el5-ruby-updates-testing.mash index a65e764..0c1676d 100644 --- a/files/mash/custom-el5-ruby-updates-testing.mash +++ b/files/mash/custom-el5-ruby-updates-testing.mash @@ -10,7 +10,7 @@ tag = custom-el5-ruby-updates-testing repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby-updates-testing/%(arch)s/ repoviewtitle = "Enterprise Linux 5 - Custom Ruby Packages from Ergo Project - %(arch)s" use_repoview = True -inherit = True +inherit = False latest = False arches = i386 x86_64 diff --git a/files/mash/custom-el5-ruby-updates.mash b/files/mash/custom-el5-ruby-updates.mash index c08a708..607e6a8 100644 --- a/files/mash/custom-el5-ruby-updates.mash +++ b/files/mash/custom-el5-ruby-updates.mash @@ -10,7 +10,7 @@ tag = custom-el5-ruby-updates repoviewurl = http://mirror.nl.ergo-project.org/repositories/custom-el5-ruby-updates/%(arch)s/ repoviewtitle = "Enterprise Linux 5 - Custom Ruby Packages from Ergo Project - %(arch)s" use_repoview = True -inherit = True +inherit = False latest = False arches = i386 x86_64 From jmeeuwen at puppetmanaged.org Fri Apr 30 10:58:28 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 30 Apr 2010 10:58:28 +0200 Subject: [Commits] Branch 'development' - puppet/manifests Message-ID: <201004300858.o3U8wS84018428@master.puppetmanaged.org> puppet/manifests/nodes/laurel.kanarip.com.pp | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit de00932a0dfbe6f1d51a6f714b42a0c590b37d6a Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri Apr 30 10:56:14 2010 +0200 Update laurel.kanarip.com diff --git a/puppet/manifests/nodes/laurel.kanarip.com.pp b/puppet/manifests/nodes/laurel.kanarip.com.pp index 4d9a9e2..ffb317c 100644 --- a/puppet/manifests/nodes/laurel.kanarip.com.pp +++ b/puppet/manifests/nodes/laurel.kanarip.com.pp @@ -25,4 +25,10 @@ node 'laurel.kanarip.com' { remounts => true } + yum::repository { [ + "custom-buildsys" + ]: + enable => true + } + } From jmeeuwen at puppetmanaged.org Fri Apr 30 14:46:09 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 30 Apr 2010 14:46:09 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004301246.o3UCk9o2003177@master.puppetmanaged.org> files/mash/feature-el5-kolab.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.8.6-updates-testing.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.8.6-updates.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.8.6.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.8.7-updates-testing.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.8.7-updates.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.8.7.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.9.1-updates-testing.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.9.1-updates.mash | 16 ++++++++++++++++ files/mash/feature-el5-ruby-1.9.1.mash | 16 ++++++++++++++++ files/mash/feature-f11-kolab.mash | 16 ++++++++++++++++ files/mash/feature-f12-kolab.mash | 16 ++++++++++++++++ 12 files changed, 192 insertions(+) New commits: commit ea97a7ba3a89d0d3a6f60d4d6ee0ea762d8ef029 Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri Apr 30 14:43:38 2010 +0200 Add a couple of tags to mash diff --git a/files/mash/feature-el5-kolab.mash b/files/mash/feature-el5-kolab.mash new file mode 100644 index 0000000..25ae175 --- /dev/null +++ b/files/mash/feature-el5-kolab.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-kolab] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-kolab +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-kolab/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Kolab Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + 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 new file mode 100644 index 0000000..db76fca --- /dev/null +++ b/files/mash/feature-el5-ruby-1.8.6-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.8.6-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.8.6-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.8.6-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.8.6 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el5-ruby-1.8.6-updates.mash b/files/mash/feature-el5-ruby-1.8.6-updates.mash new file mode 100644 index 0000000..6b545e9 --- /dev/null +++ b/files/mash/feature-el5-ruby-1.8.6-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.8.6-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.8.6-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.8.6-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.8.6 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el5-ruby-1.8.6.mash b/files/mash/feature-el5-ruby-1.8.6.mash new file mode 100644 index 0000000..8465187 --- /dev/null +++ b/files/mash/feature-el5-ruby-1.8.6.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.8.6] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.8.6 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.8.6/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.8.6 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + 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 new file mode 100644 index 0000000..a175f84 --- /dev/null +++ b/files/mash/feature-el5-ruby-1.8.7-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.8.7-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.8.7-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.8.7-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.8.7 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el5-ruby-1.8.7-updates.mash b/files/mash/feature-el5-ruby-1.8.7-updates.mash new file mode 100644 index 0000000..4509faf --- /dev/null +++ b/files/mash/feature-el5-ruby-1.8.7-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.8.7-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.8.7-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.8.7-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.8.7 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el5-ruby-1.8.7.mash b/files/mash/feature-el5-ruby-1.8.7.mash new file mode 100644 index 0000000..e8b338b --- /dev/null +++ b/files/mash/feature-el5-ruby-1.8.7.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.8.7] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.8.7 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.8.7/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.8.7 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + 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 new file mode 100644 index 0000000..0d368ef --- /dev/null +++ b/files/mash/feature-el5-ruby-1.9.1-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-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-el5-ruby-1.9.1-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - 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-el5-ruby-1.9.1-updates.mash b/files/mash/feature-el5-ruby-1.9.1-updates.mash new file mode 100644 index 0000000..fa98004 --- /dev/null +++ b/files/mash/feature-el5-ruby-1.9.1-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-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-el5-ruby-1.9.1-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - 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-el5-ruby-1.9.1.mash b/files/mash/feature-el5-ruby-1.9.1.mash new file mode 100644 index 0000000..59347e4 --- /dev/null +++ b/files/mash/feature-el5-ruby-1.9.1.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el5-ruby-1.9.1] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el5-ruby-1.9.1 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el5-ruby-1.9.1/%(arch)s/ +repoviewtitle = "Enterprise Linux 5 - Featured Ruby 1.9.1 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-f11-kolab.mash b/files/mash/feature-f11-kolab.mash new file mode 100644 index 0000000..96c67d5 --- /dev/null +++ b/files/mash/feature-f11-kolab.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-f11-kolab] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-f11-kolab +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-f11-kolab/%(arch)s/ +repoviewtitle = "Fedora 11 - Featured Kolab Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-f12-kolab.mash b/files/mash/feature-f12-kolab.mash new file mode 100644 index 0000000..03a89b8 --- /dev/null +++ b/files/mash/feature-f12-kolab.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-f12-kolab] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-f12-kolab +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-f12-kolab/%(arch)s/ +repoviewtitle = "Fedora 12 - Featured Kolab Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + From jmeeuwen at puppetmanaged.org Fri Apr 30 14:50:01 2010 From: jmeeuwen at puppetmanaged.org (Jeroen van Meeuwen) Date: Fri, 30 Apr 2010 14:50:01 +0200 Subject: [Commits] Branch 'development' - files/mash Message-ID: <201004301250.o3UCo10o003279@master.puppetmanaged.org> files/mash/feature-el6-beta-ruby-1.8.6-updates-testing.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.8.6-updates.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.8.6.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.8.7-updates-testing.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.8.7-updates.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.8.7.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.9.1-updates-testing.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.9.1-updates.mash | 16 ++++++++++++ files/mash/feature-el6-beta-ruby-1.9.1.mash | 16 ++++++++++++ 9 files changed, 144 insertions(+) New commits: commit 25e11b35976fae393a1514675bcfe912683905cb Author: Jeroen van Meeuwen (Fedora Unity) Date: Fri Apr 30 14:47:45 2010 +0200 Add mash configuration for the ruby featured builds diff --git a/files/mash/feature-el6-beta-ruby-1.8.6-updates-testing.mash b/files/mash/feature-el6-beta-ruby-1.8.6-updates-testing.mash new file mode 100644 index 0000000..ad95241 --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.8.6-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.8.6-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.8.6-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.8.6-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.8.6 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el6-beta-ruby-1.8.6-updates.mash b/files/mash/feature-el6-beta-ruby-1.8.6-updates.mash new file mode 100644 index 0000000..7896241 --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.8.6-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.8.6-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.8.6-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.8.6-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.8.6 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el6-beta-ruby-1.8.6.mash b/files/mash/feature-el6-beta-ruby-1.8.6.mash new file mode 100644 index 0000000..54a7ddd --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.8.6.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.8.6] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.8.6 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.8.6/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.8.6 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el6-beta-ruby-1.8.7-updates-testing.mash b/files/mash/feature-el6-beta-ruby-1.8.7-updates-testing.mash new file mode 100644 index 0000000..85f28ae --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.8.7-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.8.7-updates-testing] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.8.7-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.8.7-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.8.7 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el6-beta-ruby-1.8.7-updates.mash b/files/mash/feature-el6-beta-ruby-1.8.7-updates.mash new file mode 100644 index 0000000..ca88fc4 --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.8.7-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.8.7-updates] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.8.7-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.8.7-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.8.7 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = False +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el6-beta-ruby-1.8.7.mash b/files/mash/feature-el6-beta-ruby-1.8.7.mash new file mode 100644 index 0000000..a239f48 --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.8.7.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.8.7] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.8.7 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.8.7/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.8.7 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 + diff --git a/files/mash/feature-el6-beta-ruby-1.9.1-updates-testing.mash b/files/mash/feature-el6-beta-ruby-1.9.1-updates-testing.mash new file mode 100644 index 0000000..859840a --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.9.1-updates-testing.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-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-el6-beta-ruby-1.9.1-updates-testing +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.9.1-updates-testing/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - 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-el6-beta-ruby-1.9.1-updates.mash b/files/mash/feature-el6-beta-ruby-1.9.1-updates.mash new file mode 100644 index 0000000..5b58c5f --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.9.1-updates.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-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-el6-beta-ruby-1.9.1-updates +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.9.1-updates/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - 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-el6-beta-ruby-1.9.1.mash b/files/mash/feature-el6-beta-ruby-1.9.1.mash new file mode 100644 index 0000000..ea1b7cf --- /dev/null +++ b/files/mash/feature-el6-beta-ruby-1.9.1.mash @@ -0,0 +1,16 @@ +# mash config file +[feature-el6-beta-ruby-1.9.1] +rpm_path = %(arch)s/ +repodata_path = %(arch)s/ +source_path = SRPMS +debuginfo = True +multilib = True +multilib_method = devel +tag = feature-el6-beta-ruby-1.9.1 +repoviewurl = http://mirror.nl.ergo-project.org/repositories/feature-el6-beta-ruby-1.9.1/%(arch)s/ +repoviewtitle = "Enterprise Linux 6 Beta - Featured Ruby 1.9.1 Packages from Ergo Project - %(arch)s" +use_repoview = True +inherit = True +latest = False +arches = i386 x86_64 +