diff options
| -rw-r--r-- | modules/apache/templates/vhost_fcgid.conf | 10 | ||||
| -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 | ||||
| -rw-r--r-- | modules/viewvc/files/robots.txt | 4 |
7 files changed, 46 insertions, 6 deletions
diff --git a/modules/apache/templates/vhost_fcgid.conf b/modules/apache/templates/vhost_fcgid.conf index 2dd2c043..17b2bb06 100644 --- a/modules/apache/templates/vhost_fcgid.conf +++ b/modules/apache/templates/vhost_fcgid.conf @@ -4,3 +4,13 @@ AddHandler fcgid-script .pl <%- end -%> FcgidMinProcessesPerClass <%= process %> FcgidIdleTimeout 30 + +# These robots were scraping the whole of svnweb in 2024-04, causing severe +# load, so they are banned. It's not clear whether they obey robots.txt or +# not (we didn't give them enough of a chance to find out), so we could +# consider giving them a chance to redeem themselves at some point in the +# future. +RewriteEngine on +RewriteCond %{HTTP_USER_AGENT} ClaudeBot|Amazonbot +RewriteRule . - [R=403,L] +ErrorDocument 403 "<html><body>Impolite robots are not allowed</body></html>" 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 diff --git a/modules/viewvc/files/robots.txt b/modules/viewvc/files/robots.txt index 1c08ba9e..3e0fc5c5 100644 --- a/modules/viewvc/files/robots.txt +++ b/modules/viewvc/files/robots.txt @@ -4,6 +4,8 @@ User-agent: bingbot User-agent: YandexBot User-agent: Mail.RU_Bot User-agent: MJ12bot +User-agent: ClaudeBot +User-agent: Amazonbot Disallow: /*/tags/ Disallow: *?view=annotate* Disallow: *?annotate=* @@ -12,7 +14,7 @@ Disallow: *?r1=* Disallow: *sortby=* Disallow: *sortdir=* Disallow: *?revision=*&view=markup&* -Disallow: *?pathrev=* +Disallow: *pathrev=* Disallow: *?*&view=log* Disallow: *view=log&* Disallow: *diff_format=* |