diff options
Diffstat (limited to 'modules/youri-check')
| -rw-r--r-- | modules/youri-check/manifests/init.pp | 129 | ||||
| -rw-r--r-- | modules/youri-check/templates/9.conf (renamed from modules/youri-check/templates/1.conf) | 150 | ||||
| -rw-r--r-- | modules/youri-check/templates/cauldron.conf | 430 | ||||
| -rw-r--r-- | modules/youri-check/templates/vhost_check.conf | 2 |
4 files changed, 436 insertions, 275 deletions
diff --git a/modules/youri-check/manifests/init.pp b/modules/youri-check/manifests/init.pp index 7992d853..ebdaa492 100644 --- a/modules/youri-check/manifests/init.pp +++ b/modules/youri-check/manifests/init.pp @@ -1,51 +1,81 @@ class youri-check { class base { - $vhost = "check.$domain" + $vhost = "check.${::domain}" $user = 'youri' $home = '/var/lib/youri' + $home_check = '/var/www/youri-check' + $pgsql_password = extlookup('youri_pgsql','x') user { $user: comment => 'Youri Check', home => $home, } - file { $home: - ensure => directory, - owner => $user, - group => $user, - } + file { $home: + ensure => directory, + owner => $user, + group => $user, + } + + file { $home_check: + ensure => directory, + owner => $user, + group => $user, + } - $pgsql_server = "$vhost" + $pgsql_server = "${vhost}" - package { ['youri-check', 'perl-DBD-Pg', 'perl-Youri-Media']: } + package { ['youri-check', 'perl-DBD-Pg', 'perl-Youri-Media']: } } + define config($version) { - include youri-check::base + include stdlib + include youri-check::base + + $config = "/etc/youri/${version}.conf" + $outdir = "/var/www/youri-check/${version}" + $pgsql_db = "youri_check_${version}" + $pgsql_server = $base::pgsql_server + $pgsql_user = "youri${version}" + $pgsql_password = extlookup('youri_pgsql','x') + # We want to alert for packages older than the cut-off for latest mass rebuild + # 1745539200 is 2025-04-25 + $max_days = (time() - 1745539200)/(24*3600) + + file { "${config}": + ensure => present, + owner => $base::user, + mode => '0640', + content => template("youri-check/${version}.conf"), + require => User[$base::user], + } + } + - $config = "/etc/youri/$version.conf" - $outdir = "/var/www/youri-check/$version" - $pgsql_db = "youri_check_$version" - $pgsql_server = $base::pgsql_server - $pgsql_user = "youri$version" + define createdb_user($version) { + $pgsql_db = "youri_check_${version}" + $pgsql_user = "youri${version}" $pgsql_password = extlookup('youri_pgsql','x') - file { "$config": - ensure => present, - owner => $base::user, - mode => 640, - content => template("youri-check/$version.conf"), - } + postgresql::remote_user { $pgsql_user: + password => $base::pgsql_password, + } + + postgresql::remote_database { $pgsql_db: + description => "Youri Check results", + user => $pgsql_user, + } } define check($version, $hour = "*", $minute = 0) { - include youri-check::base - $config = "/etc/youri/$version.conf" - $pgsql_server = $base::pgsql_server - $pgsql_db = "youri_check_$version" - $pgsql_user = "youri$version" - $pgsql_password = extlookup('youri_pgsql','x') + include youri-check::base + $config = "/etc/youri/${version}.conf" + $pgsql_server = $base::pgsql_server + $pgsql_db = "youri_check_${version}" + $pgsql_user = "youri${version}" + $pgsql_password = extlookup('youri_pgsql','x') postgresql::remote_user { $pgsql_user: password => $base::pgsql_password, @@ -53,42 +83,51 @@ class youri-check { postgresql::remote_database { $pgsql_db: description => "Youri Check results", - user => $pgsql_user, + user => $pgsql_user, } - cron { "check_$version": - command => "youri-check -c $config test", - hour => $hour, - minute => $minute, - user => $base::user, - environment => "MAILTO=root", + cron { "check_${version}": + command => "youri-check -c ${config} --parallel test", + hour => $hour, + minute => $minute, + user => $base::user, + environment => "MAILTO=root", + require => User[$base::user], } } define report_www { include youri-check::base - $outdir = "/var/www/youri-check/" - apache::vhost_simple { $base::vhost: + $outdir = "/var/www/youri-check/" + apache::vhost::base { $base::vhost: + location => $outdir, + content => template('youri-check/vhost_check.conf'), + } + apache::vhost::base { "ssl_${base::vhost}": + vhost => $base::vhost, + use_ssl => true, location => $outdir, + content => template('youri-check/vhost_check.conf'), } } define report($version, $hour = "*", $minute = 20) { include youri-check::base - $config = "/etc/youri/$version.conf" + $config = "/etc/youri/${version}.conf" - $outdir = "/var/www/youri-check/$version" - file { "$outdir": + $outdir = "/var/www/youri-check/${version}" + file { "${outdir}": ensure => directory, - owner => $base::user, - mode => 755, + owner => $base::user, + mode => '0755', } - cron { "check_$version": - command => "youri-check -c $config report", - hour => $hour, - minute => $minute, - user => $base::user, + cron { "check_${version}": + command => "youri-check -c ${config} report", + hour => $hour, + minute => $minute, + user => $base::user, + require => User[$base::user], } } } diff --git a/modules/youri-check/templates/1.conf b/modules/youri-check/templates/9.conf index ebbc145a..28028080 100644 --- a/modules/youri-check/templates/1.conf +++ b/modules/youri-check/templates/9.conf @@ -1,7 +1,7 @@ # vim:ft=yaml:et:sw=4 # helper variables -mirror: /distrib/mageia/distrib/1 +mirror: http://repository.mageia.org/distrib/9 mirror_i586: ${mirror}/i586/media mirror_x86_64: ${mirror}/x86_64/media @@ -18,7 +18,7 @@ resultset: resolver: class: Youri::Check::Maintainer::Resolver::CGI options: - url: http://pkgsubmit.<%= domain %>/data/maintdb.txt + url: https://pkgsubmit.<%= domain %>/data/maintdb.txt exceptions: - nobody @@ -31,43 +31,6 @@ tests: missing: class: Youri::Check::Test::Missing - updates_mandriva_2010_2: - class: Youri::Check::Test::Updates - options: - aliases: - # Only add exceptions here after making sure that the package has an Epoch - basesystem: ~ - bash-completion: ~ - sources: - mandriva: - class: Youri::Check::Test::Updates::Source::Media::Mandriva - options: - medias: - main.sources: - class: Youri::Media::URPM - options: - name: main - type: source - hdlist: http://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/2010.2/SRPMS/main/release/media_info/hdlist.cz - mainupdates.sources: - class: Youri::Media::URPM - options: - name: main-updates - type: source - hdlist: http://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/2010.2/SRPMS/main/updates/media_info/hdlist.cz - contrib.sources: - class: Youri::Media::URPM - options: - name: contrib - type: source - hdlist: http://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/2010.2/SRPMS/contrib/release/media_info/hdlist.cz - contribupdates.sources: - class: Youri::Media::URPM - options: - name: contrib-updates - type: source - hdlist: http://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/official/2010.2/SRPMS/contrib/updates/media_info/hdlist.cz - # reports definitions reports: file: @@ -91,7 +54,6 @@ medias: options: name: core type: binary - path: ${mirror_i586}/core hdlist: ${mirror_i586}/media_info/hdlist_core.cz options: dependencies: @@ -101,12 +63,45 @@ medias: 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 - path: ${mirror_x86_64}/core hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz options: dependencies: @@ -117,13 +112,50 @@ medias: 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 - path: ${mirror_i586}/core hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz options: dependencies: @@ -131,12 +163,41 @@ medias: - 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 - path: ${mirror_i586}/nonfree/release hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz options: dependencies: @@ -152,7 +213,6 @@ medias: options: name: nonfree type: binary - path: ${mirror_x86_64}/nonfree/release hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz options: dependencies: @@ -171,7 +231,6 @@ medias: options: name: nonfree type: source - path: ${mirror_i586}/nonfree/release hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz options: dependencies: @@ -180,4 +239,3 @@ medias: - nonfree.x86_64 - core.i586 - nonfree.i586 - diff --git a/modules/youri-check/templates/cauldron.conf b/modules/youri-check/templates/cauldron.conf index 49c7d8e6..aeace447 100644 --- a/modules/youri-check/templates/cauldron.conf +++ b/modules/youri-check/templates/cauldron.conf @@ -1,8 +1,10 @@ # vim:ft=yaml:et:sw=4 # helper variables -mirror: /distrib/mageia/distrib/cauldron -mirror_i586: ${mirror}/i586/media +mirror: http://repository.mageia.org/distrib/cauldron +mirror_aarch64: ${mirror}/aarch64/media +mirror_armv7hl: ${mirror}/armv7hl/media +mirror_i686: ${mirror}/i686/media mirror_x86_64: ${mirror}/x86_64/media # resultset definition @@ -18,7 +20,7 @@ resultset: resolver: class: Youri::Check::Maintainer::Resolver::CGI options: - url: http://pkgsubmit.<%= domain %>/data/maintdb.txt + url: https://pkgsubmit.<%= domain %>/data/maintdb.txt exceptions: - nobody @@ -35,6 +37,13 @@ tests: class: Youri::Check::Test::Updates options: aliases: + basesystem: ~ + drakxtools: ~ + drakx-installer-advertising: ~ + drakx-installer-binaries: ~ + drakx-installer-images: ~ + drakx-installer-rescue: ~ + drakx-installer-stage2: ~ horde-accounts: accounts horde-chora: chora horde-forwards: forwards @@ -46,17 +55,26 @@ tests: horde-passwd: passwd horde-turba: turba horde-vacation: vacation - freetype2: freetype - freetype: freetype1 + freetype: freetype2 gstreamer: ~ gstreamer0.10: gstreamer gnupg2: gnupg gnupg: ~ gnome-vfs2: gnome-vfs gnome-vfs: ~ - basesystem: ~ + ldetect: ~ + ldetect-lst: ~ + libutempter: utempter + perl-URPM: ~ + rpm: ~ + rpmdrake: ~ + rpmstats: ~ + rpmtools: ~ + urpmi: ~ vte: ~ vte3: vte + xine-lib: xine-lib1.2 + xine-lib-1.2: xine-lib1.2 sources: cpan: order: 0 @@ -67,30 +85,10 @@ tests: perl-Catalyst-P-S-State-Cookie: Catalyst::Plugin::State::State::Cookie perl-Catalyst-P-S-Store-FastMmap: Catalyst::Plugin::State::Store::FastMmap perl-Catalyst-P-S-Store-File: Catalyst::Plugin::State::Store::File - mandriva: - class: Youri::Check::Test::Updates::Source::Media::Mandriva + gettext: ~ + pear: order: 0 - options: - aliases: - basesystem: ~ - drakxtools: ~ - drakx-installer-advertising: ~ - drakx-installer-binaries: ~ - drakx-installer-images: ~ - drakx-installer-rescue: ~ - drakx-installer-stage2: ~ - enigma: enigma-freeoxyd - ldetect: ~ - ldetect-lst: ~ - perl-URPM: ~ - rpm: ~ - rpmdrake: ~ - rpmstats: ~ - rpmtools: ~ - urpmi: ~ -# pear: -# order: 0 -# class: Youri::Check::Test::Updates::Source::PEAR + class: Youri::Check::Test::Updates::Source::PEAR # pypi: # order: 0 # class: Youri::Check::Test::Updates::Source::PyPI @@ -114,67 +112,37 @@ tests: openldap2.3: ~ git: git-core nilfs-utils: nilfs-tools + mobile-broadband-provider-info: ~ + cpulimit: ~ + icecream: ~ + colorize: ~ fedora: order: 1 class: Youri::Check::Test::Updates::Source::Fedora options: - url: http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/source/SRPMS/ aliases: authd: ~ + basesystem: ~ + bash: ~ + freetype: ~ + freetype2: freetype gle: ~ gtksourceview-sharp: ~ - sqlite: sqlite2 - OpenIPMI: OpenIPMI2 + modemmanager: ModemManager + netcat-openbsd: netcat + networkmanager: NetworkManager + networkmanager-applet: network-manager-applet + networkmanager-fortisslvpn: NetworkManager-fortisslvpn + networkmanager-l2tp: NetworkManager-l2tp + networkmanager-libreswan: NetworkManager-libreswan + networkmanager-openconnect: NetworkManager-openconnect + networkmanager-openvpn: NetworkManager-openvpn + networkmanager-pptp: NetworkManager-pptp + networkmanager-vpnc: NetworkManager-vpnc ocaml-lablgtk: ~ ocaml-lablgtk2: ocaml-lablgtk - netcat-openbsd: netcat - freetype: ~ - freetype2: freetype - bash: ~ -# freshmeat: -# order: 1 -# class: Youri::Check::Test::Updates::Source::Freshmeat -# options: -# preload: 1 -# aliases: -# photon: ~ -# cmt: ~ -# boo: ~ -# db2: ~ -# dsh: ~ -# torque: ~ -# mserver: ~ -# svl: ~ -# lam: lammpi -# bazaar: baz -# db4: berkeleydb -# pcp: caltech-pcp -# kamikaze: ~ -# nut: ~ -# sqlite3: sqlite -# sqlite: ~ -# ruby-evas: ~ -# acl: ~ -# listen: ~ -# knob: ~ -# dolphin: ~ -# cheese: ~ -# dumb: ~ -# serpentine: ~ -# mms: ~ -# tasks: ~ -# xsp: ~ -# pd: ~ -# deluge: deluge-torrent -# contacts: ~ -# rt: requesttracker -# psi: psijabberclient -# arena: ~ -# ccp: ~ -# ocaml-camlpdf: camlpdf -# libxml: ~ -# glib: ~ - + OpenIPMI: OpenIPMI2 + sqlite: sqlite2 gentoo: order: 1 class: Youri::Check::Test::Updates::Source::Gentoo @@ -194,82 +162,105 @@ tests: unclutter: ~ pam-krb5: pam_krb5 pam_krb5: ~ - freetype: ~ akonadi: akonadi-server attica: libattica raptor2: raptor raptor: ~ + libevent: ~ + wifi-radar: ~ + tuxmathscrabble: ~ + chromium: ~ + cpulimit: ~ + icecream: ~ + nodejs: ~ gnome: order: 1 class: Youri::Check::Test::Updates::Source::GNOME options: + url: https://download.gnome.org/sources/ aliases: + acme: ~ GConf: ~ GConf2: GConf + gcr: ~ + gcr4: gcr + gdk-pixbuf2.0: gdk-pixbuf glib: ~ glib2.0: glib - glibmm: ~ - glibmm2.4: glibmm - gnome-desktop: ~ - gnome-desktop3: gnome-desktop - goocanvas: ~ - goocanvas2: goocanvas - gtkhtml: ~ - gtkhtml4: gtkhtml + glibmm2.4: ~ + goocanvas2: ~ + gtkmm-documentation3.0: ~ + gtkmm: ~ + gtkmm2.4: ~ + gtkmm3.0: ~ + gtkmm4.0: gtkmm + gtksourceviewmm3.0: ~ gtk: ~ gtk+2.0: ~ - gtk+3.0: gtk - libgda: ~ - libgda4.0: ~ - libgda5.0: libgda - libunique: ~ - libunique3: libunique - libwnck: ~ - libwnck3: libwnck - vte: ~ - vte3: vte + gtk+3.0: ~ + gtk4.0: gtk + modemmanager: ModemManager + networkmanager: NetworkManager + networkmanager-applet: network-manager-applet + networkmanager-fortisslvpn: NetworkManager-fortisslvpn + networkmanager-l2tp: NetworkManager-l2tp + networkmanager-libreswan: NetworkManager-libreswan + networkmanager-openconnect: NetworkManager-openconnect + networkmanager-openvpn: NetworkManager-openvpn + networkmanager-pptp: NetworkManager-pptp + networkmanager-vpnc: NetworkManager-vpnc + notify-sharp: ~ + notify-sharp3: notify-sharp + pango: ~ + pango2.0: pango netbsd: order: 1 class: Youri::Check::Test::Updates::Source::NetBSD - sourceforge: - class: Youri::Check::Test::Updates::Source::Sourceforge - options: - aliases: - bigforth: ~ - gtkmm: ~ - hydrogen: ~ - ltp: ~ - pblogan: ~ - console-tools: ~ - maxima: ~ - clisp: ~ +# sourceforge: +# class: Youri::Check::Test::Updates::Source::Sourceforge +# options: +# aliases: +# bigforth: ~ +# gtkmm: ~ +# hydrogen: ~ +# ltp: ~ +# pblogan: ~ +# console-tools: ~ +# maxima: ~ +# clisp: ~ - updates_fedora: + updates_fedora: class: Youri::Check::Test::Updates options: - aliases: - basesystem: ~ - rpm: ~ sources: fedora: order: 1 class: Youri::Check::Test::Updates::Source::Fedora options: - url: http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/source/SRPMS/ aliases: authd: ~ + basesystem: ~ + bash: ~ + freetype: ~ + freetype2: freetype gle: ~ gtksourceview-sharp: ~ - sqlite: sqlite2 - OpenIPMI: OpenIPMI2 + modemmanager: ModemManager + netcat-openbsd: netcat + networkmanager: NetworkManager + networkmanager-applet: network-manager-applet + networkmanager-fortisslvpn: NetworkManager-fortisslvpn + networkmanager-l2tp: NetworkManager-l2tp + networkmanager-libreswan: NetworkManager-libreswan + networkmanager-openconnect: NetworkManager-openconnect + networkmanager-openvpn: NetworkManager-openvpn + networkmanager-pptp: NetworkManager-pptp + networkmanager-vpnc: NetworkManager-vpnc ocaml-lablgtk: ~ ocaml-lablgtk2: ocaml-lablgtk - netcat-openbsd: netcat - freetype: ~ - freetype2: freetype - bash: ~ - - updates_gnome: + OpenIPMI: OpenIPMI2 + sqlite: sqlite2 + updates_gnome: class: Youri::Check::Test::Updates options: sources: @@ -277,55 +268,59 @@ tests: order: 1 class: Youri::Check::Test::Updates::Source::GNOME options: + url: https://download.gnome.org/sources/ aliases: + acme: ~ GConf: ~ GConf2: GConf + gcr: ~ + gcr4: gcr + gdk-pixbuf2.0: gdk-pixbuf glib: ~ glib2.0: glib - glibmm: ~ - glibmm2.4: glibmm - gnome-desktop: ~ - gnome-desktop3: gnome-desktop - goocanvas: ~ - goocanvas2: goocanvas - gtkhtml: ~ - gtkhtml4: gtkhtml + glibmm2.4: ~ + goocanvas2: ~ + gtkmm-documentation3.0: ~ + gtkmm: ~ + gtkmm2.4: ~ + gtkmm3.0: ~ + gtkmm4.0: gtkmm + gtksourceviewmm3.0: ~ gtk: ~ gtk+2.0: ~ - gtk+3.0: gtk - libgda: ~ - libgda4.0: ~ - libgda5.0: libgda - libunique: ~ - libunique3: libunique - libwnck: ~ - libwnck3: libwnck - vte: ~ - vte3: vte - updates_mandriva: - class: Youri::Check::Test::Updates + gtk+3.0: ~ + gtk4.0: gtk + modemmanager: ModemManager + networkmanager: NetworkManager + networkmanager-applet: network-manager-applet + networkmanager-fortisslvpn: NetworkManager-fortisslvpn + networkmanager-l2tp: NetworkManager-l2tp + networkmanager-libreswan: NetworkManager-libreswan + networkmanager-openconnect: NetworkManager-openconnect + networkmanager-openvpn: NetworkManager-openvpn + networkmanager-pptp: NetworkManager-pptp + networkmanager-vpnc: NetworkManager-vpnc + notify-sharp: ~ + notify-sharp3: notify-sharp + pango: ~ + pango2.0: pango + build: + class: Youri::Check::Test::Build options: sources: - mandriva: - class: Youri::Check::Test::Updates::Source::Media::Mandriva + iurt: + class: Youri::Check::Test::Build::Source::Iurt options: - aliases: - basesystem: ~ - drakxtools: ~ - drakx-installer-advertising: ~ - drakx-installer-binaries: ~ - drakx-installer-images: ~ - drakx-installer-rescue: ~ - drakx-installer-stage2: ~ - enigma: enigma-freeoxyd - ldetect: ~ - ldetect-lst: ~ - perl-URPM: ~ - rpm: ~ - rpmdrake: ~ - rpmstats: ~ - rpmtools: ~ - urpmi: ~ + url: https://pkgsubmit.mageia.org/autobuild/cauldron + arches: + - x86_64 + medias: + - core + age: + class: Youri::Check::Test::Age + options: + max: <%= max_days %> days + pattern: "%d days" # reports definitions reports: @@ -345,17 +340,44 @@ reports: # media definitions medias: - core.i586: + core.aarch64: class: Youri::Media::URPM options: name: core type: binary - path: ${mirror_i586}/core - hdlist: ${mirror_i586}/media_info/hdlist_core.cz + hdlist: ${mirror_aarch64}/core/release/media_info/hdlist.cz options: dependencies: allowed: - - core.i586 + - core.aarch64 + missing: + allowed: + - core.sources + + core.armv7hl: + class: Youri::Media::URPM + options: + name: core + type: binary + hdlist: ${mirror_armv7hl}/core/release/media_info/hdlist.cz + options: + dependencies: + allowed: + - core.armv7hl + missing: + allowed: + - core.sources + + core.i686: + class: Youri::Media::URPM + options: + name: core + type: binary + hdlist: ${mirror_i686}/media_info/hdlist_core.cz + options: + dependencies: + allowed: + - core.i686 missing: allowed: - core.sources @@ -365,13 +387,12 @@ medias: options: name: core type: binary - path: ${mirror_x86_64}/core hdlist: ${mirror_x86_64}/media_info/hdlist_core.cz options: dependencies: allowed: - core.x86_64 - - core.i586 + - core.i686 missing: allowed: - core.sources @@ -382,26 +403,24 @@ medias: options: name: core type: source - path: ${mirror_i586}/core - hdlist: ${mirror_i586}/media_info/hdlist_core.src.cz + hdlist: ${mirror_i686}/media_info/hdlist_core.src.cz options: dependencies: allowed: - core.x86_64 - - core.i586 + - core.i686 - nonfree.i586: + nonfree.i686: class: Youri::Media::URPM options: name: nonfree type: binary - path: ${mirror_i586}/nonfree/release - hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.cz + hdlist: ${mirror_i686}/media_info/hdlist_nonfree_release.cz options: dependencies: allowed: - - core.i586 - - nonfree.i586 + - core.i686 + - nonfree.i686 missing: allowed: - nonfree.sources @@ -411,15 +430,14 @@ medias: options: name: nonfree type: binary - path: ${mirror_x86_64}/nonfree/release hdlist: ${mirror_x86_64}/media_info/hdlist_nonfree_release.cz options: dependencies: allowed: - core.x86_64 - - core.i586 + - core.i686 - nonfree.x86_64 - - nonfree.i586 + - nonfree.i686 missing: allowed: - nonfree.sources @@ -430,13 +448,57 @@ medias: options: name: nonfree type: source - path: ${mirror_i586}/nonfree/release - hdlist: ${mirror_i586}/media_info/hdlist_nonfree_release.src.cz + hdlist: ${mirror_i686}/media_info/hdlist_nonfree_release.src.cz options: dependencies: allowed: - core.x86_64 - nonfree.x86_64 - - core.i586 - - nonfree.i586 + - core.i686 + - nonfree.i686 + + tainted.i686: + class: Youri::Media::URPM + options: + name: nonfree + type: binary + hdlist: ${mirror_i686}/media_info/hdlist_tainted_release.cz + options: + dependencies: + allowed: + - core.i686 + - tainted.i686 + missing: + allowed: + - tainted.sources + tainted.x86_64: + class: Youri::Media::URPM + options: + name: tainted + type: binary + hdlist: ${mirror_x86_64}/media_info/hdlist_tainted_release.cz + options: + dependencies: + allowed: + - core.x86_64 + - core.i686 + - tainted.x86_64 + - tainted.i686 + missing: + allowed: + - tainted.sources + + tainted.sources: + class: Youri::Media::URPM + options: + name: tainted + type: source + hdlist: ${mirror_i686}/media_info/hdlist_tainted_release.src.cz + options: + dependencies: + allowed: + - core.x86_64 + - tainted.x86_64 + - core.i686 + - tainted.i686 diff --git a/modules/youri-check/templates/vhost_check.conf b/modules/youri-check/templates/vhost_check.conf new file mode 100644 index 00000000..2cf598b5 --- /dev/null +++ b/modules/youri-check/templates/vhost_check.conf @@ -0,0 +1,2 @@ +Header set Access-Control-Allow-Origin "http://pkgsubmit.<%= domain %>" +Header set Access-Control-Allow-Origin "https://pkgsubmit.<%= domain %>" env=HTTPS |