diff options
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/binrepo.pp | 7 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/distros.rb | 12 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/iurt/config.pp | 5 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/maintdb.pp | 7 | ||||
| -rw-r--r-- | modules/buildsystem/templates/iurt.conf | 2 | ||||
| -rw-r--r-- | modules/buildsystem/templates/media.cfg | 12 |
6 files changed, 40 insertions, 5 deletions
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index 7803e385..f2f529c0 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -32,4 +32,11 @@ class buildsystem::binrepo { location => $buildsystem::var::binrepo::repodir, content => template('buildsystem/binrepo/vhost_binrepo.conf'), } + + apache::vhost::base { "ssl_${buildsystem::var::binrepo::hostname}": + use_ssl => true, + vhost => $buildsystem::var::binrepo::hostname, + location => $buildsystem::var::binrepo::repodir, + content => template('buildsystem/binrepo/vhost_binrepo.conf'), + } } diff --git a/modules/buildsystem/manifests/distros.rb b/modules/buildsystem/manifests/distros.rb index 5301944d..a298c0a8 100644 --- a/modules/buildsystem/manifests/distros.rb +++ b/modules/buildsystem/manifests/distros.rb @@ -30,7 +30,7 @@ hostclass "buildsystem::distros" do file [ mediadir, 'media_info' ].join('/'), :ensure => 'directory', :owner => schedbot_user, :group => schedbot_user file [ mediadir, 'debug' ].join('/'), :ensure => 'directory', - :owner => mirror_user, :group => mirror_user + :owner => schedbot_user, :group => schedbot_user distro['medias'].each{|media, m| file [ mediadir, media ].join('/'), :ensure => 'directory', :owner => schedbot_user, :group => schedbot_user @@ -44,12 +44,18 @@ hostclass "buildsystem::distros" do file [ mediadir, media, repo, 'media_info' ].join('/'), :ensure => 'directory', :owner => schedbot_user, :group => schedbot_user + file [ mediadir, media, repo, 'repodata' ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user file [ mediadir, 'debug', media, repo ].join('/'), :ensure => 'directory', :owner => schedbot_user, :group => schedbot_user file [ mediadir, 'debug', media, repo, 'media_info' ].join('/'), :ensure => 'directory', :owner => schedbot_user, :group => schedbot_user + file [ mediadir, 'debug', media, repo, 'repodata' ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user end } if distro['based_on'] != nil @@ -76,8 +82,8 @@ hostclass "buildsystem::distros" do # SRPMS srpmsdir = [ bootstrap_reporoot, rel, 'SRPMS' ].join('/') file srpmsdir, - :ensure => 'directory', :owner => mirror_user, - :group => mirror_user + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user distro['medias'].each{|media, m| file [ srpmsdir, media ].join('/'), :ensure => 'directory', :owner => schedbot_user, :group => schedbot_user diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp index ad9f3172..3334df76 100644 --- a/modules/buildsystem/manifests/iurt/config.pp +++ b/modules/buildsystem/manifests/iurt/config.pp @@ -15,6 +15,9 @@ define buildsystem::iurt::config() { 'gcc' => 115200, 'itk' => 115200, 'java-1.8.0-openjdk' => 172800, + 'java-17-openjdk' => 172800, + 'java-21-openjdk' => 172800, + 'java-latest-openjdk' => 172800, 'kernel' => 115200, 'libreoffice' => 432000, 'llvm' => 57600, @@ -28,7 +31,7 @@ define buildsystem::iurt::config() { 'salome' => 57600, 'vtk' => 57600, 'webkit' => 57600, - 'webkit2' => 57600, + 'webkit2' => 115200, 'wrapitk' => 115200, 'rocm-llvm' => 70000, } diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp index 74f8e28c..5a961b63 100644 --- a/modules/buildsystem/manifests/maintdb.pp +++ b/modules/buildsystem/manifests/maintdb.pp @@ -48,4 +48,11 @@ class buildsystem::maintdb { location => $buildsystem::var::maintdb::dbdir, content => template('buildsystem/maintdb/vhost_maintdb.conf'), } + + apache::vhost::base { "ssl_${buildsystem::var::maintdb::hostname}": + use_ssl => true, + vhost => $buildsystem::var::maintdb::hostname, + location => $buildsystem::var::maintdb::dbdir, + content => template('buildsystem/maintdb/vhost_maintdb.conf'), + } } diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf index c08088ae..2dd8bf0e 100644 --- a/modules/buildsystem/templates/iurt.conf +++ b/modules/buildsystem/templates/iurt.conf @@ -19,7 +19,7 @@ admin => 'mageia-sysadm@mageia.org', packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>', sendmail => 0, - log_size_limit => '400M', + log_size_limit => '600M', build_timeout => { <%- build_timeout.keys.sort.each{|package| -%> '<%= package %>' => <%= (build_timeout[package].to_f * scope.lookupvar('buildsystem::var::iurt::timeout_multiplier').to_f).to_i %>, diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg index ba01fde5..64757a2b 100644 --- a/modules/buildsystem/templates/media.cfg +++ b/modules/buildsystem/templates/media.cfg @@ -106,6 +106,18 @@ distro['medias'].keys.sort { |x,y| distro['medias'][x]['order'] <=> distro['medi %> <%- end + if @arch == 'x86_64' and distro['arch'].include?('i686') + medianame32 = [ medianame, '32' ].join('') + -%><%= + media_out [ '../../i686/media', medianame, reponame ].join('/'), + :hdlist => [ 'hdlist', medianame32, reponame ].join('_') + '.src.cz', + :name => media_name(medianame, reponame, nil, '32bit'), + :media_type => media_type.join(':'), + :noauto => noauto + + %> + <%- + end } } if distro['based_on'] != nil |