diff options
Diffstat (limited to 'modules/buildsystem/manifests/var')
-rw-r--r-- | modules/buildsystem/manifests/var/binrepo.pp | 4 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/maintdb.pp | 2 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/scheduler.pp | 4 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/signbot.pp | 4 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/youri.pp | 564 |
5 files changed, 289 insertions, 289 deletions
diff --git a/modules/buildsystem/manifests/var/binrepo.pp b/modules/buildsystem/manifests/var/binrepo.pp index 0b9c0f35..1431ed25 100644 --- a/modules/buildsystem/manifests/var/binrepo.pp +++ b/modules/buildsystem/manifests/var/binrepo.pp @@ -9,7 +9,7 @@ class buildsystem::var::binrepo( $uploadmail_from, $uploadmail_to ) { - $repodir = "$homedir/data" - $uploadinfosdir = "$homedir/infos" + $repodir = "${homedir}/data" + $uploadinfosdir = "${homedir}/infos" $uploadbinpath = '/usr/local/bin/upload-bin' } diff --git a/modules/buildsystem/manifests/var/maintdb.pp b/modules/buildsystem/manifests/var/maintdb.pp index 537489af..0c3562a1 100644 --- a/modules/buildsystem/manifests/var/maintdb.pp +++ b/modules/buildsystem/manifests/var/maintdb.pp @@ -4,7 +4,7 @@ class buildsystem::var::maintdb( $homedir = '/var/lib/maintdb' ) { include buildsystem::var::webstatus - $dbdir = "$homedir/db" + $dbdir = "${homedir}/db" $binpath = '/usr/local/sbin/maintdb' $dump = "${buildsystem::var::webstatus::location}/data/maintdb.txt" $unmaintained = "${buildsystem::var::webstatus::location}/data/unmaintained.txt" diff --git a/modules/buildsystem/manifests/var/scheduler.pp b/modules/buildsystem/manifests/var/scheduler.pp index a30e4f71..4212021f 100644 --- a/modules/buildsystem/manifests/var/scheduler.pp +++ b/modules/buildsystem/manifests/var/scheduler.pp @@ -23,6 +23,6 @@ class buildsystem::var::scheduler( $clean_uploads_logs_age = '2w' ){ $login = 'schedbot' - $homedir = "/var/lib/$login" - $logdir = "/var/log/$login" + $homedir = "/var/lib/${login}" + $logdir = "/var/log/${login}" } diff --git a/modules/buildsystem/manifests/var/signbot.pp b/modules/buildsystem/manifests/var/signbot.pp index b96a5ae1..7d92a324 100644 --- a/modules/buildsystem/manifests/var/signbot.pp +++ b/modules/buildsystem/manifests/var/signbot.pp @@ -10,6 +10,6 @@ class buildsystem::var::signbot( $keyname ) { $login = 'signbot' - $home_dir = "/var/lib/$login" - $sign_keydir = "$home_dir/keys" + $home_dir = "/var/lib/${login}" + $sign_keydir = "${home_dir}/keys" } diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp index a4233309..f1c4a2c5 100644 --- a/modules/buildsystem/manifests/var/youri.pp +++ b/modules/buildsystem/manifests/var/youri.pp @@ -14,7 +14,7 @@ # Each of those variables contain the configuration for youri submit-todo # (in index 'todo') and youri submit-upload (in index 'upload') # -# +# # Parameters : # $tmpl_youri_upload_conf: # template file for youri submi-upload.conf @@ -41,295 +41,295 @@ class buildsystem::var::youri( $check_recency = { 'class' => 'Youri::Submit::Check::Recency', } $check_queue_recency = { 'class' => 'Youri::Submit::Check::Queue_recency', } $check_host = { - 'class' => 'Youri::Submit::Check::Host', - 'options' => { - 'host_file' => '/etc/youri/host.conf', - }, + 'class' => 'Youri::Submit::Check::Host', + 'options' => { + 'host_file' => '/etc/youri/host.conf', + }, } $check_rpmlint = { 'class' => 'Youri::Submit::Check::Rpmlint', } $check_acl = { - 'class' => 'Youri::Submit::Check::ACL', - 'options' => { - 'acl_file' => '/etc/youri/acl.conf', - }, + 'class' => 'Youri::Submit::Check::ACL', + 'options' => { + 'acl_file' => '/etc/youri/acl.conf', + }, } $check_source = { 'class' => 'Youri::Submit::Check::Source', } $check_version = { - 'class' => 'Youri::Submit::Check::Version', - 'options' => {}, + 'class' => 'Youri::Submit::Check::Version', + 'options' => {}, } $youri_conf_default = { - 'upload' => { - 'repository' => { - 'class' => 'Youri::Repository::Mageia', - 'options' => { - 'install_root' => $buildsystem::var::repository::bootstrap_reporoot, - 'upload_root' => '${home}/uploads/', - 'archive_root' => $packages_archivedir, - 'upload_state' => 'queue', - 'queue' => 'queue', - 'noarch' => 'i586', - 'svn' => "${buildsystem::var::mgarepo::svn_root_packages_ssh}/${buildsystem::var::distros::default_distro}", - }, - }, - 'checks' => { - 'tag' => $check_tag, - 'recency' => $check_recency, - 'queue_recency' => $check_queue_recency, - 'host' => $check_host, - 'section' => { - 'class' => 'Youri::Submit::Check::Section', - }, - 'rpmlint' => $check_rpmlint, - 'svn' => { - 'class' => 'Youri::Submit::Check::SVN', - }, - 'acl' => $check_acl, - 'history' => { - 'class' => 'Youri::Submit::Check::History', - }, - 'source' => $check_source, - 'precedence' => { - 'class' => 'Youri::Submit::Check::Precedence', - 'options' => { - 'target' => $buildsystem::var::distros::default_distro, - }, - }, - 'version' => $check_version, - }, - 'actions' => { - 'install' => { - 'class' => 'Youri::Submit::Action::Install', - }, - 'markrelease' => { - 'class' => 'Youri::Submit::Action::Markrelease', - }, - 'link' => { - 'class' => 'Youri::Submit::Action::Link', - }, - 'archive' => { - 'class' => 'Youri::Submit::Action::Archive', - }, - 'clean' => { - 'class' => 'Youri::Submit::Action::Clean', - }, - 'sign' => { - 'class' => 'Youri::Submit::Action::Sign', - 'options' => { - 'signuser' => $buildsystem::var::signbot::login, - 'path' => $buildsystem::var::signbot::sign_keydir, - 'name' => $buildsystem::var::signbot::keyid, - 'signscript' => '/usr/local/bin/sign-check-package', - }, - }, - 'unpack_gfxboot_theme' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'mageia-gfxboot-theme', - 'source_subdir' => '/usr/share/gfxboot/themes/Mageia/install/', - 'dest_directory' => 'isolinux', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_meta_task' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'meta-task', - 'source_subdir' => '/usr/share/meta-task', - 'dest_directory' => 'media/media_info', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_installer_images' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'drakx-installer-images', - 'source_subdir' => '/usr/lib*/drakx-installer-images', - 'dest_directory' => '.', - 'preclean_directory' => 'install/images/alternatives', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_installer_images_nonfree' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'drakx-installer-images-nonfree', - 'source_subdir' => '/usr/lib*/drakx-installer-images', - 'dest_directory' => '.', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_installer_stage2' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'drakx-installer-stage2', - 'source_subdir' => '/usr/lib*/drakx-installer-stage2', - 'dest_directory' => '.', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_installer_advertising' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'drakx-installer-advertising', - 'source_subdir' => '/usr/share/drakx-installer-advertising', - 'dest_directory' => '.', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_installer_rescue' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'drakx-installer-rescue', - 'source_subdir' => '/usr/lib*/drakx-installer-rescue', - 'dest_directory' => 'install/stage2', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_release_notes' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'mageia-release-common', - 'source_subdir' => '/usr/share/doc/mageia-release-common', - 'grep_files' => 'release-notes.*', - 'dest_directory' => '.', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_syslinux' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'syslinux', - 'source_subdir' => '/usr/lib/syslinux/', - 'grep_files' => '\\(hdt\\|ifcpu\\|ldlinux\\|libcom32\\|libgpl\\|libmenu\\|libutil\\).c32', - 'dest_directory' => 'isolinux', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'unpack_pci_usb_ids' => { - 'class' => 'Youri::Submit::Action::Unpack', - 'options' => { - 'name' => 'ldetect-lst', - 'source_subdir' => '/usr/share/', - 'grep_files' => '\\(pci\\|usb\\).ids', - 'dest_directory' => 'isolinux', - 'unpack_inside_distribution_root' => '1', - }, - }, - 'mail' => { - 'class' => 'Youri::Submit::Action::Mail', - 'options' => { - 'mta' => '/usr/sbin/sendmail', - }, - }, - 'maintdb' => { - 'class' => 'Youri::Submit::Action::UpdateMaintDb', - }, - 'rebuild' => { - 'class' => 'Youri::Submit::Action::RebuildPackage', - 'options' => { - 'rules' => { - 'drakx-installer-binaries' => ['drakx-installer-images'], - 'drakx-kbd-mouse-x11' => ['drakx-installer-stage2'], - 'drakx-net' => ['drakx-installer-stage2'], - 'kernel-desktop-latest' => ['drakx-installer-images', 'kmod-virtualbox', 'kmod-xtables-addons'], - 'kernel-desktop586-latest' => ['drakx-installer-images', 'kmod-virtualbox', 'kmod-xtables-addons'], - 'kernel-server-latest' => ['kmod-virtualbox', 'kmod-xtables-addons'], - 'ldetect-lst' => ['drakx-installer-stage2'], - 'meta-task' => ['drakx-installer-stage2'], - 'perl' => ['drakx-installer-stage2'], - 'perl-URPM' => ['drakx-installer-stage2'], - 'rpm' => ['drakx-installer-stage2'], - 'rpm-mageia-setup' => ['drakx-installer-stage2'], - 'urpmi' => ['drakx-installer-stage2'], - }, - }, - }, - }, - 'posts' => { - 'genhdlist2' => { - 'class' => 'Youri::Submit::Post::Genhdlist2', - 'options' => { - 'command' => '/usr/bin/genhdlist2 --xml-info-filter ".lzma:lzma -7"', - }, - }, - 'clean_rpmsrate' => { - 'class' => 'Youri::Submit::Post::CleanRpmsrate', - }, - 'mirror' => { - 'class' => 'Youri::Submit::Post::Mirror', - 'options' => { - 'destination' => $buildsystem::var::repository::mirror_reporoot, - }, - }, - }, - }, - 'todo' => { - 'repository' => { - 'class' => 'Youri::Repository::Mageia', - 'options' => { - 'install_root' => $buildsystem::var::repository::bootstrap_reporoot, - 'upload_root' => '${home}/uploads/', - 'upload_state' => 'todo done queue', - 'queue' => 'todo', - 'noarch' => 'i586', - 'svn' => "${buildsystem::var::mgarepo::svn_root_packages_ssh}/${buildsystem::var::distros::default_distro}", - }, - }, - 'checks' => { - 'tag' => $check_tag, - 'recency' => $check_recency, - 'queue_recency' => $check_queue_recency, - 'host' => $check_host, - 'rpmlint' => $check_rpmlint, - 'acl' => $check_acl, - 'source' => $check_source, - 'version' => $check_version, - 'deps' => { - 'class' => 'Youri::Submit::Check::Deps', - }, - }, - 'actions' => { - 'send' => { - 'class' => 'Youri::Submit::Action::Send', - 'options' => { - 'user' => $buildsystem::var::scheduler::login, - 'keep_svn_release' => 'yes', - 'uphost' => $buildsystem::var::scheduler::pkg_uphost, - 'root' => '${home}/uploads', - 'ssh_key' => '${home}/.ssh/id_rsa', - }, - }, - 'dependencies' => { - 'class' => 'Youri::Submit::Action::Dependencies', - 'options' => { - 'user' => $buildsystem::var::scheduler::login, - 'uphost' => $buildsystem::var::scheduler::pkg_uphost, - 'root' => '${home}/uploads', - 'ssh_key' => '${home}/.ssh/id_rsa', - }, - }, - 'rpminfo' => { - 'class' => 'Youri::Submit::Action::Rpminfo', - 'options' => { - 'user' => $buildsystem::var::scheduler::login, - 'uphost' => $buildsystem::var::scheduler::pkg_uphost, - 'root' => '${home}/uploads', - 'ssh_key' => '${home}/.ssh/id_rsa', - }, - }, - 'ulri' => { - 'class' => 'Youri::Submit::Action::Ulri', - 'options' => { - 'user' => $buildsystem::var::scheduler::login, - 'uphost' => $buildsystem::var::scheduler::pkg_uphost, - 'ssh_key' => '${home}/.ssh/id_rsa', - }, - }, - }, - 'posts' => { - }, - }, + 'upload' => { + 'repository' => { + 'class' => 'Youri::Repository::Mageia', + 'options' => { + 'install_root' => $buildsystem::var::repository::bootstrap_reporoot, + 'upload_root' => '${home}/uploads/', + 'archive_root' => $packages_archivedir, + 'upload_state' => 'queue', + 'queue' => 'queue', + 'noarch' => 'i586', + 'svn' => "${buildsystem::var::mgarepo::svn_root_packages_ssh}/${buildsystem::var::distros::default_distro}", + }, + }, + 'checks' => { + 'tag' => $check_tag, + 'recency' => $check_recency, + 'queue_recency' => $check_queue_recency, + 'host' => $check_host, + 'section' => { + 'class' => 'Youri::Submit::Check::Section', + }, + 'rpmlint' => $check_rpmlint, + 'svn' => { + 'class' => 'Youri::Submit::Check::SVN', + }, + 'acl' => $check_acl, + 'history' => { + 'class' => 'Youri::Submit::Check::History', + }, + 'source' => $check_source, + 'precedence' => { + 'class' => 'Youri::Submit::Check::Precedence', + 'options' => { + 'target' => $buildsystem::var::distros::default_distro, + }, + }, + 'version' => $check_version, + }, + 'actions' => { + 'install' => { + 'class' => 'Youri::Submit::Action::Install', + }, + 'markrelease' => { + 'class' => 'Youri::Submit::Action::Markrelease', + }, + 'link' => { + 'class' => 'Youri::Submit::Action::Link', + }, + 'archive' => { + 'class' => 'Youri::Submit::Action::Archive', + }, + 'clean' => { + 'class' => 'Youri::Submit::Action::Clean', + }, + 'sign' => { + 'class' => 'Youri::Submit::Action::Sign', + 'options' => { + 'signuser' => $buildsystem::var::signbot::login, + 'path' => $buildsystem::var::signbot::sign_keydir, + 'name' => $buildsystem::var::signbot::keyid, + 'signscript' => '/usr/local/bin/sign-check-package', + }, + }, + 'unpack_gfxboot_theme' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'mageia-gfxboot-theme', + 'source_subdir' => '/usr/share/gfxboot/themes/Mageia/install/', + 'dest_directory' => 'isolinux', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_meta_task' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'meta-task', + 'source_subdir' => '/usr/share/meta-task', + 'dest_directory' => 'media/media_info', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_installer_images' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'drakx-installer-images', + 'source_subdir' => '/usr/lib*/drakx-installer-images', + 'dest_directory' => '.', + 'preclean_directory' => 'install/images/alternatives', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_installer_images_nonfree' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'drakx-installer-images-nonfree', + 'source_subdir' => '/usr/lib*/drakx-installer-images', + 'dest_directory' => '.', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_installer_stage2' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'drakx-installer-stage2', + 'source_subdir' => '/usr/lib*/drakx-installer-stage2', + 'dest_directory' => '.', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_installer_advertising' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'drakx-installer-advertising', + 'source_subdir' => '/usr/share/drakx-installer-advertising', + 'dest_directory' => '.', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_installer_rescue' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'drakx-installer-rescue', + 'source_subdir' => '/usr/lib*/drakx-installer-rescue', + 'dest_directory' => 'install/stage2', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_release_notes' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'mageia-release-common', + 'source_subdir' => '/usr/share/doc/mageia-release-common', + 'grep_files' => 'release-notes.*', + 'dest_directory' => '.', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_syslinux' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'syslinux', + 'source_subdir' => '/usr/lib/syslinux/', + 'grep_files' => '\\(hdt\\|ifcpu\\|ldlinux\\|libcom32\\|libgpl\\|libmenu\\|libutil\\).c32', + 'dest_directory' => 'isolinux', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'unpack_pci_usb_ids' => { + 'class' => 'Youri::Submit::Action::Unpack', + 'options' => { + 'name' => 'ldetect-lst', + 'source_subdir' => '/usr/share/', + 'grep_files' => '\\(pci\\|usb\\).ids', + 'dest_directory' => 'isolinux', + 'unpack_inside_distribution_root' => '1', + }, + }, + 'mail' => { + 'class' => 'Youri::Submit::Action::Mail', + 'options' => { + 'mta' => '/usr/sbin/sendmail', + }, + }, + 'maintdb' => { + 'class' => 'Youri::Submit::Action::UpdateMaintDb', + }, + 'rebuild' => { + 'class' => 'Youri::Submit::Action::RebuildPackage', + 'options' => { + 'rules' => { + 'drakx-installer-binaries' => ['drakx-installer-images'], + 'drakx-kbd-mouse-x11' => ['drakx-installer-stage2'], + 'drakx-net' => ['drakx-installer-stage2'], + 'kernel-desktop-latest' => ['drakx-installer-images', 'kmod-virtualbox', 'kmod-xtables-addons'], + 'kernel-desktop586-latest' => ['drakx-installer-images', 'kmod-virtualbox', 'kmod-xtables-addons'], + 'kernel-server-latest' => ['kmod-virtualbox', 'kmod-xtables-addons'], + 'ldetect-lst' => ['drakx-installer-stage2'], + 'meta-task' => ['drakx-installer-stage2'], + 'perl' => ['drakx-installer-stage2'], + 'perl-URPM' => ['drakx-installer-stage2'], + 'rpm' => ['drakx-installer-stage2'], + 'rpm-mageia-setup' => ['drakx-installer-stage2'], + 'urpmi' => ['drakx-installer-stage2'], + }, + }, + }, + }, + 'posts' => { + 'genhdlist2' => { + 'class' => 'Youri::Submit::Post::Genhdlist2', + 'options' => { + 'command' => '/usr/bin/genhdlist2 --xml-info-filter ".lzma:lzma -7"', + }, + }, + 'clean_rpmsrate' => { + 'class' => 'Youri::Submit::Post::CleanRpmsrate', + }, + 'mirror' => { + 'class' => 'Youri::Submit::Post::Mirror', + 'options' => { + 'destination' => $buildsystem::var::repository::mirror_reporoot, + }, + }, + }, + }, + 'todo' => { + 'repository' => { + 'class' => 'Youri::Repository::Mageia', + 'options' => { + 'install_root' => $buildsystem::var::repository::bootstrap_reporoot, + 'upload_root' => '${home}/uploads/', + 'upload_state' => 'todo done queue', + 'queue' => 'todo', + 'noarch' => 'i586', + 'svn' => "${buildsystem::var::mgarepo::svn_root_packages_ssh}/${buildsystem::var::distros::default_distro}", + }, + }, + 'checks' => { + 'tag' => $check_tag, + 'recency' => $check_recency, + 'queue_recency' => $check_queue_recency, + 'host' => $check_host, + 'rpmlint' => $check_rpmlint, + 'acl' => $check_acl, + 'source' => $check_source, + 'version' => $check_version, + 'deps' => { + 'class' => 'Youri::Submit::Check::Deps', + }, + }, + 'actions' => { + 'send' => { + 'class' => 'Youri::Submit::Action::Send', + 'options' => { + 'user' => $buildsystem::var::scheduler::login, + 'keep_svn_release' => 'yes', + 'uphost' => $buildsystem::var::scheduler::pkg_uphost, + 'root' => '${home}/uploads', + 'ssh_key' => '${home}/.ssh/id_rsa', + }, + }, + 'dependencies' => { + 'class' => 'Youri::Submit::Action::Dependencies', + 'options' => { + 'user' => $buildsystem::var::scheduler::login, + 'uphost' => $buildsystem::var::scheduler::pkg_uphost, + 'root' => '${home}/uploads', + 'ssh_key' => '${home}/.ssh/id_rsa', + }, + }, + 'rpminfo' => { + 'class' => 'Youri::Submit::Action::Rpminfo', + 'options' => { + 'user' => $buildsystem::var::scheduler::login, + 'uphost' => $buildsystem::var::scheduler::pkg_uphost, + 'root' => '${home}/uploads', + 'ssh_key' => '${home}/.ssh/id_rsa', + }, + }, + 'ulri' => { + 'class' => 'Youri::Submit::Action::Ulri', + 'options' => { + 'user' => $buildsystem::var::scheduler::login, + 'uphost' => $buildsystem::var::scheduler::pkg_uphost, + 'ssh_key' => '${home}/.ssh/id_rsa', + }, + }, + }, + 'posts' => { + }, + }, } } |