diff options
Diffstat (limited to 'modules/buildsystem/manifests')
23 files changed, 429 insertions, 429 deletions
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index 9e449627..4c0bf378 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -5,7 +5,7 @@ class buildsystem::binrepo { # upload-bin script use the mailx command provided by nail package { 'nail': - ensure => installed, + ensure => installed, } user { $buildsystem::var::binrepo::login: diff --git a/modules/buildsystem/manifests/buildnode.pp b/modules/buildsystem/manifests/buildnode.pp index 997dba2f..1573c093 100644 --- a/modules/buildsystem/manifests/buildnode.pp +++ b/modules/buildsystem/manifests/buildnode.pp @@ -6,7 +6,7 @@ class buildsystem::buildnode { sshkeys::set_authorized_keys { 'iurt-allow-scheduler': keyname => $buildsystem::var::scheduler::login, - home => $buildsystem::var::iurt::homedir, - user => $buildsystem::var::iurt::login, + home => $buildsystem::var::iurt::homedir, + user => $buildsystem::var::iurt::login, } } diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb index c95c9b10..270a9285 100644 --- a/modules/buildsystem/manifests/create_upload_dir.rb +++ b/modules/buildsystem/manifests/create_upload_dir.rb @@ -6,17 +6,17 @@ hostclass "buildsystem::create_upload_dir" do group = owner uploads_dir = scope.lookupvar('buildsystem::var::scheduler::homedir') + '/uploads' - file uploads_dir, :ensure => 'directory', :owner => owner, :group => group + file uploads_dir, :ensure => 'directory', :owner => owner, :group => group for st in states do - file [uploads_dir, st].join('/'), :ensure => 'directory', :owner => owner, :group => group - + file [uploads_dir, st].join('/'), :ensure => 'directory', :owner => owner, :group => group + scope.lookupvar('buildsystem::var::distros::distros').each{|rel, distro| file [uploads_dir, st, rel].join('/'), :ensure => 'directory', :owner => owner, :group => group - medias = distro['medias'] + medias = distro['medias'] medias.each{|media, m| file [uploads_dir, st, rel, media].join('/'), :ensure => 'directory', :owner => owner, :group => group - + for repo in m['repos'].keys do if st == 'done' file [uploads_dir, st, rel, media, repo].join('/'), :ensure => 'directory', :owner => owner, :group => group, :mode => 0775 diff --git a/modules/buildsystem/manifests/distros.rb b/modules/buildsystem/manifests/distros.rb index 5af2264f..b383717b 100644 --- a/modules/buildsystem/manifests/distros.rb +++ b/modules/buildsystem/manifests/distros.rb @@ -7,89 +7,89 @@ hostclass "buildsystem::distros" do schedbot_user = scope.lookupvar('buildsystem::var::scheduler::login') bootstrap_reporoot = scope.lookupvar('buildsystem::var::repository::bootstrap_reporoot') scope.lookupvar('buildsystem::var::distros::distros').each{|rel, distro| - file [ bootstrap_reporoot, rel ].join('/'), :ensure => 'directory', - :owner => mirror_user, :group => mirror_user - for arch in distro['arch'] do - # As ruby dsl cannot use defined resources, we have to use a - # workaround with 'find_resource_type' as described in this - # puppet issue: http://projects.puppetlabs.com/issues/11912 - scope.find_resource_type 'buildsystem::media_cfg' - media_cfg_args = { - :distro_name => rel, - :arch => arch, - } - if distro['tmpl_media.cfg'] != nil - media_cfg_args['templatefile'] = distro['tmpl_media.cfg'] - end + file [ bootstrap_reporoot, rel ].join('/'), :ensure => 'directory', + :owner => mirror_user, :group => mirror_user + for arch in distro['arch'] do + # As ruby dsl cannot use defined resources, we have to use a + # workaround with 'find_resource_type' as described in this + # puppet issue: http://projects.puppetlabs.com/issues/11912 + scope.find_resource_type 'buildsystem::media_cfg' + media_cfg_args = { + :distro_name => rel, + :arch => arch, + } + if distro['tmpl_media.cfg'] != nil + media_cfg_args['templatefile'] = distro['tmpl_media.cfg'] + end if ! distro['no_media_cfg_update'] create_resource 'buildsystem::media_cfg', [ rel, ' ', arch ].join('/'), media_cfg_args end - file [ bootstrap_reporoot, rel, arch ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - mediadir = [ bootstrap_reporoot, rel, arch, 'media' ].join('/') - file mediadir, :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - 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 - distro['medias'].each{|media, m| - file [ mediadir, media ].join('/'), :ensure => 'directory', - :owner => schedbot_user, :group => schedbot_user - file [ mediadir, 'debug', media ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - for repo in m['repos'].keys do - file [ mediadir, media, repo ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - file [ mediadir, media, repo, 'media_info' ].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 - end - } - if distro['based_on'] != nil - distro['based_on'].each{|bdistroname, medias| - file [ mediadir, bdistroname ].join('/'), - :ensure => 'directory', :owner => mirror_user, - :group => mirror_user - medias.each{|medianame, media| - mdir = [ mediadir, bdistroname, medianame ].join('/') - file mdir, :ensure => 'directory', - :owner => mirror_user, :group => mirror_user - for reponame in media - file [ mdir, reponame ].join('/'), - :ensure => 'link', - :target => [ - '../../../../..', bdistroname, arch, - 'media', medianame, reponame ].join('/'), - :owner => mirror_user, :group => mirror_user - end - } - } - end - end - # SRPMS - srpmsdir = [ bootstrap_reporoot, rel, 'SRPMS' ].join('/') - file srpmsdir, - :ensure => 'directory', :owner => mirror_user, - :group => mirror_user - distro['medias'].each{|media, m| - file [ srpmsdir, media ].join('/'), :ensure => 'directory', - :owner => schedbot_user, :group => schedbot_user - for repo in m['repos'].keys do - file [ srpmsdir, media, repo ].join('/'), - :ensure => 'directory', :owner => schedbot_user, - :group => schedbot_user - end - } + file [ bootstrap_reporoot, rel, arch ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + mediadir = [ bootstrap_reporoot, rel, arch, 'media' ].join('/') + file mediadir, :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + 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 + distro['medias'].each{|media, m| + file [ mediadir, media ].join('/'), :ensure => 'directory', + :owner => schedbot_user, :group => schedbot_user + file [ mediadir, 'debug', media ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + for repo in m['repos'].keys do + file [ mediadir, media, repo ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + file [ mediadir, media, repo, 'media_info' ].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 + end + } + if distro['based_on'] != nil + distro['based_on'].each{|bdistroname, medias| + file [ mediadir, bdistroname ].join('/'), + :ensure => 'directory', :owner => mirror_user, + :group => mirror_user + medias.each{|medianame, media| + mdir = [ mediadir, bdistroname, medianame ].join('/') + file mdir, :ensure => 'directory', + :owner => mirror_user, :group => mirror_user + for reponame in media + file [ mdir, reponame ].join('/'), + :ensure => 'link', + :target => [ + '../../../../..', bdistroname, arch, + 'media', medianame, reponame ].join('/'), + :owner => mirror_user, :group => mirror_user + end + } + } + end + end + # SRPMS + srpmsdir = [ bootstrap_reporoot, rel, 'SRPMS' ].join('/') + file srpmsdir, + :ensure => 'directory', :owner => mirror_user, + :group => mirror_user + distro['medias'].each{|media, m| + file [ srpmsdir, media ].join('/'), :ensure => 'directory', + :owner => schedbot_user, :group => schedbot_user + for repo in m['repos'].keys do + file [ srpmsdir, media, repo ].join('/'), + :ensure => 'directory', :owner => schedbot_user, + :group => schedbot_user + end + } } end diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp index 32a48a4d..4c1dc055 100644 --- a/modules/buildsystem/manifests/iurt/config.pp +++ b/modules/buildsystem/manifests/iurt/config.pp @@ -6,7 +6,7 @@ define buildsystem::iurt::config() { # TODO rename the variable too in template $build_login = $buildsystem::var::iurt::login - file { "/etc/iurt/build/$distribution.conf": + file { "/etc/iurt/build/${distribution}.conf": owner => $build_login, group => $build_login, content => template("buildsystem/iurt.conf") diff --git a/modules/buildsystem/manifests/iurt/packages.pp b/modules/buildsystem/manifests/iurt/packages.pp index 448b4a89..e814b7c2 100644 --- a/modules/buildsystem/manifests/iurt/packages.pp +++ b/modules/buildsystem/manifests/iurt/packages.pp @@ -1,3 +1,3 @@ class buildsystem::iurt::packages { package { 'iurt': } -} +} diff --git a/modules/buildsystem/manifests/mainnode.pp b/modules/buildsystem/manifests/mainnode.pp index e31c58b6..0dd37486 100644 --- a/modules/buildsystem/manifests/mainnode.pp +++ b/modules/buildsystem/manifests/mainnode.pp @@ -10,12 +10,12 @@ class buildsystem::mainnode { include buildsystem::distros sshkeys::set_client_key_pair { $buildsystem::var::scheduler::login: - home => $buildsystem::var::scheduler::homedir, - user => $buildsystem::var::scheduler::login, + home => $buildsystem::var::scheduler::homedir, + user => $buildsystem::var::scheduler::login, } sshkeys::set_authorized_keys { 'scheduler-allow-scheduler': keyname => $buildsystem::var::scheduler::login, - home => $buildsystem::var::scheduler::homedir, - user => $buildsystem::var::scheduler::login, + home => $buildsystem::var::scheduler::homedir, + user => $buildsystem::var::scheduler::login, } } diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp index 88920bd4..e531f550 100644 --- a/modules/buildsystem/manifests/maintdb.pp +++ b/modules/buildsystem/manifests/maintdb.pp @@ -33,7 +33,7 @@ class buildsystem::maintdb { file { [$buildsystem::var::maintdb::dump, "${buildsystem::var::maintdb::dump}.new", $buildsystem::var::maintdb::unmaintained, - "${buildsystem::var::maintdb::unmaintained}.new"]: + "${buildsystem::var::maintdb::unmaintained}.new"]: owner => $buildsystem::var::maintdb::login, require => File["${buildsystem::var::webstatus::location}/data"], } diff --git a/modules/buildsystem/manifests/media_cfg.pp b/modules/buildsystem/manifests/media_cfg.pp index bdec67f7..77fcc8fd 100644 --- a/modules/buildsystem/manifests/media_cfg.pp +++ b/modules/buildsystem/manifests/media_cfg.pp @@ -2,10 +2,10 @@ define buildsystem::media_cfg($distro_name, $arch, $templatefile = 'buildsystem/ include buildsystem::var::repository include buildsystem::var::scheduler include buildsystem::repository - + file { "${buildsystem::var::repository::bootstrap_reporoot}/${distro_name}/${arch}/media/media_info/media.cfg": - owner => $buildsystem::var::scheduler::login, - group => $buildsystem::var::scheduler::login, - content => template($templatefile), + owner => $buildsystem::var::scheduler::login, + group => $buildsystem::var::scheduler::login, + content => template($templatefile), } } diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index ef9fb491..cab4315a 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -9,25 +9,25 @@ class buildsystem::mgarepo { package { ['mgarepo','rpm-build']: } file { '/etc/mgarepo.conf': - content => template('buildsystem/mgarepo.conf'), + content => template('buildsystem/mgarepo.conf'), } - file { "$sched_home_dir/repsys": + file { "${sched_home_dir}/repsys": ensure => 'directory', owner => $sched_login, require => File[$sched_home_dir], } - file { ["$sched_home_dir/repsys/tmp", "$sched_home_dir/repsys/srpms"]: + file { ["${sched_home_dir}/repsys/tmp", "${sched_home_dir}/repsys/srpms"]: ensure => 'directory', owner => $sched_login, group => $buildsystem::var::groups::packagers, mode => '1775', - require => File["$sched_home_dir/repsys"], + require => File["${sched_home_dir}/repsys"], } # FIXME: disabled temporarly as upload dir is a symlink to /var/lib/repsys/uploads - #file { "$sched_home_dir/uploads": + #file { "${sched_home_dir}/uploads": # ensure => "directory", # owner => $sched_login, # require => File[$sched_home_dir], diff --git a/modules/buildsystem/manifests/repoctl.pp b/modules/buildsystem/manifests/repoctl.pp index e3343cf5..8d44e52c 100644 --- a/modules/buildsystem/manifests/repoctl.pp +++ b/modules/buildsystem/manifests/repoctl.pp @@ -5,7 +5,7 @@ class buildsystem::repoctl { package{ 'repoctl': } file { '/etc/repoctl.conf': - content => template('buildsystem/repoctl.conf'), - require => Package['repoctl'], + content => template('buildsystem/repoctl.conf'), + require => Package['repoctl'], } } diff --git a/modules/buildsystem/manifests/repository.pp b/modules/buildsystem/manifests/repository.pp index 115995ab..dda90eb2 100644 --- a/modules/buildsystem/manifests/repository.pp +++ b/modules/buildsystem/manifests/repository.pp @@ -2,10 +2,10 @@ class buildsystem::repository { include buildsystem::var::repository file { [ $buildsystem::var::repository::bootstrap_root, $buildsystem::var::repository::bootstrap_reporoot ] : - ensure => directory, + ensure => directory, } apache::vhost::other_app { $buildsystem::var::repository::hostname: - vhost_file => 'buildsystem/vhost_repository.conf', + vhost_file => 'buildsystem/vhost_repository.conf', } } diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp index d60ecd24..a0138a2f 100644 --- a/modules/buildsystem/manifests/scheduler.pp +++ b/modules/buildsystem/manifests/scheduler.pp @@ -5,25 +5,25 @@ class buildsystem::scheduler { include buildsystem::var::scheduler $login = $buildsystem::var::scheduler::login - $homedir = $buildsystem::var::scheduler::homedir - $logdir = $buildsystem::var::scheduler::logdir + $homedir = $buildsystem::var::scheduler::homedir + $logdir = $buildsystem::var::scheduler::logdir buildsystem::sshuser { $login: homedir => $homedir, comment => 'System user used to schedule builds', } - file { $logdir: - ensure => directory, - mode => 0755, - owner => $login, - } + file { $logdir: + ensure => directory, + mode => '0755', + owner => $login, + } - cron { 'dispatch jobs': - user => $login, - command => "EMI_LOG_FILE=$logdir/emi.log ULRI_LOG_FILE=$logdir/ulri.log ulri; EMI_LOG_FILE=$logdir/emi.log emi", - minute => '*', - } + cron { 'dispatch jobs': + user => $login, + command => "EMI_LOG_FILE=${logdir}/emi.log ULRI_LOG_FILE=${logdir}/ulri.log ulri; EMI_LOG_FILE=${logdir}/emi.log emi", + minute => '*', + } if ($buildsystem::var::scheduler::clean_uploads_logs_age != '0') { tidy { "${buildsystem::var::scheduler::homedir}/uploads": diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp index 6d91ddd6..f41254a4 100644 --- a/modules/buildsystem/manifests/signbot.pp +++ b/modules/buildsystem/manifests/signbot.pp @@ -21,7 +21,7 @@ class buildsystem::signbot { content => template('buildsystem/signbot/sudoers.signpackage') } - file { "$home_dir/.rpmmacros": + file { "${home_dir}/.rpmmacros": source => 'puppet:///modules/buildsystem/signbot/signbot-rpmmacros', } diff --git a/modules/buildsystem/manifests/sshuser.pp b/modules/buildsystem/manifests/sshuser.pp index 0a1cd176..4dcf51d5 100644 --- a/modules/buildsystem/manifests/sshuser.pp +++ b/modules/buildsystem/manifests/sshuser.pp @@ -9,13 +9,13 @@ define buildsystem::sshuser($homedir, $comment, $groups = []) { gid => $name, groups => $groups, shell => '/bin/bash', - notify => Exec["unlock $name"], + notify => Exec["unlock ${name}"], require => Group[$title], } # set password to * to unlock the account but forbid login through login - exec { "unlock $name": - command => "usermod -p '*' $name", + exec { "unlock ${name}": + command => "usermod -p '*' ${name}", refreshonly => true, } @@ -26,7 +26,7 @@ define buildsystem::sshuser($homedir, $comment, $groups = []) { require => User[$name], } - file { "$homedir/.ssh": + file { "${homedir}/.ssh": ensure => directory, mode => '0600', owner => $name, 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' => { + }, + }, } } diff --git a/modules/buildsystem/manifests/webstatus.pp b/modules/buildsystem/manifests/webstatus.pp index 41538dd9..49346dbc 100644 --- a/modules/buildsystem/manifests/webstatus.pp +++ b/modules/buildsystem/manifests/webstatus.pp @@ -12,7 +12,7 @@ class buildsystem::webstatus { aliases => { '/uploads' => "${buildsystem::var::scheduler::homedir}/uploads", '/autobuild/cauldron/x86_64/core/log/status.core.log' => "${buildsystem::var::webstatus::location}/autobuild/broken.php", - '/themes' => $buildsystem::var::webstatus::themes_dir, + '/themes' => $buildsystem::var::webstatus::themes_dir, }, location => $buildsystem::var::webstatus::location, content => template('buildsystem/vhost_webstatus.conf'), @@ -24,7 +24,7 @@ class buildsystem::webstatus { aliases => { '/uploads' => "${buildsystem::var::scheduler::homedir}/uploads", '/autobuild/cauldron/x86_64/core/log/status.core.log' => "${buildsystem::var::webstatus::location}/autobuild/broken.php", - '/themes' => $buildsystem::var::webstatus::themes_dir, + '/themes' => $buildsystem::var::webstatus::themes_dir, }, location => $buildsystem::var::webstatus::location, content => template('buildsystem/vhost_webstatus.conf'), @@ -35,10 +35,10 @@ class buildsystem::webstatus { } file { '/etc/bs-webstatus.conf': - ensure => present, - content => template('buildsystem/bs-webstatus.conf'), - mode => 0644, - owner => root, - group => root, + ensure => present, + content => template('buildsystem/bs-webstatus.conf'), + mode => '0644', + owner => root, + group => root, } } diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp index b9a7d1ba..8c10b74b 100644 --- a/modules/buildsystem/manifests/youri_submit.pp +++ b/modules/buildsystem/manifests/youri_submit.pp @@ -27,15 +27,15 @@ class buildsystem::youri_submit { ensure => 'directory'; '/etc/youri/acl.conf': content => template('buildsystem/youri/acl.conf'); - '/etc/youri/host.conf': - content => template('buildsystem/youri/host.conf'); + '/etc/youri/host.conf': + content => template('buildsystem/youri/host.conf'); } buildsystem::youri_submit_conf{ 'upload': - tmpl_file => $buildsystem::var::youri::tmpl_youri_upload_conf, + tmpl_file => $buildsystem::var::youri::tmpl_youri_upload_conf, } buildsystem::youri_submit_conf{ 'todo': - tmpl_file => $buildsystem::var::youri::tmpl_youri_todo_conf, + tmpl_file => $buildsystem::var::youri::tmpl_youri_todo_conf, } file { $buildsystem::var::youri::packages_archivedir: @@ -55,9 +55,9 @@ class buildsystem::youri_submit { file { [ "${mga_common::var::perl::site_perl_dir}/Youri", "${mga_common::var::perl::site_perl_dir}/Youri/Repository"]: ensure => directory, - mode => 0755, - owner => root, - group => root, + mode => '0755', + owner => root, + group => root, } file { "${mga_common::var::perl::site_perl_dir}/Youri/Repository/Mageia.pm": source => 'puppet:///modules/buildsystem/Mageia.pm', diff --git a/modules/buildsystem/manifests/youri_submit_conf.pp b/modules/buildsystem/manifests/youri_submit_conf.pp index 9281713e..28b911d9 100644 --- a/modules/buildsystem/manifests/youri_submit_conf.pp +++ b/modules/buildsystem/manifests/youri_submit_conf.pp @@ -1,6 +1,6 @@ define buildsystem::youri_submit_conf($tmpl_file) { $conf_name = $name file { "/etc/youri/submit-${conf_name}.conf": - content => template($tmpl_file), + content => template($tmpl_file), } } |