commit af5bd21a74a4dda6e7c548ac67b9a97a2ff2fda0 Author: Xavier Lamien <laxathom(a)lxtnow.net&gt; Date: Thu Sep 5 00:52:44 2013 +0200 Update koji module params. Disable certificate for now. manifests/nodes.pp | 5 ++- modules/apache_httpd/manifests/service/base.pp | 1 + modules/koji/manifests/init.pp | 49 ++++++++++++----------- 3 files changed, 31 insertions(+), 24 deletions(-) --- diff --git a/manifests/nodes.pp b/manifests/nodes.pp index cc311c4..9791274 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -1,7 +1,10 @@ # Nodes, alphabetically node 'koji01.rpmfusion.org' { - class { 'koji::hub': } + class { 'koji::hub': + koji_db_host => 'koji01.rpmfusion.org', + koji_db_pass => 'admin', + } class { 'koji::web': } class { 'koji::kojira': } } diff --git a/modules/apache_httpd/manifests/service/base.pp b/modules/apache_httpd/manifests/service/base.pp index 8465852..05dbbdd 100644 --- a/modules/apache_httpd/manifests/service/base.pp +++ b/modules/apache_httpd/manifests/service/base.pp @@ -8,6 +8,7 @@ # class apache_httpd::service::base { + package { 'httpd': ensure => present } # Main service, modified in inherited classes service { 'httpd': ensure => running, diff --git a/modules/koji/manifests/init.pp b/modules/koji/manifests/init.pp index 58c1ab1..8c912f3 100644 --- a/modules/koji/manifests/init.pp +++ b/modules/koji/manifests/init.pp @@ -4,9 +4,12 @@ class koji { ensure => installed } - class hub inherits koji { + class hub ( + $koji_db_host = $koji_hostname, + $koji_db_pass = $koji_passwd + ) inherits koji{ - include httpd + include apache_httpd::service::ssl package { "koji-hub": ensure => installed @@ -23,7 +26,7 @@ class koji { #} file { '/etc/httpd/conf.d/kojihub.conf': - source => 'web/applications/kojihub.conf', + source => 'puppet:///koji/web/applications/kojihub.conf', } file { '/etc/koji-hub/hub.conf': @@ -32,25 +35,25 @@ class koji { group => apache, mode => 600, require => Package[koji-hub], - content => template('build/hub.conf.erb'), + content => template('koji/hub-server/hub.conf.erb'), notify => Service['httpd'] #TODO: same as above. } } class web inherits koji { - include httpd + include apache_httpd::service::ssl package { koji-web: ensure => present, } file { '/etc/httpd/conf.d/kojiweb.conf': - content => template('koji/web/kojiweb.conf'), + source => 'puppet:///koji/web/kojiweb.conf', mode => 640, owner => 'root', group => 'root', - backup => main, + # backup => main, recurse => false, ensure => file, notify => Service['httpd'], @@ -67,15 +70,15 @@ class koji { ensure => directory } - cert { "/etc/pki/koji/rpmfusion_ca_cert.crt": - source => "secure/certs/CA/rpmfusion_ca_cert.crt", - notify => Service['httpd'], - } + #cert { "/etc/pki/koji/rpmfusion_ca_cert.crt": + # source => "secure/certs/CA/rpmfusion_ca_cert.crt", + # notify => Service['httpd'], + #} - cert { "/etc/pki/koji/kojiweb.pem": - source => "secure/certs/web/kojiweb.pem", - notify => Service['httpd'], - } + #cert { "/etc/pki/koji/kojiweb.pem": + # source => "secure/certs/web/kojiweb.pem", + # notify => Service['httpd'], + #} } class builder inherits koji { @@ -128,14 +131,14 @@ class koji { enable => true, } - cert { "/etc/pki/koji/rpmfusion_ca_cert.crt": - source => "secure/certs/CA/rpmfusion_ca_cert.crt", - notify => Service['kojira'], - } + #cert { "/etc/pki/koji/rpmfusion_ca_cert.crt": + # source => "secure/certs/CA/rpmfusion_ca_cert.crt", + # notify => Service['kojira'], + #} - cert { "/etc/kojira/kojira.pem": - source => "secure/certs/web/kojira.pem", - notify => Service['kojira'], - } + #cert { "/etc/kojira/kojira.pem": + # source => "secure/certs/web/kojira.pem", + # notify => Service['kojira'], + #} } }