use consistent domain references

57 files changed, 140 insertions, 139 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
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'),
     }
 }
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp
index 1f4c469c..f62829f2 100644
--- a/manifests/nodes/alamut.pp
+++ b/manifests/nodes/alamut.pp
@@ -31,28 +31,28 @@ node alamut {
     host { 'friteuse':
         ensure       => 'present',
         ip           => '192.168.122.131',
-        host_aliases => [ "friteuse.$domain", "forums.$domain" ],
+        host_aliases => [ "friteuse.${::domain}", "forums.${::domain}" ],
     }
 
     # to create all phpbb database on alamut
     phpbb::databases { $fqdn: }
 
-    apache::vhost::redirect_ssl { "forums.$domain": }
-    apache::vhost_redirect { "forum.$domain":
-        url => "https://forums.$domain/",
+    apache::vhost::redirect_ssl { "forums.${::domain}": }
+    apache::vhost_redirect { "forum.${::domain}":
+        url => "https://forums.${::domain}/",
     }
-    apache::vhost_redirect { "ssl_forum.$domain":
-        url     => "https://forums.$domain/",
-        vhost   => "forum.$domain",
+    apache::vhost_redirect { "ssl_forum.${::domain}":
+        url     => "https://forums.${::domain}/",
+        vhost   => "forum.${::domain}",
         use_ssl => true,
     }
 
     # connect to ssl so the proxy do not shoke if trying to
     # enforce ssl ( note that this has not been tested, maybe this
     # is uneeded )
-    apache::vhost::reverse_proxy { "ssl_forums.$domain":
-        url     => "https://forums.$domain/",
-        vhost   => "forums.$domain",
+    apache::vhost::reverse_proxy { "ssl_forums.${::domain}":
+        url     => "https://forums.${::domain}/",
+        vhost   => "forums.${::domain}",
         use_ssl => true,
         content => '
         RewriteEngine On
@@ -76,7 +76,7 @@ node alamut {
     include gitmirror
 
     include xymon::server
-    apache::vhost_simple { "xymon.$domain":
+    apache::vhost_simple { "xymon.${::domain}":
         location => '/var/lib/xymon/www',
     }
 
@@ -106,28 +106,28 @@ node alamut {
     include websites::nav
 
     class { 'mgapeople':
-        ldap_server => 'ldap.mageia.org',
+        ldap_server => "ldap.${::domain}",
         binddn      => 'cn=mgapeople-alamut,ou=System Accounts,dc=mageia,dc=org',
         bindpw      => extlookup('mgapeople_ldap','x'),
-        vhost       => 'people.mageia.org',
-        vhostdir    => '/var/www/vhosts/people.mageia.org',
-        maintdburl  => 'http://pkgsubmit.mageia.org/data/maintdb.txt',
+        vhost       => "people.${::domain}",
+        vhostdir    => "/var/www/vhosts/people.${::domain}",
+        maintdburl  => "http://pkgsubmit.${::domain}/data/maintdb.txt",
     }
 
     class { 'mga-treasurer':
-        vhost    => 'treasurer.mageia.org',
-        vhostdir => '/var/www/vhosts/treasurer.mageia.org',
+        vhost    => "treasurer.${::domain}",
+        vhostdir => "/var/www/vhosts/treasurer.${::domain}",
     }
 
     # Forward ports to arm1 and arm2 ssh, to access them from outside
     xinetd::port_forward {'forward_arm1':
-        target_ip   => 'arm1.mageia.org',
+        target_ip   => "arm1.${::domain}",
         target_port => '22',
         port        => '4251',
         proto       => 'tcp',
     }
     xinetd::port_forward {'forward_arm2':
-        target_ip   => 'arm2.mageia.org',
+        target_ip   => "arm2.${::domain}",
         target_port => '22',
         port        => '4252',
         proto       => 'tcp',
diff --git a/manifests/nodes/valstar.pp b/manifests/nodes/valstar.pp
index 2f305220..a96a0f9f 100644
--- a/manifests/nodes/valstar.pp
+++ b/manifests/nodes/valstar.pp
@@ -36,11 +36,11 @@ node valstar {
     include websites::git
 
     class { 'mga-advisories':
-        vhost => 'advisories.mageia.org',
+        vhost => "advisories.${::domain}",
     }
 
     git::snapshot { '/etc/puppet':
-        source => 'git://git.mageia.org/infrastructure/puppet/'
+        source => "git://git.${::domain}/infrastructure/puppet/"
     }
 
     mirror_cleaner::orphans {  'cauldron':
@@ -48,7 +48,7 @@ node valstar {
     }
 
     class { 'mgagit':
-        ldap_server => 'ldap.mageia.org',
+        ldap_server => "ldap.${::domain}",
         binddn      => 'cn=mgagit-valstar,ou=System Accounts,dc=mageia,dc=org',
         bindpw      => extlookup('mgagit_ldap','x'),
     }
diff --git a/modules/bcd/manifests/web.pp b/modules/bcd/manifests/web.pp
index 97c697e5..d670cf5d 100644
--- a/modules/bcd/manifests/web.pp
+++ b/modules/bcd/manifests/web.pp
@@ -2,7 +2,7 @@ class bcd::web {
     include bcd::base
     $location = "${bcd::home}/public_html"
 
-    apache::vhost::base { "bcd.$::domain":
+    apache::vhost::base { "bcd.${::domain}":
         location => $location,
         content  => template('bcd/vhost_bcd.conf'),
     }
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index 08d86d0b..61018f73 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -1,11 +1,11 @@
 class blog {
     class base {
-        $blog_domain = "blog.$::domain"
+        $blog_domain = "blog.${::domain}"
         $blog_location = "/var/www/vhosts/${blog_domain}"
         $blog_db_backupdir = '/var/lib/backups/blog_db'
         $blog_files_backupdir = '/var/lib/backups/blog_files'
-        $blog_newpost_email_to = 'i18n-reports@ml.mageia.org'
-        $blog_newpost_email_from = 'Mageia Blog bot <blog@mageia.org>'
+        $blog_newpost_email_to = "i18n-reports@ml.${::domain}"
+        $blog_newpost_email_from = "Mageia Blog bot <blog@${::domain}>"
 
         user { 'blog':
             groups  => apache,
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 188cb0b7..06c53abc 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -36,7 +36,7 @@ class bugzilla {
         webapp_file => 'bugzilla/webapp_bugzilla.conf',
     }
 
-    $bugs_vhost = "bugs.$::domain"
+    $bugs_vhost = "bugs.${::domain}"
     $vhost_root = '/usr/share/bugzilla/www'
 
     apache::vhost::redirect_ssl { $bugs_vhost: }
@@ -50,7 +50,7 @@ class bugzilla {
     }
 
     git::snapshot { $extension_location:
-      source  => "git://git.$::domain/web/templates/bugzilla",
+      source  => "git://git.${::domain}/web/templates/bugzilla",
       require => Package['bugzilla'],
     }
 
diff --git a/modules/buildsystem/manifests/release.pp b/modules/buildsystem/manifests/release.pp
index c1ff6988..485096f7 100644
--- a/modules/buildsystem/manifests/release.pp
+++ b/modules/buildsystem/manifests/release.pp
@@ -1,6 +1,6 @@
 class buildsystem::release {
     git::snapshot { '/root/release':
-        source => "git://git.$::domain/software/infrastructure/release",
+        source => "git://git.${::domain}/software/infrastructure/release",
     }
 
     package { 'hardlink': }
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp
index ca4bbdb8..aa303191 100644
--- a/modules/buildsystem/manifests/var/distros.pp
+++ b/modules/buildsystem/manifests/var/distros.pp
@@ -75,7 +75,7 @@
 #         # list of IP or hostnames allowed to access this distro on the
 #         # repository. If you don't want to filter allowed IPs, don't set
 #         # this value
-#         'repo_allow_from' => [ '127.0.0.1', '10.0.0.1', '.mageia.org' ],
+#         'repo_allow_from' => [ '127.0.0.1', '10.0.0.1', ".${::domain}" ],
 #         Optionally, the distribution can be based on the repos from an other
 #         distribution. In this example we're saying that the distribution is
 #         based on 2/core/release and 2/core/updates.
diff --git a/modules/buildsystem/manifests/var/maintdb.pp b/modules/buildsystem/manifests/var/maintdb.pp
index 0c3562a1..e0079e40 100644
--- a/modules/buildsystem/manifests/var/maintdb.pp
+++ b/modules/buildsystem/manifests/var/maintdb.pp
@@ -1,5 +1,5 @@
 class buildsystem::var::maintdb(
-    $hostname = "maintdb.$::domain",
+    $hostname = "maintdb.${::domain}",
     $login = 'maintdb',
     $homedir = '/var/lib/maintdb'
 ) {
diff --git a/modules/buildsystem/manifests/var/webstatus.pp b/modules/buildsystem/manifests/var/webstatus.pp
index c3891d9e..21f8d59f 100644
--- a/modules/buildsystem/manifests/var/webstatus.pp
+++ b/modules/buildsystem/manifests/var/webstatus.pp
@@ -14,8 +14,8 @@
 #   path of the directory where the themes are located. If you want
 #   to use a theme not included in webstatus, you need to change this.
 class buildsystem::var::webstatus(
-    $git_url = "git://git.mageia.org/web/pkgsubmit",
-    $hostname = "pkgsubmit.$::domain",
+    $git_url = "git://git.${::domain}/web/pkgsubmit",
+    $hostname = "pkgsubmit.${::domain}",
     $location = '/var/www/bs',
     $package_commit_url,
     $max_modified = '2',
diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index 41ba5d13..a0f83ad1 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -1,6 +1,6 @@
 class catdap {
 
-    $upstream_git = 'git://git.mageia.org/web/identity'
+    $upstream_git = "git://git.${::domain}/web/identity"
 
     # TODO switch to a proper rpm packaging
     $rpm_requirement = ['perl-Catalyst-Runtime',
@@ -36,13 +36,13 @@ class catdap {
 
     $ldap_password = extlookup('catdap_ldap','x')
 
-    catdap::snapshot { "identity.$::domain":
+    catdap::snapshot { "identity.${::domain}":
         location     => '/var/www/identity',
         git_location => $upstream_git,
         git_branch   => 'topic/production',
     }
 
-    catdap::snapshot { "identity-trunk.$::domain":
+    catdap::snapshot { "identity-trunk.${::domain}":
         location     => '/var/www/identity-trunk',
         git_location => $upstream_git,
     }
diff --git a/modules/cgit/manifests/init.pp b/modules/cgit/manifests/init.pp
index a7591813..58b80ede 100644
--- a/modules/cgit/manifests/init.pp
+++ b/modules/cgit/manifests/init.pp
@@ -15,7 +15,7 @@ class cgit {
         content => template('cgit/filter.commit-links.sh'),
     }
 
-    apache::vhost::base { "gitweb.$::domain":
+    apache::vhost::base { "gitweb.${::domain}":
         content => template('cgit/vhost.conf')
     }
 }
diff --git a/modules/dashboard/manifests/init.pp b/modules/dashboard/manifests/init.pp
index c3216cbb..34ef41b3 100644
--- a/modules/dashboard/manifests/init.pp
+++ b/modules/dashboard/manifests/init.pp
@@ -3,7 +3,7 @@ class dashboard {
     $dashboard_home_dir = "/var/lib/${dashboard_login}"
     $dashboard_dir = "${dashboard_home_dir}/dashboard"
     $dashboard_bindir = "${dashboard_home_dir}/bin"
-    $dashboard_wwwdir = "/var/www/vhosts/dashboard.$::domain"
+    $dashboard_wwwdir = "/var/www/vhosts/dashboard.${::domain}"
 
     user { $dashboard_login:
         comment => 'dashboard system user',
@@ -11,7 +11,7 @@ class dashboard {
     }
 
     git::snapshot { $dashboard_dir:
-        source => "git://git.$::domain/web/generators/dashboard",
+        source => "git://git.${::domain}/web/generators/dashboard",
     }
 
     package { 'php-cli': }
@@ -31,7 +31,7 @@ class dashboard {
         content => template('dashboard/make_report'),
     }
 
-    apache::vhost::base { "dashboard.$::domain":
+    apache::vhost::base { "dashboard.${::domain}":
         location => $dashboard_wwwdir,
     }
 
diff --git a/modules/draklive/manifests/init.pp b/modules/draklive/manifests/init.pp
index 0fce54ab..1800b6fd 100644
--- a/modules/draklive/manifests/init.pp
+++ b/modules/draklive/manifests/init.pp
@@ -34,7 +34,7 @@ class draklive {
         }
 
     git::snapshot { $config:
-        source => "git://git.$::domain/software/build-system/draklive-config",
+        source => "git://git.${::domain}/software/build-system/draklive-config",
     }
 
     cron { 'build live images':
diff --git a/modules/epoll/manifests/var.pp b/modules/epoll/manifests/var.pp
index 552c2b27..e99239ce 100644
--- a/modules/epoll/manifests/var.pp
+++ b/modules/epoll/manifests/var.pp
@@ -20,7 +20,7 @@
 #   password to connect to the database
 #
 class epoll::var (
-  $vhost       = "epoll.$::domain",
+  $vhost       = "epoll.${::domain}",
   $db_hostname = 'localhost',
   $db_name     = 'epoll',
   $db_user     = 'epoll',
diff --git a/modules/mediawiki/manifests/config.pp b/modules/mediawiki/manifests/config.pp
index 1375ea0b..559f897d 100644
--- a/modules/mediawiki/manifests/config.pp
+++ b/modules/mediawiki/manifests/config.pp
@@ -5,5 +5,5 @@ class mediawiki::config(
     $pgsql_password,
     $secretkey,
     $ldap_password,
-    $vhost = "wiki.$::domain",
+    $vhost = "wiki.${::domain}",
     $root = '/srv/wiki/') {}
diff --git a/modules/mga-advisories/manifests/init.pp b/modules/mga-advisories/manifests/init.pp
index 582b2aae..56929b6a 100644
--- a/modules/mga-advisories/manifests/init.pp
+++ b/modules/mga-advisories/manifests/init.pp
@@ -1,5 +1,5 @@
 class mga-advisories(
-  $advisories_svn = 'svn://svn.mageia.org/svn/advisories',
+  $advisories_svn = "svn://svn.${::domain}/svn/advisories",
   $vhost
 ){
   $mgaadv_login = 'mga-advisories'
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 7bdad67e..be4da721 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -1,6 +1,6 @@
 class mga-mirrors {
 
-    $vhost = "mirrors.$::domain"
+    $vhost = "mirrors.${::domain}"
 
     package { 'mga-mirrors': }
 
diff --git a/modules/mga-treasurer/manifests/init.pp b/modules/mga-treasurer/manifests/init.pp
index d41b518e..d092e982 100644
--- a/modules/mga-treasurer/manifests/init.pp
+++ b/modules/mga-treasurer/manifests/init.pp
@@ -1,5 +1,5 @@
 class mga-treasurer(
-  $grisbi_git = "git://git.$::domain/org/accounts",
+  $grisbi_git = "git://git.${::domain}/org/accounts",
   $grisbi_filename = 'mageia-accounts.gsb',
   $vhost,
   $vhostdir
diff --git a/modules/mgapeople/manifests/init.pp b/modules/mgapeople/manifests/init.pp
index c2b0e81d..7c40ab9c 100644
--- a/modules/mgapeople/manifests/init.pp
+++ b/modules/mgapeople/manifests/init.pp
@@ -1,5 +1,5 @@
 class mgapeople(
-  $site_name = 'people.mageia.org',
+  $site_name = "people.${::domain}",
   $groupbase = 'ou=Group,dc=mageia,dc=org',
   $maintdburl = undef,
   $ldap_server,
diff --git a/modules/mgasoft/manifests/init.pp b/modules/mgasoft/manifests/init.pp
index d178ebfc..956ea978 100644
--- a/modules/mgasoft/manifests/init.pp
+++ b/modules/mgasoft/manifests/init.pp
@@ -1,5 +1,5 @@
 class mgasoft(
-    $anonsvn_soft = 'svn://svn.mageia.org/svn/soft',
+    $anonsvn_soft = "svn://svn.${::domain}/svn/soft",
     $pubinfodir = '/var/lib/mgasoft/infos',
     $pubmirrordir = '/distrib/mirror/software',
     $svn_soft_publish = 'file:///svn/soft_publish',
diff --git a/modules/mirror/manifests/mageia.pp b/modules/mirror/manifests/mageia.pp
index 4b39ccb8..c14a09bb 100644
--- a/modules/mirror/manifests/mageia.pp
+++ b/modules/mirror/manifests/mageia.pp
@@ -1,7 +1,7 @@
 class mirror::mageia {
     include mirror::base
     mirrordir { 'mageia':
-        remoteurl => "rsync://rsync.$::domain/mageia",
+        remoteurl => "rsync://rsync.${::domain}/mageia",
         localdir  => '/distrib/mageia',
     }
 }
diff --git a/modules/openldap/manifests/init.pp b/modules/openldap/manifests/init.pp
index 35455d1a..b04379b9 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -3,7 +3,7 @@ class openldap {
 
     service { 'ldap':
         subscribe => Package['openldap-servers'],
-        require   => Openssl::Self_signed_cert["ldap.$::domain"],
+        require   => Openssl::Self_signed_cert["ldap.${::domain}"],
     }
 
     exec { '/etc/init.d/ldap check':
@@ -15,7 +15,7 @@ class openldap {
         ensure => directory,
     }
 
-    openssl::self_signed_cert{ "ldap.$::domain":
+    openssl::self_signed_cert{ "ldap.${::domain}":
         directory => '/etc/ssl/openldap/',
     }
 
diff --git a/modules/phpbb/manifests/base.pp b/modules/phpbb/manifests/base.pp
index 115c4592..c2328ac2 100644
--- a/modules/phpbb/manifests/base.pp
+++ b/modules/phpbb/manifests/base.pp
@@ -31,13 +31,13 @@ class phpbb::base {
     }
 
     # TODO check that everything is locked down
-    apache::vhost::base { "forums.$::domain":
+    apache::vhost::base { "forums.${::domain}":
         content => template('phpbb/forums_vhost.conf'),
     }
 
-    apache::vhost::base { "ssl_forums.$::domain":
+    apache::vhost::base { "ssl_forums.${::domain}":
         use_ssl => true,
-        vhost   => "forums.$::domain",
+        vhost   => "forums.${::domain}",
         content => template('phpbb/forums_vhost.conf'),
     }
 
diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp
index 90e01f5e..7d84ff54 100644
--- a/modules/phpbb/manifests/config.pp
+++ b/modules/phpbb/manifests/config.pp
@@ -5,7 +5,7 @@ define phpbb::config($key, $value, $database) {
         environment => ["PGDATABASE=${database}",
                         "PGUSER=$phpbb::base::user",
                         "PGPASSWORD=$phpbb::base::pgsql_password",
-                        "PGHOST=pgsql.$::domain",
+                        "PGHOST=pgsql.${::domain}",
                         "VALUE=$value"],
         require     => File['/usr/local/bin/phpbb_apply_config.pl'],
     }
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
index 486b2d3a..e717ea7f 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -10,7 +10,7 @@ define phpbb::instance() {
 
     include git::client
     exec { "git_clone ${lang}":
-        command =>"git clone git://git.$::domain/web/forums/ ${lang}",
+        command =>"git clone git://git.${::domain}/web/forums/ ${lang}",
         cwd     => $forums_dir,
         creates => "${forums_dir}/${lang}",
         require => File[$forums_dir],
@@ -59,7 +59,7 @@ define phpbb::instance() {
         "ldap_user/${lang}":
             key => 'ldap_user', value => "cn=phpbb-$::hostname,ou=System Accounts,$::dc_suffix";
         "ldap_server/${lang}":
-            key => 'ldap_server', value => "ldaps://ldap.$::domain ldaps://ldap-slave-1.$::domain";
+            key => 'ldap_server', value => "ldaps://ldap.${::domain} ldaps://ldap-slave-1.${::domain}";
         "ldap_password/${lang}":
             key => 'ldap_password', value => $ldap_password;
         "ldap_base_dn/${lang}":
@@ -71,9 +71,9 @@ define phpbb::instance() {
         "ldap_uid/${lang}":
             key => 'ldap_uid', value => 'uid';
         "cookie_domain/${lang}":
-            key => 'cookie_domain', value => "forums.$::domain";
+            key => 'cookie_domain', value => "forums.${::domain}";
         "server_name/${lang}":
-            key => 'server_name', value => "forums.$::domain";
+            key => 'server_name', value => "forums.${::domain}";
         "default_lang/${lang}":
             key => 'default_lang', value => $lang;
     }
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index a5e930b5..88e36a6f 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -6,7 +6,7 @@ class planet {
         home    => '/var/lib/planet',
     }
 
-    $vhost = "planet.$::domain"
+    $vhost = "planet.${::domain}"
     $location = "/var/www/vhosts/${vhost}"
 
     include apache::mod::php
diff --git a/modules/postfix/manifests/server/primary.pp b/modules/postfix/manifests/server/primary.pp
index 3f089685..45b8fda6 100644
--- a/modules/postfix/manifests/server/primary.pp
+++ b/modules/postfix/manifests/server/primary.pp
@@ -3,6 +3,7 @@ class postfix::server::primary inherits postfix::server {
     package { 'postfix-ldap': }
 
     # council is here until we fully decide who has aliases in com team,
+
     # see https://bugs.mageia.org/show_bug.cgi?id=1345
     # alumini is a special group for tracking previous members of
     # the project, so they keep their aliases for a time
diff --git a/modules/postgresql/manifests/server.pp b/modules/postgresql/manifests/server.pp
index 29fa30d0..8b92bb2b 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -21,7 +21,7 @@ class postgresql::server {
         refreshonly => true,
     }
 
-    openssl::self_signed_splitted_cert { "pgsql.$::domain":
+    openssl::self_signed_splitted_cert { "pgsql.${::domain}":
         filename  => 'server',
         directory => $postgresql::var::pgsql_data,
         owner     => 'postgres',
diff --git a/modules/sympa/manifests/server.pp b/modules/sympa/manifests/server.pp
index 9df9f8ca..7eca4dca 100644
--- a/modules/sympa/manifests/server.pp
+++ b/modules/sympa/manifests/server.pp
@@ -57,7 +57,7 @@ class sympa::server(
     }
 
     git::snapshot { '/etc/sympa/web_tt2':
-        source => "git://git.$::domain/web/templates/sympa",
+        source => "git://git.${::domain}/web/templates/sympa",
     }
 
     file { ['/etc/sympa/lists_xml/',
diff --git a/modules/sympa/manifests/variable.pp b/modules/sympa/manifests/variable.pp
index 274c4bb8..26f60294 100644
--- a/modules/sympa/manifests/variable.pp
+++ b/modules/sympa/manifests/variable.pp
@@ -1,3 +1,3 @@
 class sympa::variable {
-    $vhost = "ml.$::domain"
+    $vhost = "ml.${::domain}"
 }
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index 51c57ca1..282b3f9a 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -32,10 +32,10 @@ class transifex {
               '50-project.conf']: }
 
     git::snapshot { $templates_dir:
-        source => "git://git.$::domain/web/templates/transifex"
+        source => "git://git.${::domain}/web/templates/transifex"
     }
 
-    apache::vhost::django_app { "transifex.$::domain":
+    apache::vhost::django_app { "transifex.${::domain}":
         module      => 'transifex',
         use_ssl     => true,
         module_path => ['/usr/share/transifex','/usr/share','/usr/local/lib/'],
@@ -50,7 +50,7 @@ class transifex {
         require => Package['transifex'],
     }
 
-    apache::vhost::redirect_ssl { "transifex.$::domain": }
+    apache::vhost::redirect_ssl { "transifex.${::domain}": }
 
     # the group are mapped from ldap, since AUTH_LDAP_FIND_GROUP_PERMS is set to yes
     # but the group need to exist in django first
diff --git a/modules/viewvc/manifests/var.pp b/modules/viewvc/manifests/var.pp
index c2fcef5b..9027d808 100644
--- a/modules/viewvc/manifests/var.pp
+++ b/modules/viewvc/manifests/var.pp
@@ -3,7 +3,7 @@
 # $tmpl_viewvc_conf:
 #   path to /etc/viewvc.conf template file
 class viewvc::var(
-    $hostname = "svnweb.$::domain",
+    $hostname = "svnweb.${::domain}",
     $tmpl_viewvc_conf = 'viewvc/viewvc.conf'
 ) {
 }
diff --git a/modules/youri-check/manifests/init.pp b/modules/youri-check/manifests/init.pp
index 25d70875..a57b67e5 100644
--- a/modules/youri-check/manifests/init.pp
+++ b/modules/youri-check/manifests/init.pp
@@ -1,6 +1,6 @@
 class youri-check {
     class base {
-        $vhost = "check.$domain"
+        $vhost = "check.${::domain}"
         $user = 'youri'
         $home = '/var/lib/youri'