[puppet] Add allowed fas group to koji01. Fix path on python-fedora hotfix.
commit 1e30715ecaedb3f9ae83a642e6f59ddc9bb13a4d
Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org>
Date: Fri Sep 6 01:33:17 2013 +0200
Add allowed fas group to koji01.
Fix path on python-fedora hotfix.
manifests/nodes/buildserver.rpmfusion.org.pp | 14 ++++++++++++--
modules/fas/manifests/init.pp | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp
b/manifests/nodes/buildserver.rpmfusion.org.pp
index 8ac67eb..bba213a 100644
--- a/manifests/nodes/buildserver.rpmfusion.org.pp
+++ b/manifests/nodes/buildserver.rpmfusion.org.pp
@@ -7,7 +7,16 @@ node 'koji01.rpmfusion.org' {
}
apache_httpd { 'worker':
- modules => [ 'dir', 'mime', 'alias',
'rewrite', 'cgi', 'python' ],
+ modules => [
+ 'dir',
+ 'mime',
+ 'alias',
+ 'rewrite',
+ 'cgi',
+ 'python',
+ 'authz_host',
+ 'include'
+ ],
}
class { 'koji::web': }
@@ -18,5 +27,6 @@ node 'koji01.rpmfusion.org' {
tcpports => $tcpports,
}
- class { 'fas::client': }
+ class { 'fas::client':
+ $fas_groups = [ 'sysadmin-main', 'sysadmin-build' ] }
}
diff --git a/modules/fas/manifests/init.pp b/modules/fas/manifests/init.pp
index 81af6af..0ab9097 100644
--- a/modules/fas/manifests/init.pp
+++ b/modules/fas/manifests/init.pp
@@ -54,7 +54,7 @@ class fas {
source => "puppet:///fas/hotfix/fasClient",
require => Package["python-fedora"],
}
- file { "/usr/lib/python-2.6/site-packages/fedora/client/fas2.py":
+ file { "/usr/lib/python2.6/site-packages/fedora/client/fas2.py":
owner => "root",
group => "root",
source => "puppet:///fas/hotfix/python-fedora_fas2.py",