[puppet] Make sure mod_python is installed.
by Xavier Lamien
commit ebdf5402ba9aa52a52b75964407e1314508826e4
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Fri Sep 6 00:23:56 2013 +0200
Make sure mod_python is installed.
modules/koji/manifests/init.pp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/modules/koji/manifests/init.pp b/modules/koji/manifests/init.pp
index bbc3c01..0b5b6aa 100644
--- a/modules/koji/manifests/init.pp
+++ b/modules/koji/manifests/init.pp
@@ -11,6 +11,7 @@ class koji {
include apache_httpd::service::ssl
+ package { 'mod_python': ensure => installed }
package { "koji-hub":
ensure => installed
}
11 years
[puppet] Add mod_python to koji01
by Xavier Lamien
commit 7ff463b17cf7b95fd7142d7c281a5fbe5a7aca77
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Fri Sep 6 00:12:50 2013 +0200
Add mod_python to koji01
manifests/nodes/buildserver.rpmfusion.org.pp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp
index 4be2422..8ac67eb 100644
--- a/manifests/nodes/buildserver.rpmfusion.org.pp
+++ b/manifests/nodes/buildserver.rpmfusion.org.pp
@@ -7,7 +7,7 @@ node 'koji01.rpmfusion.org' {
}
apache_httpd { 'worker':
- modules => [ 'dir', 'mime', 'alias', 'rewrite', 'cgi' ],
+ modules => [ 'dir', 'mime', 'alias', 'rewrite', 'cgi', 'python' ],
}
class { 'koji::web': }
11 years
[puppet] Add cgi module for koji-hub
by Xavier Lamien
commit 1919151c8c0d0bbdb1b4a406a984e6dc37ed6f3f
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Fri Sep 6 00:01:25 2013 +0200
Add cgi module for koji-hub
manifests/nodes/buildserver.rpmfusion.org.pp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp
index 8d25f40..4be2422 100644
--- a/manifests/nodes/buildserver.rpmfusion.org.pp
+++ b/manifests/nodes/buildserver.rpmfusion.org.pp
@@ -7,7 +7,7 @@ node 'koji01.rpmfusion.org' {
}
apache_httpd { 'worker':
- modules => [ 'dir', 'mime', 'alias', 'rewrite' ],
+ modules => [ 'dir', 'mime', 'alias', 'rewrite', 'cgi' ],
}
class { 'koji::web': }
11 years
[puppet] Fix source files path.
by Xavier Lamien
commit 32275d46dd0cc2fe98056ff21b3d6dbc4d61c072
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Thu Sep 5 23:48:58 2013 +0200
Fix source files path.
.../hotfix/{fas2.py => python-fedora_fas2.py} | 0
modules/koji/manifests/init.pp | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/modules/fas/files/hotfix/fas2.py b/modules/fas/files/hotfix/python-fedora_fas2.py
similarity index 100%
rename from modules/fas/files/hotfix/fas2.py
rename to modules/fas/files/hotfix/python-fedora_fas2.py
diff --git a/modules/koji/manifests/init.pp b/modules/koji/manifests/init.pp
index 8c912f3..bbc3c01 100644
--- a/modules/koji/manifests/init.pp
+++ b/modules/koji/manifests/init.pp
@@ -26,7 +26,7 @@ class koji {
#}
file { '/etc/httpd/conf.d/kojihub.conf':
- source => 'puppet:///koji/web/applications/kojihub.conf',
+ source => 'puppet:///koji/hub/kojihub.conf',
}
file { '/etc/koji-hub/hub.conf':
11 years
[puppet] Disable fas-clients install as we use an old version atm. :(
by Xavier Lamien
commit 0ee12dd45a0b5d5ffb6e4c2139e490a4ca241b2d
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Thu Sep 5 23:33:57 2013 +0200
Disable fas-clients install as we use an old version atm. :(
manifests/nodes/buildserver.rpmfusion.org.pp | 4 ++++
modules/fas/manifests/init.pp | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp
index a63cc0d..8d25f40 100644
--- a/manifests/nodes/buildserver.rpmfusion.org.pp
+++ b/manifests/nodes/buildserver.rpmfusion.org.pp
@@ -6,6 +6,10 @@ node 'koji01.rpmfusion.org' {
koji_db_pass => 'admin',
}
+ apache_httpd { 'worker':
+ modules => [ 'dir', 'mime', 'alias', 'rewrite' ],
+ }
+
class { 'koji::web': }
class { 'koji::kojira': }
diff --git a/modules/fas/manifests/init.pp b/modules/fas/manifests/init.pp
index 287578a..81af6af 100644
--- a/modules/fas/manifests/init.pp
+++ b/modules/fas/manifests/init.pp
@@ -27,12 +27,14 @@ class fas {
}
class client (
- $group = $fas_groups ? { "" => ["sysadmin-main" ], default => $fas_groups }
- $restricted_app = $fas_restricted_app ? { "" => ["/usr/bin/cvs server"], default => $fas_restricted_app }
+ $group = $fas_groups ? { "" => ["sysadmin-main" ], default => $fas_groups },
+ $restricted_app = $fas_restricted_app ? { "" => ["/usr/bin/cvs server"], default => $fas_restricted_app },
$ssh_groups = $fas_ssh_groups
)
{
+ package { 'python-fedora': ensure => present }
+
# Use internal rebuilt package for now.
#package { "fas-clients": ensure => installed }
@@ -41,7 +43,7 @@ class fas {
group => "root",
mode => 0600,
content => template("fas/client/fas.conf.erb"),
- require => Package["fas-clients"],
+ #require => Package["fas-clients"],
}
# BackPort fas-0.8.3.2
11 years
[puppet] Add fas client to koji01
by Xavier Lamien
commit bb8cf802019fba5973efac76f1f3deea2af56cb2
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Thu Sep 5 23:11:08 2013 +0200
Add fas client to koji01
manifests/nodes/buildserver.rpmfusion.org.pp | 2 ++
modules/fas/manifests/init.pp | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp
index 226764b..a63cc0d 100644
--- a/manifests/nodes/buildserver.rpmfusion.org.pp
+++ b/manifests/nodes/buildserver.rpmfusion.org.pp
@@ -13,4 +13,6 @@ node 'koji01.rpmfusion.org' {
iptables { '/etc/sysconfig/iptables':
tcpports => $tcpports,
}
+
+ class { 'fas::client': }
}
diff --git a/modules/fas/manifests/init.pp b/modules/fas/manifests/init.pp
index ac7b2f5..287578a 100644
--- a/modules/fas/manifests/init.pp
+++ b/modules/fas/manifests/init.pp
@@ -33,7 +33,8 @@ class fas {
)
{
- package { "fas-clients": ensure => installed }
+ # Use internal rebuilt package for now.
+ #package { "fas-clients": ensure => installed }
file { "/etc/fas.conf":
owner => "root",
11 years
[puppet] Fix typo on builders nodes file.
by Xavier Lamien
commit 02ec36e75cf99205814512ed849d1bf0746e0a84
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Thu Sep 5 23:05:21 2013 +0200
Fix typo on builders nodes file.
....rpmfusion.org.pp => builders.rpmfusion.org.pp} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
---
diff --git a/manifests/nodes/buidlers.rpmfusion.org.pp b/manifests/nodes/builders.rpmfusion.org.pp
similarity index 100%
rename from manifests/nodes/buidlers.rpmfusion.org.pp
rename to manifests/nodes/builders.rpmfusion.org.pp
11 years
[puppet] Open related http port for koji-web.
by Xavier Lamien
commit e5640a5bbb3e9349a5d5df3eb61438b2857dbad0
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Thu Sep 5 23:04:04 2013 +0200
Open related http port for koji-web.
...mfusion.org.pp => buildserver.rpmfusion.org.pp} | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/manifests/nodes/buildsys.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp
similarity index 67%
rename from manifests/nodes/buildsys.rpmfusion.org.pp
rename to manifests/nodes/buildserver.rpmfusion.org.pp
index fcabfba..226764b 100644
--- a/manifests/nodes/buildsys.rpmfusion.org.pp
+++ b/manifests/nodes/buildserver.rpmfusion.org.pp
@@ -5,6 +5,12 @@ node 'koji01.rpmfusion.org' {
koji_db_host => 'koji01.rpmfusion.org',
koji_db_pass => 'admin',
}
+
class { 'koji::web': }
class { 'koji::kojira': }
+
+ $tcpports = [ '80', '443' ]
+ iptables { '/etc/sysconfig/iptables':
+ tcpports => $tcpports,
+ }
}
11 years
[puppet] Add subdir to manage private configs against some restricted nodes.
by Xavier Lamien
commit e14cb18deabe6becba80c6435f634bd5832438ea
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Thu Sep 5 22:42:51 2013 +0200
Add subdir to manage private configs against some restricted nodes.
manifests/nodes.pp | 8 --------
manifests/nodes/buidlers.rpmfusion.org.pp | 1 +
manifests/nodes/buildsys.rpmfusion.org.pp | 10 ++++++++++
manifests/site.pp | 3 +++
4 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 9791274..e56b6c0 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -1,13 +1,5 @@
# Nodes, alphabetically
-node 'koji01.rpmfusion.org' {
- class { 'koji::hub':
- koji_db_host => 'koji01.rpmfusion.org',
- koji_db_pass => 'admin',
- }
- class { 'koji::web': }
- class { 'koji::kojira': }
-}
node 'builder1.ovh.rpmfusion.lan' {
$arch = 'i386'
diff --git a/manifests/nodes/buidlers.rpmfusion.org.pp b/manifests/nodes/buidlers.rpmfusion.org.pp
new file mode 100644
index 0000000..cec3973
--- /dev/null
+++ b/manifests/nodes/buidlers.rpmfusion.org.pp
@@ -0,0 +1 @@
+# Builders related nodes
diff --git a/manifests/nodes/buildsys.rpmfusion.org.pp b/manifests/nodes/buildsys.rpmfusion.org.pp
new file mode 100644
index 0000000..fcabfba
--- /dev/null
+++ b/manifests/nodes/buildsys.rpmfusion.org.pp
@@ -0,0 +1,10 @@
+# All Build Server related nodes
+
+node 'koji01.rpmfusion.org' {
+ class { 'koji::hub':
+ koji_db_host => 'koji01.rpmfusion.org',
+ koji_db_pass => 'admin',
+ }
+ class { 'koji::web': }
+ class { 'koji::kojira': }
+}
diff --git a/manifests/nodes/pkgs.rpmfusion.org.pp b/manifests/nodes/pkgs.rpmfusion.org.pp
new file mode 100644
index 0000000..e69de29
diff --git a/manifests/site.pp b/manifests/site.pp
index db548bb..8755897 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -99,5 +99,8 @@ class { 'puppet::agent':
# Minimal installs don't have restorecond running by default
include selinux
+# Main/Obvious nodes
import 'nodes.pp'
+# splited nodes to better manage private & public.
+import 'nodes/*.pp'
11 years