aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/websites/templates/vhost_meetbot.conf19
-rw-r--r--manifests/nodes/rabbit.pp18
-rw-r--r--manifests/nodes/sucuk.pp14
-rw-r--r--modules/apache/templates/vhost_fcgid.conf10
-rw-r--r--modules/buildsystem/manifests/binrepo.pp7
-rw-r--r--modules/buildsystem/manifests/iurt/config.pp2
-rw-r--r--modules/buildsystem/manifests/maintdb.pp7
-rw-r--r--modules/viewvc/files/robots.txt4
-rw-r--r--modules/youri-check/templates/4.conf241
-rw-r--r--modules/youri-check/templates/5.conf241
-rw-r--r--modules/youri-check/templates/6.conf241
-rw-r--r--modules/youri-check/templates/7.conf241
-rw-r--r--modules/youri-check/templates/8.conf241
13 files changed, 47 insertions, 1239 deletions
diff --git a/deployment/websites/templates/vhost_meetbot.conf b/deployment/websites/templates/vhost_meetbot.conf
index 6c393f7a..a6f812c5 100644
--- a/deployment/websites/templates/vhost_meetbot.conf
+++ b/deployment/websites/templates/vhost_meetbot.conf
@@ -15,3 +15,22 @@
</Directory>
</VirtualHost>
+<VirtualHost *:443>
+ ServerAdmin sysadm@mageia.org
+ ServerName meetbot.<%= domain %>
+ DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %>
+
+ CustomLog /var/log/httpd/access_meetbot_log combined
+ ErrorLog /var/log/httpd/error_meetbot_log
+
+<%= scope.function_template(["apache/vhost_ssl.conf"]) %>
+
+ <Directory <%= scope.lookupvar("websites::meetbot::vhostdir") %>>
+ Allow from all
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+ Options +Indexes
+ IndexIgnore .htaccess *.bak *~ *.txt *.log.html
+ </Directory>
+</VirtualHost>
diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp
index 12cf8f48..ae4d4b08 100644
--- a/manifests/nodes/rabbit.pp
+++ b/manifests/nodes/rabbit.pp
@@ -25,24 +25,6 @@ node rabbit {
minute => 10
}
- youri-check::config {'config_6':
- version => '6',
- }
- youri-check::check {'check_6':
- version => '6',
- hour => '*/4',
- minute => 30
- }
-
- youri-check::config {'config_5':
- version => '5',
- }
- youri-check::check {'check_5':
- version => '5',
- hour => '*/6',
- minute => 30
- }
-
# for testing iso quickly
# include libvirtd::kvm
# libvirtd::group_access { 'mga-iso_makers': }
diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp
index fcdb4ce3..c13d11cf 100644
--- a/manifests/nodes/sucuk.pp
+++ b/manifests/nodes/sucuk.pp
@@ -91,20 +91,6 @@ node sucuk {
minute => '56'
}
- youri-check::createdb_user {'config_8':
- version => '8',
- }
-
- youri-check::config {'config_8':
- version => '8',
- }
-
- youri-check::report {'report_8':
- version => '8',
- hour => '*/4',
- minute => '56'
- }
-
include tld_redirections
# temporary, just the time the vm is running there
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/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/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp
index ad9f3172..568eabb4 100644
--- a/modules/buildsystem/manifests/iurt/config.pp
+++ b/modules/buildsystem/manifests/iurt/config.pp
@@ -28,7 +28,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/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=*
diff --git a/modules/youri-check/templates/4.conf b/modules/youri-check/templates/4.conf
deleted file mode 100644
index aa7e5d4e..00000000
--- a/modules/youri-check/templates/4.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-# vim:ft=yaml:et:sw=4
-
-# helper variables
-mirror: http://repository.mageia.org/distrib/4
-mirror_i586: ${mirror}/i586/media
-mirror_x86_64: ${mirror}/x86_64/media
-
-# resultset definition
-resultset:
- class: Youri::Check::Resultset::DBI
- options:
- driver: Pg
- host: <%= pgsql_server %>;sslmode=require
- base: <%= pgsql_db %>
- user: <%= pgsql_user %>
- pass: <%= pgsql_password %>
-
-resolver:
- class: Youri::Check::Maintainer::Resolver::CGI
- options:
- url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
- exceptions:
- - nobody
-
-
-# checks definitions
-tests:
- dependencies:
- class: Youri::Check::Test::Dependencies
-
- missing:
- class: Youri::Check::Test::Missing
-
-# reports definitions
-reports:
- file:
- class: Youri::Check::Report::File
- options:
- to: <%= outdir %>
- global: 1
- individual: 1
- formats:
- html:
- class: Youri::Check::Report::Format::HTML
- text:
- class: Youri::Check::Report::Format::Text
- rss:
- class: Youri::Check::Report::Format::RSS
-
-# media definitions
-medias:
- core.i586:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.x86_64:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core.x86_64
- - core_updates.x86_64
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.sources:
- class: Youri::Media::URPM
- options:
- name: core
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
-
- core_updates.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core.i586
- - core_updates.i586
-
- core_updates_testing.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
-
- nonfree.i586:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
- nonfree.x86_64:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- - nonfree.x86_64
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
-
- nonfree.sources:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - nonfree.x86_64
- - core.i586
- - nonfree.i586
diff --git a/modules/youri-check/templates/5.conf b/modules/youri-check/templates/5.conf
deleted file mode 100644
index 4e9a9217..00000000
--- a/modules/youri-check/templates/5.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-# vim:ft=yaml:et:sw=4
-
-# helper variables
-mirror: http://repository.mageia.org/distrib/5
-mirror_i586: ${mirror}/i586/media
-mirror_x86_64: ${mirror}/x86_64/media
-
-# resultset definition
-resultset:
- class: Youri::Check::Resultset::DBI
- options:
- driver: Pg
- host: <%= pgsql_server %>;sslmode=require
- base: <%= pgsql_db %>
- user: <%= pgsql_user %>
- pass: <%= pgsql_password %>
-
-resolver:
- class: Youri::Check::Maintainer::Resolver::CGI
- options:
- url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
- exceptions:
- - nobody
-
-
-# checks definitions
-tests:
- dependencies:
- class: Youri::Check::Test::Dependencies
-
- missing:
- class: Youri::Check::Test::Missing
-
-# reports definitions
-reports:
- file:
- class: Youri::Check::Report::File
- options:
- to: <%= outdir %>
- global: 1
- individual: 1
- formats:
- html:
- class: Youri::Check::Report::Format::HTML
- text:
- class: Youri::Check::Report::Format::Text
- rss:
- class: Youri::Check::Report::Format::RSS
-
-# media definitions
-medias:
- core.i586:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.x86_64:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core.x86_64
- - core_updates.x86_64
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.sources:
- class: Youri::Media::URPM
- options:
- name: core
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
-
- core_updates.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core.i586
- - core_updates.i586
-
- core_updates_testing.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
-
- nonfree.i586:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
- nonfree.x86_64:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- - nonfree.x86_64
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
-
- nonfree.sources:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - nonfree.x86_64
- - core.i586
- - nonfree.i586
diff --git a/modules/youri-check/templates/6.conf b/modules/youri-check/templates/6.conf
deleted file mode 100644
index 9b2fdae2..00000000
--- a/modules/youri-check/templates/6.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-# vim:ft=yaml:et:sw=4
-
-# helper variables
-mirror: http://repository.mageia.org/distrib/6
-mirror_i586: ${mirror}/i586/media
-mirror_x86_64: ${mirror}/x86_64/media
-
-# resultset definition
-resultset:
- class: Youri::Check::Resultset::DBI
- options:
- driver: Pg
- host: <%= pgsql_server %>;sslmode=require
- base: <%= pgsql_db %>
- user: <%= pgsql_user %>
- pass: <%= pgsql_password %>
-
-resolver:
- class: Youri::Check::Maintainer::Resolver::CGI
- options:
- url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
- exceptions:
- - nobody
-
-
-# checks definitions
-tests:
- dependencies:
- class: Youri::Check::Test::Dependencies
-
- missing:
- class: Youri::Check::Test::Missing
-
-# reports definitions
-reports:
- file:
- class: Youri::Check::Report::File
- options:
- to: <%= outdir %>
- global: 1
- individual: 1
- formats:
- html:
- class: Youri::Check::Report::Format::HTML
- text:
- class: Youri::Check::Report::Format::Text
- rss:
- class: Youri::Check::Report::Format::RSS
-
-# media definitions
-medias:
- core.i586:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.x86_64:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core.x86_64
- - core_updates.x86_64
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.sources:
- class: Youri::Media::URPM
- options:
- name: core
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
-
- core_updates.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core.i586
- - core_updates.i586
-
- core_updates_testing.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
-
- nonfree.i586:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
- nonfree.x86_64:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- - nonfree.x86_64
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
-
- nonfree.sources:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - nonfree.x86_64
- - core.i586
- - nonfree.i586
diff --git a/modules/youri-check/templates/7.conf b/modules/youri-check/templates/7.conf
deleted file mode 100644
index 5054f2de..00000000
--- a/modules/youri-check/templates/7.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-# vim:ft=yaml:et:sw=4
-
-# helper variables
-mirror: http://repository.mageia.org/distrib/7
-mirror_i586: ${mirror}/i586/media
-mirror_x86_64: ${mirror}/x86_64/media
-
-# resultset definition
-resultset:
- class: Youri::Check::Resultset::DBI
- options:
- driver: Pg
- host: <%= pgsql_server %>;sslmode=require
- base: <%= pgsql_db %>
- user: <%= pgsql_user %>
- pass: <%= pgsql_password %>
-
-resolver:
- class: Youri::Check::Maintainer::Resolver::CGI
- options:
- url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
- exceptions:
- - nobody
-
-
-# checks definitions
-tests:
- dependencies:
- class: Youri::Check::Test::Dependencies
-
- missing:
- class: Youri::Check::Test::Missing
-
-# reports definitions
-reports:
- file:
- class: Youri::Check::Report::File
- options:
- to: <%= outdir %>
- global: 1
- individual: 1
- formats:
- html:
- class: Youri::Check::Report::Format::HTML
- text:
- class: Youri::Check::Report::Format::Text
- rss:
- class: Youri::Check::Report::Format::RSS
-
-# media definitions
-medias:
- core.i586:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.x86_64:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core.x86_64
- - core_updates.x86_64
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.sources:
- class: Youri::Media::URPM
- options:
- name: core
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
-
- core_updates.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core.i586
- - core_updates.i586
-
- core_updates_testing.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
-
- nonfree.i586:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
- nonfree.x86_64:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- - nonfree.x86_64
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
-
- nonfree.sources:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - nonfree.x86_64
- - core.i586
- - nonfree.i586
diff --git a/modules/youri-check/templates/8.conf b/modules/youri-check/templates/8.conf
deleted file mode 100644
index c6ba6881..00000000
--- a/modules/youri-check/templates/8.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-# vim:ft=yaml:et:sw=4
-
-# helper variables
-mirror: http://repository.mageia.org/distrib/8
-mirror_i586: ${mirror}/i586/media
-mirror_x86_64: ${mirror}/x86_64/media
-
-# resultset definition
-resultset:
- class: Youri::Check::Resultset::DBI
- options:
- driver: Pg
- host: <%= pgsql_server %>;sslmode=require
- base: <%= pgsql_db %>
- user: <%= pgsql_user %>
- pass: <%= pgsql_password %>
-
-resolver:
- class: Youri::Check::Maintainer::Resolver::CGI
- options:
- url: https://pkgsubmit.<%= domain %>/data/maintdb.txt
- exceptions:
- - nobody
-
-
-# checks definitions
-tests:
- dependencies:
- class: Youri::Check::Test::Dependencies
-
- missing:
- class: Youri::Check::Test::Missing
-
-# reports definitions
-reports:
- file:
- class: Youri::Check::Report::File
- options:
- to: <%= outdir %>
- global: 1
- individual: 1
- formats:
- html:
- class: Youri::Check::Report::Format::HTML
- text:
- class: Youri::Check::Report::Format::Text
- rss:
- class: Youri::Check::Report::Format::RSS
-
-# media definitions
-medias:
- core.i586:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.i586:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.x86_64:
- class: Youri::Media::URPM
- options:
- name: core
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- missing:
- allowed:
- - core.sources
-
- core_updates.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - core_updates.i586
- - core.x86_64
- - core_updates.x86_64
- missing:
- allowed:
- - core.sources
- - core_updates.sources
-
- core_updates_testing.x86_64:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_core_updates_testing.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
- missing:
- allowed:
- - core.sources
- - core_updates.sources
- - core_updates_testing.sources
-
- core.sources:
- class: Youri::Media::URPM
- options:
- name: core
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
-
- core_updates.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core.i586
- - core_updates.i586
-
- core_updates_testing.sources:
- class: Youri::Media::URPM
- options:
- name: core_updates_testing
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_core_updates_testing.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core_updates.x86_64
- - core_updates_testing.x86_64
- - core.i586
- - core_updates.i586
- - core_updates_testing.i586
-
- nonfree.i586:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.i586
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
- nonfree.x86_64:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: binary
- hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - core.i586
- - nonfree.x86_64
- - nonfree.i586
- missing:
- allowed:
- - nonfree.sources
-
-
- nonfree.sources:
- class: Youri::Media::URPM
- options:
- name: nonfree
- type: source
- hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz
- options:
- dependencies:
- allowed:
- - core.x86_64
- - nonfree.x86_64
- - core.i586
- - nonfree.i586