From 1451c5f4861941f56712cb813f0ce0ac5151c741 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 10 Feb 2012 14:20:00 +0000 Subject: make puppet-lint happy, and use topscope variable ( for puppet 2.8 ) --- deployment/repositories/manifests/git.pp | 12 ++-- deployment/repositories/manifests/git_mirror.pp | 14 ++--- deployment/repositories/manifests/sparkleshare.pp | 6 +- deployment/repositories/manifests/subversion.pp | 75 +++++++++++------------ deployment/repositories/manifests/svn_mirror.pp | 12 ++-- 5 files changed, 58 insertions(+), 61 deletions(-) (limited to 'deployment') diff --git a/deployment/repositories/manifests/git.pp b/deployment/repositories/manifests/git.pp index 234ad90c..46445647 100644 --- a/deployment/repositories/manifests/git.pp +++ b/deployment/repositories/manifests/git.pp @@ -1,11 +1,11 @@ class repositories::git { - git::repository { "/git/forum": - description => "Reference code for forum.$domain", - group => "mga-forum-developers", + git::repository { '/git/forum': + description => "Reference code for forum.$::domain", + group => 'mga-forum-developers', } - git::repository { "/git/initscripts": - description => "Source for initscripts package", - group => "mga-packagers-committers", + git::repository { '/git/initscripts': + description => 'Source for initscripts package', + group => 'mga-packagers-committers', } } diff --git a/deployment/repositories/manifests/git_mirror.pp b/deployment/repositories/manifests/git_mirror.pp index db6c69c8..9d213441 100644 --- a/deployment/repositories/manifests/git_mirror.pp +++ b/deployment/repositories/manifests/git_mirror.pp @@ -1,16 +1,16 @@ class repositories::git_mirror { - file { "/git": + file { '/git': ensure => directory, } - git::mirror { "/git/forum/": - description => "Reference code for forum.$domain", - source => "git://git.$domain/forum/" + git::mirror { '/git/forum/': + description => "Reference code for forum.$::domain", + source => "git://git.$::domain/forum/", } - git::mirror { "/git/initscripts/": - description => "Reference code for Initscripts", - source => "git://git.$domain/initscripts/" + git::mirror { '/git/initscripts/': + description => 'Reference code for Initscripts', + source => "git://git.$::domain/initscripts/", } } diff --git a/deployment/repositories/manifests/sparkleshare.pp b/deployment/repositories/manifests/sparkleshare.pp index 94eb2e33..302e07c1 100644 --- a/deployment/repositories/manifests/sparkleshare.pp +++ b/deployment/repositories/manifests/sparkleshare.pp @@ -1,11 +1,11 @@ class repositories::sparkleshare { $sp_dir = '/git/sparkleshare' file { $sp_dir: - ensure => directory, + ensure => directory, } git::repository { "$sp_dir/test": - description => "Test sparkleshare repository", - group => "mga-packagers-committers", + description => 'Test sparkleshare repository', + group => 'mga-packagers-committers', } } diff --git a/deployment/repositories/manifests/subversion.pp b/deployment/repositories/manifests/subversion.pp index 1a9c4acd..9e8030bb 100644 --- a/deployment/repositories/manifests/subversion.pp +++ b/deployment/repositories/manifests/subversion.pp @@ -1,72 +1,69 @@ class repositories::subversion { Subversion::Repository { - cia_post => true, + cia_post => true, cia_ignore_author => '^schedbot$', } - subversion::repository { "/svn/adm/": - group => "mga-sysadmin", - commit_mail => ["sysadmin-commits@ml.$domain"], + subversion::repository { '/svn/adm/': + group => 'mga-sysadmin', + commit_mail => ["sysadmin-commits@ml.$::domain"], syntax_check => ['check_puppet_templates','check_puppet'], - cia_module => "sysadm", + cia_module => 'sysadm', } - sudo::sudoers_config { "puppet_update": - content => template("repositories/puppet_update.sudoers") + sudo::sudoers_config { 'puppet_update': + content => template('repositories/puppet_update.sudoers') } - subversion::hook::post_commit { "/svn/adm/|puppet_update": - content => template("repositories/puppet_update.sh") + subversion::hook::post_commit { '/svn/adm/|puppet_update': + content => template('repositories/puppet_update.sh') } - subversion::repository { "/svn/soft/": - group => "mga-packagers", - commit_mail => ["soft-commits@ml.$domain"], + subversion::repository { '/svn/soft/': + group => 'mga-packagers', + commit_mail => ["soft-commits@ml.$::domain"], syntax_check => ['check_po'], - cia_module => "soft", - i18n_mail => ["mageia-i18n@$domain"], + cia_module => 'soft', + i18n_mail => ["mageia-i18n@$::domain"], } - subversion::repository { "/svn/soft_publish/": - group => "mga-packagers", - commit_mail => ["soft-commits@ml.$domain"], - cia_post => true, - cia_module => "soft_publish", + subversion::repository { '/svn/soft_publish/': + group => 'mga-packagers', + commit_mail => ["soft-commits@ml.$::domain"], + cia_post => true, + cia_module => 'soft_publish', } - subversion::repository { "/svn/web/": - group => "mga-web", + subversion::repository { '/svn/web/': + group => 'mga-web', syntax_check => ['check_php'], - cia_module => "web", + cia_module => 'web', } - subversion::repository { "/svn/packages/": - group => "mga-packagers-committers", - no_binary => true, - commit_mail => ["packages-commits@ml.$domain"], - cia_module => "packages", -# restricted_to_user => 'schedbot', + subversion::repository { '/svn/packages/': + group => 'mga-packagers-committers', + no_binary => true, + commit_mail => ["packages-commits@ml.$::domain"], + cia_module => 'packages', } - file { "/svn/binrepos/": + file { '/svn/binrepos/': ensure => directory, - mode => 700, + mode => '0700', } - subversion::repository { "/svn/binrepos/cauldron/": - group => "mga-packagers-committers", - cia_module => "binrepos", -# restricted_to_user => 'schedbot', + subversion::repository { '/svn/binrepos/cauldron/': + group => 'mga-packagers-committers', + cia_module => 'binrepos', } - file { "/svn/binrepos/updates/": + file { '/svn/binrepos/updates/': ensure => directory } - subversion::repository { "/svn/binrepos/updates/1/": - group => "mga-packagers-committers", - cia_module => "binrepos_1", -# restricted_to_user => 'schedbot', + subversion::repository { '/svn/binrepos/updates/1/': + group => 'mga-packagers-committers', + cia_module => 'binrepos_1', } } diff --git a/deployment/repositories/manifests/svn_mirror.pp b/deployment/repositories/manifests/svn_mirror.pp index 44bceb92..2fd962ef 100644 --- a/deployment/repositories/manifests/svn_mirror.pp +++ b/deployment/repositories/manifests/svn_mirror.pp @@ -1,13 +1,13 @@ class repositories::svn_mirror { - file { "/svn": + file { '/svn': ensure => directory, } - subversion::mirror_repository { - "/svn/adm/": source => "svn://svn.$domain/svn/adm/"; - "/svn/soft/": source => "svn://svn.$domain/svn/soft/"; - "/svn/web/": source => "svn://svn.$domain/svn/web/"; - "/svn/packages/": source => "svn://svn.$domain/svn/packages/"; + subversion::mirror_repository { + '/svn/adm/': source => "svn://svn.$::domain/svn/adm/"; + '/svn/soft/': source => "svn://svn.$::domain/svn/soft/"; + '/svn/web/': source => "svn://svn.$::domain/svn/web/"; + '/svn/packages/': source => "svn://svn.$::domain/svn/packages/"; } # no binrepos, too big to mirror -- cgit v1.2.1