commit 0ee12dd45a0b5d5ffb6e4c2139e490a4ca241b2d Author: Xavier Lamien <laxathom(a)scm1.rpmfusion.org&gt; 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