From c61daf65b58b943994d1f21e52deee9a9ce04827 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Tue, 20 Oct 2015 17:51:42 +0300
Subject: use consistent domain references

---
 deployment/backups/manifests/init.pp            |  4 ++--
 deployment/forums/manifests/init.pp             |  8 ++++----
 deployment/lists/manifests/init.pp              |  6 +++---
 deployment/mga_buildsystem/manifests/config.pp  |  4 ++--
 deployment/mgagit/manifests/init.pp             |  4 ++--
 deployment/releasekey/manifests/init.pp         |  2 +-
 deployment/repositories/manifests/git_mirror.pp |  6 +++---
 deployment/repositories/manifests/subversion.pp | 22 +++++++++++-----------
 deployment/repositories/manifests/svn_mirror.pp | 14 +++++++-------
 deployment/softwarekey/manifests/init.pp        |  2 +-
 deployment/tld_redirections/manifests/init.pp   |  4 ++--
 deployment/websites/manifests/archives.pp       |  4 ++--
 deployment/websites/manifests/doc.pp            |  4 ++--
 deployment/websites/manifests/forum_proxy.pp    |  2 +-
 deployment/websites/manifests/git.pp            |  4 ++--
 deployment/websites/manifests/hugs.pp           |  6 +++---
 deployment/websites/manifests/nav.pp            |  4 ++--
 deployment/websites/manifests/perl.pp           |  2 +-
 deployment/websites/manifests/releases.pp       |  4 ++--
 deployment/websites/manifests/start.pp          |  4 ++--
 deployment/websites/manifests/static.pp         |  6 +++---
 deployment/websites/manifests/svn.pp            |  4 ++--
 deployment/websites/manifests/www.pp            | 14 +++++++-------
 deployment/wikis/manifests/init.pp              |  8 ++++----
 24 files changed, 71 insertions(+), 71 deletions(-)

(limited to 'deployment')

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
index 6743f11b..9e63b707 100644
--- a/deployment/tld_redirections/manifests/init.pp
+++ b/deployment/tld_redirections/manifests/init.pp
@@ -10,11 +10,11 @@ class tld_redirections {
         }
 
         apache::vhost_redirect { "mageia.${name}":
-            url => "http://www.mageia.org/?fromtld=${name}"
+            url => "http://www.${::domain}/?fromtld=${name}"
         }
 
         apache::vhost_redirect { "www.mageia.${name}":
-            url => "http://www.mageia.org/?fromtld=${name}"
+            url => "http://www.${::domain}/?fromtld=${name}"
         }
     }
 
diff --git a/deployment/websites/manifests/archives.pp b/deployment/websites/manifests/archives.pp
index 9180813b..ea66f3b8 100644
--- a/deployment/websites/manifests/archives.pp
+++ b/deployment/websites/manifests/archives.pp
@@ -1,8 +1,8 @@
 class websites::archives {
     include websites::base
-    $vhost = "archives.$::domain"
+    $vhost = "archives.${::domain}"
     $vhostdir = "$websites::base::webdatadir/${vhost}"
-    $git_location = "git://git.$::domain/web/archives"
+    $git_location = "git://git.${::domain}/web/archives"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
diff --git a/deployment/websites/manifests/doc.pp b/deployment/websites/manifests/doc.pp
index 69b2a3a4..46e1230d 100644
--- a/deployment/websites/manifests/doc.pp
+++ b/deployment/websites/manifests/doc.pp
@@ -1,8 +1,8 @@
 class websites::doc {
     include websites::base
-    $vhost = "doc.$::domain"
+    $vhost = "doc.${::domain}"
     $vhostdir = "$websites::base::webdatadir/${vhost}"
-    $git_location = "git://git.$::domain/web/doc"
+    $git_location = "git://git.${::domain}/web/doc"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
diff --git a/deployment/websites/manifests/forum_proxy.pp b/deployment/websites/manifests/forum_proxy.pp
index 1cb6c034..bd8f1fc1 100644
--- a/deployment/websites/manifests/forum_proxy.pp
+++ b/deployment/websites/manifests/forum_proxy.pp
@@ -1,5 +1,5 @@
 class websites::forum_proxy {
-    $web_domain = "forums.$::domain"
+    $web_domain = "forums.${::domain}"
 
     apache::vhost::reverse_proxy { $web_domain:
         url => "http://${web_domain}/",
diff --git a/deployment/websites/manifests/git.pp b/deployment/websites/manifests/git.pp
index 070c13a5..8e7a0058 100644
--- a/deployment/websites/manifests/git.pp
+++ b/deployment/websites/manifests/git.pp
@@ -1,5 +1,5 @@
 class websites::git {
-    apache::vhost_redirect { "git.$::domain":
-        url => "http://gitweb.$::domain/",
+    apache::vhost_redirect { "git.${::domain}":
+        url => "http://gitweb.${::domain}/",
     }
 }
diff --git a/deployment/websites/manifests/hugs.pp b/deployment/websites/manifests/hugs.pp
index 2840b45a..27a554a7 100644
--- a/deployment/websites/manifests/hugs.pp
+++ b/deployment/websites/manifests/hugs.pp
@@ -1,10 +1,10 @@
 class websites::hugs {
     include websites::base
 
-    $vhostdir = "$websites::base::webdatadir/hugs.$::domain"
-    $git_location = "git://git.$::domain/web/hugs"
+    $vhostdir = "$websites::base::webdatadir/hugs.${::domain}"
+    $git_location = "git://git.${::domain}/web/hugs"
 
-    apache::vhost::base { "hugs.$::domain":
+    apache::vhost::base { "hugs.${::domain}":
         location => $vhostdir,
     }
 
diff --git a/deployment/websites/manifests/nav.pp b/deployment/websites/manifests/nav.pp
index d0a6e295..4e3f0330 100644
--- a/deployment/websites/manifests/nav.pp
+++ b/deployment/websites/manifests/nav.pp
@@ -1,8 +1,8 @@
 class websites::nav {
     include websites::base
-    $vhost = "nav.$::domain"
+    $vhost = "nav.${::domain}"
     $vhostdir = "$websites::base::webdatadir/${vhost}"
-    $git_location = "git://git.$::domain/web/nav"
+    $git_location = "git://git.${::domain}/web/nav"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
diff --git a/deployment/websites/manifests/perl.pp b/deployment/websites/manifests/perl.pp
index ec48c5a3..13bafb15 100644
--- a/deployment/websites/manifests/perl.pp
+++ b/deployment/websites/manifests/perl.pp
@@ -1,6 +1,6 @@
 class websites::perl {
     include websites::base
-    $vhost    = "perl.$::domain"
+    $vhost    = "perl.${::domain}"
     $vhostdir = "$websites::base::webdatadir/${vhost}"
     $statsdir = "${vhostdir}/stats"
     $login    = 'pkgcpan'
diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp
index afb923c8..91ad968b 100644
--- a/deployment/websites/manifests/releases.pp
+++ b/deployment/websites/manifests/releases.pp
@@ -1,8 +1,8 @@
 class websites::releases {
     include websites::base
-    $vhost = "releases.$::domain"
+    $vhost = "releases.${::domain}"
     $vhostdir = "$websites::base::webdatadir/${vhost}"
-    $git_location = "git://git.$::domain/web/releases"
+    $git_location = "git://git.${::domain}/web/releases"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
diff --git a/deployment/websites/manifests/start.pp b/deployment/websites/manifests/start.pp
index d73b4f9c..ed0d4adb 100644
--- a/deployment/websites/manifests/start.pp
+++ b/deployment/websites/manifests/start.pp
@@ -1,6 +1,6 @@
 class websites::start {
     include websites::base
-    apache::vhost_redirect { "start.$::domain":
-        url => "http://www.$::domain/community/",
+    apache::vhost_redirect { "start.${::domain}":
+        url => "http://www.${::domain}/community/",
     }
 }
diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp
index f2efa792..55a7e596 100644
--- a/deployment/websites/manifests/static.pp
+++ b/deployment/websites/manifests/static.pp
@@ -1,8 +1,8 @@
 class websites::static {
     include websites::base
-    $vhostdir = "$websites::base::webdatadir/static.$::domain"
+    $vhostdir = "$websites::base::webdatadir/static.${::domain}"
 
-    apache::vhost::other_app { "static.$::domain":
+    apache::vhost::other_app { "static.${::domain}":
         vhost_file => 'websites/vhost_static.conf',
     }
 
@@ -11,6 +11,6 @@ class websites::static {
     }
 
     git::snapshot { "${vhostdir}":
-        source => "git://git.$::domain/web/www",
+        source => "git://git.${::domain}/web/www",
     }
 }
diff --git a/deployment/websites/manifests/svn.pp b/deployment/websites/manifests/svn.pp
index 650442dc..d8e87f64 100644
--- a/deployment/websites/manifests/svn.pp
+++ b/deployment/websites/manifests/svn.pp
@@ -1,5 +1,5 @@
 class websites::svn {
-    apache::vhost_redirect { "svn.$::domain":
-        url => "http://svnweb.$::domain/",
+    apache::vhost_redirect { "svn.${::domain}":
+        url => "http://svnweb.${::domain}/",
     }
 }
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index 0a84f7e9..6a3d9963 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -1,8 +1,8 @@
 class websites::www {
     include websites::base
-    $vhost = "www.$::domain"
+    $vhost = "www.${::domain}"
     $vhostdir = "$websites::base::webdatadir/${vhost}"
-    $git_location = "git://git.$::domain/web/www"
+    $git_location = "git://git.${::domain}/web/www"
 
     include apache::var
     include apache::mod::php
@@ -45,14 +45,14 @@ class websites::www {
         options  => ['FollowSymLinks'],
     }
 
-    apache::vhost_redirect { $::domain:
-        url => "http://www.$::domain/",
+    apache::vhost_redirect { ${::domain}:
+        url => "http://www.${::domain}/",
     }
 
-    apache::vhost_redirect { "ssl_$::domain":
+    apache::vhost_redirect { "ssl_${::domain}":
         use_ssl => true,
-        vhost   => $::domain,
-        url     => "https://www.$::domain/",
+        vhost   => ${::domain},
+        url     => "https://www.${::domain}/",
     }
 
     package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: }
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp
index b3c8f04c..c34b06d5 100644
--- a/deployment/wikis/manifests/init.pp
+++ b/deployment/wikis/manifests/init.pp
@@ -10,7 +10,7 @@ class wikis {
     }
 
     git::snapshot { $wikis_templates:
-        source => "git://git.$::domain/web/templates/mediawiki"
+        source => "git://git.${::domain}/web/templates/mediawiki"
     }
 
     $wiki_languages = [ 'en','de', 'fr' ]
@@ -20,11 +20,11 @@ class wikis {
         skinsdir      => "${wikis_templates}/skins",
     }
 
-    apache::vhost::redirect_ssl { "wiki.$::domain": }
+    apache::vhost::redirect_ssl { "wiki.${::domain}": }
 
-    apache::vhost::base { "ssl_wiki.$::domain":
+    apache::vhost::base { "ssl_wiki.${::domain}":
         use_ssl => true,
-        vhost   => "wiki.$::domain",
+        vhost   => "wiki.${::domain}",
         content => template('wikis/wiki_vhost.conf'),
     }
 }
-- 
cgit v1.2.1