aboutsummaryrefslogtreecommitdiffstats
path: root/modules/viewvc/manifests/var.pp
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-10-20 11:06:47 +0300
committerThomas Backlund <tmb@mageia.org>2015-10-20 11:06:47 +0300
commit50cfe0d1d1a1ce2ec1900a9ba016e9d7f72a7025 (patch)
treeefe0d29387b5c8ddc4e891e47aad49096da1f2d5 /modules/viewvc/manifests/var.pp
parent9b43b0f9a934081f2996b77a2cda61ec43e63e24 (diff)
downloadpuppet-50cfe0d1d1a1ce2ec1900a9ba016e9d7f72a7025.tar
puppet-50cfe0d1d1a1ce2ec1900a9ba016e9d7f72a7025.tar.gz
puppet-50cfe0d1d1a1ce2ec1900a9ba016e9d7f72a7025.tar.bz2
puppet-50cfe0d1d1a1ce2ec1900a9ba016e9d7f72a7025.tar.xz
puppet-50cfe0d1d1a1ce2ec1900a9ba016e9d7f72a7025.zip
lint fixes for postfix
Diffstat (limited to 'modules/viewvc/manifests/var.pp')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-03 00:48:29 +0000
e04827'>deployment/lists/manifests/init.pp6
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp4
-rw-r--r--deployment/mgagit/manifests/init.pp4
-rw-r--r--deployment/releasekey/manifests/init.pp2
-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
-rw-r--r--deployment/softwarekey/manifests/init.pp2
-rw-r--r--deployment/tld_redirections/manifests/init.pp4
-rw-r--r--deployment/websites/manifests/archives.pp4
-rw-r--r--deployment/websites/manifests/doc.pp4
-rw-r--r--deployment/websites/manifests/forum_proxy.pp2
-rw-r--r--deployment/websites/manifests/git.pp4
-rw-r--r--deployment/websites/manifests/hugs.pp6
-rw-r--r--deployment/websites/manifests/nav.pp4
-rw-r--r--deployment/websites/manifests/perl.pp2
-rw-r--r--deployment/websites/manifests/releases.pp4
-rw-r--r--deployment/websites/manifests/start.pp4
-rw-r--r--deployment/websites/manifests/static.pp6
-rw-r--r--deployment/websites/manifests/svn.pp4
-rw-r--r--deployment/websites/manifests/www.pp14
-rw-r--r--deployment/wikis/manifests/init.pp8
24 files changed, 71 insertions, 71 deletions
diff --git a/deployment/backups/manifests/init.pp b/deployment/backups/manifests/init.pp
index b89d1186..6c2ea7dd 100644
--- a/deployment/backups/manifests/init.pp
+++ b/deployment/backups/manifests/init.pp
@@ -17,12 +17,12 @@ class backups {
rsnapshot::backup{ 'alamut':
snapshot_root => "${backups_dir}/alamut",
- backup => [ 'root@alamut.mageia.org:/srv/wiki wiki' ],
+ backup => [ "root@alamut.${::domain}:/srv/wiki wiki" ],
}
rsnapshot::backup{ 'krampouezh':
snapshot_root => "${backups_dir}/krampouezh",
- backup => [ 'root@krampouezh.mageia.org:/home/irc_bots/meetings meetbot' ],
+ backup => [ "root@krampouezh.${::domain}:/home/irc_bots/meetings meetbot" ],
}
}
}
diff --git a/deployment/forums/manifests/init.pp b/deployment/forums/manifests/init.pp
index d75bdb75..0ff256cd 100644
--- a/deployment/forums/manifests/init.pp
+++ b/deployment/forums/manifests/init.pp
@@ -5,18 +5,18 @@ class forums {
phpbb::instance { 'de': }
phpbb::redirection_instance{ 'fr':
- url => 'https://forums.mageia.org/en/viewforum.php?f=19'
+ url => "https://forums.${::domain}/en/viewforum.php?f=19"
}
phpbb::redirection_instance{ 'es':
- url => 'https://forums.mageia.org/en/viewforum.php?f=22'
+ url => "https://forums.${::domain}/en/viewforum.php?f=22"
}
phpbb::redirection_instance{ 'zh-cn':
- url => 'https://forums.mageia.org/en/viewforum.php?f=27'
+ url => "https://forums.${::domain}/en/viewforum.php?f=27"
}
phpbb::redirection_instance{ 'pt-br':
- url => 'https://forums.mageia.org/en/viewforum.php?f=28'
+ url => "https://forums.${::domain}/en/viewforum.php?f=28"
}
}
diff --git a/deployment/lists/manifests/init.pp b/deployment/lists/manifests/init.pp
index 99b28b2d..ff472cf6 100644
--- a/deployment/lists/manifests/init.pp
+++ b/deployment/lists/manifests/init.pp
@@ -30,7 +30,7 @@ class lists {
sympa::list::private { 'blog-moderation':
subject => 'Blog comments moderation',
subscriber_ldap_group => 'mga-blog-moderators',
- sender_email => [ 'wordpress@blog.mageia.org' ],
+ sender_email => [ "wordpress@blog.${::domain}" ],
topics => 'atelier',
}
@@ -67,7 +67,7 @@ class lists {
sender_subscriber => true,
sender_email => [
'r2d2@vargas.calenco.com',
- 'blog@mageia.org',
+ "blog@${::domain}",
],
topics => 'i18n',
}
@@ -164,7 +164,7 @@ class lists {
sympa::list::announce {'qa-reports':
subject => 'Automated reports from QA tools',
reply_to => "qa-discuss@ml.${::domain}",
- sender_email => [ 'buildsystem-daemon@mageia.org' ],
+ sender_email => [ "buildsystem-daemon@${::domain}" ],
topics => 'qa',
}
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 994361b0..5127e8ba 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -11,12 +11,12 @@ class mga_buildsystem::config {
}
class { 'buildsystem::var::webstatus' :
- package_commit_url => 'http://svnweb.mageia.org/packages?view=revision&revision=%d',
+ package_commit_url => "http://svnweb.${::domain}/packages?view=revision&revision=%d",
theme_name => 'mageia',
}
class { 'buildsystem::var::scheduler' :
- admin_mail => 'sysadmin@group.mageia.org',
+ admin_mail => "sysadmin@group.${::domain}",
build_nodes => {
'i586' => [ 'ecosse0', 'sucuk0', 'ecosse1', 'sucuk1', 'sucuk2', ],
'x86_64' => [ 'sucuk0', 'ecosse0', 'sucuk1', 'ecosse1', 'sucuk2' ],
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp
index 38cb201d..fba81230 100644
--- a/deployment/mgagit/manifests/init.pp
+++ b/deployment/mgagit/manifests/init.pp
@@ -1,8 +1,8 @@
class mgagit(
$git_dir = '/git',
- $ldap_server = 'ldap.mageia.org',
+ $ldap_server = "ldap.${::domain}",
$binddn = 'uid=mgagit,ou=People,dc=mageia,dc=org',
- $vhost = 'projects.mageia.org',
+ $vhost = "projects.${::domain}",
$bindpw
){
$git_login = 'git'
diff --git a/deployment/releasekey/manifests/init.pp b/deployment/releasekey/manifests/init.pp
index fac12cf6..a3c99526 100644
--- a/deployment/releasekey/manifests/init.pp
+++ b/deployment/releasekey/manifests/init.pp
@@ -12,7 +12,7 @@ class releasekey {
}
gnupg::keys{ 'release':
- email => "release@$::domain",
+ email => "release@${::domain}",
#FIXME there should be a variable somewhere to change the name of the distribution
key_name => 'Mageia Release',
login => $sign_login,
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
diff --git a/deployment/softwarekey/manifests/init.pp b/deployment/softwarekey/manifests/init.pp
index 765bdb83..8035de4c 100644
--- a/deployment/softwarekey/manifests/init.pp
+++ b/deployment/softwarekey/manifests/init.pp
@@ -13,7 +13,7 @@ class softwarekey {
}
gnupg::keys{ 'software':
- email => "software@$::domain",
+ email => "software@${::domain}",
#FIXME there should be a variable somewhere to change the
# name of the distribution
key_name => 'Mageia Software',
diff --git a/deployment/tld_redirections/manifests/init.pp b/deployment/tld_redirections/manifests/init.pp