aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/repositories
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/repositories')
-rw-r--r--deployment/repositories/manifests/git_mirror.pp6
-rw-r--r--deployment/repositories/manifests/subversion.pp22
-rw-r--r--deployment/repositories/manifests/svn_mirror.pp14
3 files changed, 21 insertions, 21 deletions
diff --git a/deployment/repositories/manifests/git_mirror.pp b/deployment/repositories/manifests/git_mirror.pp
index 5cdae3e8..7384b5a8 100644
--- a/deployment/repositories/manifests/git_mirror.pp
+++ b/deployment/repositories/manifests/git_mirror.pp
@@ -4,13 +4,13 @@ class repositories::git_mirror {
#}
#git::mirror { '/git/forum/':
- # description => "Reference code for forum.$::domain",
- # source => "git://git.$::domain/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/",
+ # source => "git://git.${::domain}/initscripts/",
#}
}
diff --git a/deployment/repositories/manifests/subversion.pp b/deployment/repositories/manifests/subversion.pp
index 3d6d7dfc..bbec3e62 100644
--- a/deployment/repositories/manifests/subversion.pp
+++ b/deployment/repositories/manifests/subversion.pp
@@ -2,13 +2,13 @@ class repositories::subversion {
subversion::repository { '/svn/adm/':
group => 'mga-sysadmin',
- commit_mail => ["sysadmin-commits@ml.$::domain"],
+ commit_mail => ["sysadmin-commits@ml.${::domain}"],
syntax_check => ['check_puppet_templates','check_puppet'],
}
subversion::repository { '/svn/advisories':
group => 'mga-packagers',
- commit_mail => ["qa-commits@ml.$::domain"],
+ commit_mail => ["qa-commits@ml.${::domain}"],
}
sudo::sudoers_config { 'puppet_update':
@@ -21,48 +21,48 @@ class repositories::subversion {
subversion::repository { '/svn/org/':
group => 'mga-board',
- commit_mail => ["board-commits@ml.$::domain"],
+ commit_mail => ["board-commits@ml.${::domain}"],
}
subversion::repository { '/svn/soft/':
group => 'mga-packagers',
- commit_mail => ["soft-commits@ml.$::domain"],
+ commit_mail => ["soft-commits@ml.${::domain}"],
syntax_check => ['check_po'],
- i18n_mail => ["i18n-reports@ml.$::domain"],
+ i18n_mail => ["i18n-reports@ml.${::domain}"],
}
subversion::repository { '/svn/soft_publish/':
group => 'mga-packagers',
- commit_mail => ["soft-commits@ml.$::domain"],
+ commit_mail => ["soft-commits@ml.${::domain}"],
}
subversion::repository { '/svn/web/':
group => 'mga-web',
- commit_mail => ["atelier-commits@ml.$::domain"],
+ commit_mail => ["atelier-commits@ml.${::domain}"],
syntax_check => ['check_php'],
}
subversion::repository { '/svn/packages/':
group => 'mga-packagers-committers',
no_binary => true,
- commit_mail => ["packages-commits@ml.$::domain"],
+ commit_mail => ["packages-commits@ml.${::domain}"],
}
subversion::repository { '/svn/test-irker/':
group => 'mga-packagers',
no_binary => true,
- commit_mail => ['tmb@mageia.org'],
+ commit_mail => ["tmb@${::domain}"],
irker_conf => {
project => 'mageia',
repo => 'testrepo',
tinyifier => 'http://is.gd/create.php?format=simple&url=',
- urlprefix => 'http://svnweb.mageia.org/%(repo)?view=revision&revision=',
+ urlprefix => "http://svnweb.${::domain}/%(repo)?view=revision&revision='"
channels => '{irc://chat.freenode.net/commits, irc://chat.freenode.net/test-irker}',
},
}
subversion::repository { '/svn/treasurer/':
group => 'mga-treasurer',
- commit_mail => ["treasurer-commits@ml.$::domain"],
+ commit_mail => ["treasurer-commits@ml.${::domain}"],
}
}
diff --git a/deployment/repositories/manifests/svn_mirror.pp b/deployment/repositories/manifests/svn_mirror.pp
index 3cc833be..d71e896d 100644
--- a/deployment/repositories/manifests/svn_mirror.pp
+++ b/deployment/repositories/manifests/svn_mirror.pp
@@ -4,13 +4,13 @@ class repositories::svn_mirror {
}
subversion::mirror_repository {
- '/svn/adm/': source => "svn://svn.$::domain/svn/adm/";
- '/svn/advisories/':source => "svn://svn.$::domain/svn/advisories/";
- '/svn/soft/': source => "svn://svn.$::domain/svn/soft/";
- '/svn/web/': source => "svn://svn.$::domain/svn/web/";
- '/svn/packages/': source => "svn://svn.$::domain/svn/packages/";
- '/svn/org/': source => "svn://svn.$::domain/svn/org/";
- '/svn/treasurer/': source => "svn://svn.$::domain/svn/treasurer/";
+ '/svn/adm/': source => "svn://svn.${::domain}/svn/adm/";
+ '/svn/advisories/':source => "svn://svn.${::domain}/svn/advisories/";
+ '/svn/soft/': source => "svn://svn.${::domain}/svn/soft/";
+ '/svn/web/': source => "svn://svn.${::domain}/svn/web/";
+ '/svn/packages/': source => "svn://svn.${::domain}/svn/packages/";
+ '/svn/org/': source => "svn://svn.${::domain}/svn/org/";
+ '/svn/treasurer/': source => "svn://svn.${::domain}/svn/treasurer/";
}
# no binrepos, too big to mirror