commit 2755feb451106330447241fd1eaf7158b4c46f33 Author: Xavier Lamien <laxathom(a)lxtnow.net&gt; Date: Sat Sep 7 00:27:52 2013 +0200 Update kojihub as well. manifests/nodes/buildserver.rpmfusion.org.pp | 6 +++- modules/koji/files/hub/kojihub.conf | 28 +++++++++++++------------ modules/koji/manifests/init.pp | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) --- diff --git a/manifests/nodes/buildserver.rpmfusion.org.pp b/manifests/nodes/buildserver.rpmfusion.org.pp index 6a53ab3..b79d788 100644 --- a/manifests/nodes/buildserver.rpmfusion.org.pp +++ b/manifests/nodes/buildserver.rpmfusion.org.pp @@ -18,7 +18,9 @@ node 'koji01.rpmfusion.org' { ], } - class { 'koji::web': } + class { 'koji::web': + kojiSecret => '04321114' + } class { 'koji::kojira': } $tcpports = [ '80', '443' ] @@ -27,5 +29,5 @@ node 'koji01.rpmfusion.org' { } class { 'fas::client': - $fas_groups = [ 'sysadmin-main', 'sysadmin-build' ] } + group => [ 'sysadmin-main', 'sysadmin-build' ] } } diff --git a/modules/koji/files/hub/kojihub.conf b/modules/koji/files/hub/kojihub.conf index 3f1911c..b86df22 100644 --- a/modules/koji/files/hub/kojihub.conf +++ b/modules/koji/files/hub/kojihub.conf @@ -2,23 +2,25 @@ # koji-hub is an xmlrpc interface to the Koji database # -Alias /kojihub "/usr/share/koji-hub/XMLRPC" +Alias /kojihub /usr/share/koji-hub/kojixmlrpc.py -<Directory /usr/share/koji-hub> - SetHandler mod_python - PythonHandler kojixmlrpc - - PythonOption ConfigFile /etc/koji-hub/hub.conf - - PythonDebug Off - # autoreload is mostly useless to us (it would only reload kojixmlrpc.py) - PythonAutoReload Off +<Directory "/usr/share/koji-hub"> + Options ExecCGI + SetHandler wsgi-script + Order allow,deny + Allow from all </Directory> -# uncomment this to enable authentication via SSL client certificates -<Location /kojihub> - SSLOptions +StdEnvVars +<Location /kojihub/ssllogin> + SSLVerifyClient require + SSLVerifyDepth 10 + SSLOptions +StdEnvVars </Location> + +# uncomment this to enable authentication via SSL client certificates +#<Location /kojihub> +# SSLOptions +StdEnvVars +#</Location> # these options must be enabled globally (in ssl.conf) # SSLVerifyClient require # SSLVerifyDepth 10 diff --git a/modules/koji/manifests/init.pp b/modules/koji/manifests/init.pp index ef221e0..83d2cf5 100644 --- a/modules/koji/manifests/init.pp +++ b/modules/koji/manifests/init.pp @@ -41,7 +41,7 @@ class koji { } } - class web ( $koji_secret = $kojiSecret ) inherits koji { + class web ( $kojiSecret = $koji_secret ) inherits koji { include apache_httpd::service::ssl