variable enclosing fixes

22 files changed, 35 insertions, 35 deletions

diff --git a/deployment/websites/manifests/archives.pp b/deployment/websites/manifests/archives.pp
index ea66f3b8..825e082b 100644
--- a/deployment/websites/manifests/archives.pp
+++ b/deployment/websites/manifests/archives.pp
@@ -1,7 +1,7 @@
 class websites::archives {
     include websites::base
     $vhost = "archives.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/archives"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/doc.pp b/deployment/websites/manifests/doc.pp
index 46e1230d..01474af2 100644
--- a/deployment/websites/manifests/doc.pp
+++ b/deployment/websites/manifests/doc.pp
@@ -1,7 +1,7 @@
 class websites::doc {
     include websites::base
     $vhost = "doc.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/doc"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/hugs.pp b/deployment/websites/manifests/hugs.pp
index 27a554a7..95246464 100644
--- a/deployment/websites/manifests/hugs.pp
+++ b/deployment/websites/manifests/hugs.pp
@@ -1,7 +1,7 @@
 class websites::hugs {
     include websites::base
 
-    $vhostdir = "$websites::base::webdatadir/hugs.${::domain}"
+    $vhostdir = "${websites::base::webdatadir}/hugs.${::domain}"
     $git_location = "git://git.${::domain}/web/hugs"
 
     apache::vhost::base { "hugs.${::domain}":
diff --git a/deployment/websites/manifests/nav.pp b/deployment/websites/manifests/nav.pp
index 4e3f0330..84323c26 100644
--- a/deployment/websites/manifests/nav.pp
+++ b/deployment/websites/manifests/nav.pp
@@ -1,7 +1,7 @@
 class websites::nav {
     include websites::base
     $vhost = "nav.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/nav"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/perl.pp b/deployment/websites/manifests/perl.pp
index 13bafb15..1911588b 100644
--- a/deployment/websites/manifests/perl.pp
+++ b/deployment/websites/manifests/perl.pp
@@ -1,7 +1,7 @@
 class websites::perl {
     include websites::base
     $vhost    = "perl.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $statsdir = "${vhostdir}/stats"
     $login    = 'pkgcpan'
     $homedir  = "/var/lib/${login}"
diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp
index 91ad968b..2b25c8ec 100644
--- a/deployment/websites/manifests/releases.pp
+++ b/deployment/websites/manifests/releases.pp
@@ -1,7 +1,7 @@
 class websites::releases {
     include websites::base
     $vhost = "releases.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/releases"
 
     apache::vhost::base { $vhost:
diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp
index 55a7e596..66711329 100644
--- a/deployment/websites/manifests/static.pp
+++ b/deployment/websites/manifests/static.pp
@@ -1,6 +1,6 @@
 class websites::static {
     include websites::base
-    $vhostdir = "$websites::base::webdatadir/static.${::domain}"
+    $vhostdir = "${websites::base::webdatadir}/static.${::domain}"
 
     apache::vhost::other_app { "static.${::domain}":
         vhost_file => 'websites/vhost_static.conf',
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index 6a3d9963..8d5443d8 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -1,7 +1,7 @@
 class websites::www {
     include websites::base
     $vhost = "www.${::domain}"
-    $vhostdir = "$websites::base::webdatadir/${vhost}"
+    $vhostdir = "${websites::base::webdatadir}/${vhost}"
     $git_location = "git://git.${::domain}/web/www"
 
     include apache::var
@@ -45,13 +45,13 @@ class websites::www {
         options  => ['FollowSymLinks'],
     }
 
-    apache::vhost_redirect { ${::domain}:
+    apache::vhost_redirect { "${::domain}":
         url => "http://www.${::domain}/",
     }
 
     apache::vhost_redirect { "ssl_${::domain}":
         use_ssl => true,
-        vhost   => ${::domain},
+        vhost   => "${::domain}",
         url     => "https://www.${::domain}/",
     }
 
diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp
index f1c4a2c5..25b49f88 100644
--- a/modules/buildsystem/manifests/var/youri.pp
+++ b/modules/buildsystem/manifests/var/youri.pp
@@ -65,7 +65,7 @@ class buildsystem::var::youri(
                 'class' => 'Youri::Repository::Mageia',
                 'options' => {
                     'install_root' => $buildsystem::var::repository::bootstrap_reporoot,
-                    'upload_root' => '${home}/uploads/',
+                    'upload_root'  => "${home}/uploads/",
                     'archive_root' => $packages_archivedir,
                     'upload_state' => 'queue',
                     'queue' => 'queue',
@@ -270,7 +270,7 @@ class buildsystem::var::youri(
                 'class' => 'Youri::Repository::Mageia',
                 'options' => {
                     'install_root' => $buildsystem::var::repository::bootstrap_reporoot,
-                    'upload_root' => '${home}/uploads/',
+                    'upload_root'  => "${home}/uploads/",
                     'upload_state' => 'todo done queue',
                     'queue' => 'todo',
                     'noarch' => 'i586',
@@ -297,8 +297,8 @@ class buildsystem::var::youri(
                         'user' => $buildsystem::var::scheduler::login,
                         'keep_svn_release' => 'yes',
                         'uphost' => $buildsystem::var::scheduler::pkg_uphost,
-                        'root' => '${home}/uploads',
-                        'ssh_key' => '${home}/.ssh/id_rsa',
+                        'root'   => "${home}/uploads",
+                        'ssh_key' => "${home}/.ssh/id_rsa",
                     },
                 },
                 'dependencies' => {
@@ -306,8 +306,8 @@ class buildsystem::var::youri(
                     'options' => {
                         'user' => $buildsystem::var::scheduler::login,
                         'uphost' => $buildsystem::var::scheduler::pkg_uphost,
-                        'root' => '${home}/uploads',
-                        'ssh_key' => '${home}/.ssh/id_rsa',
+                        'root' => "${home}/uploads",
+                        'ssh_key' => "${home}/.ssh/id_rsa",
                     },
                 },
                 'rpminfo' => {
@@ -315,8 +315,8 @@ class buildsystem::var::youri(
                     'options' => {
                         'user' => $buildsystem::var::scheduler::login,
                         'uphost' => $buildsystem::var::scheduler::pkg_uphost,
-                        'root' => '${home}/uploads',
-                        'ssh_key' => '${home}/.ssh/id_rsa',
+                        'root' => "${home}/uploads",
+                        'ssh_key' => "${home}/.ssh/id_rsa",
                     },
                 },
                 'ulri' => {
@@ -324,7 +324,7 @@ class buildsystem::var::youri(
                     'options' => {
                         'user' => $buildsystem::var::scheduler::login,
                         'uphost' => $buildsystem::var::scheduler::pkg_uphost,
-                        'ssh_key' => '${home}/.ssh/id_rsa',
+                        'ssh_key' => "${home}/.ssh/id_rsa",
                     },
                 },
             },
diff --git a/modules/catdap/manifests/snapshot.pp b/modules/catdap/manifests/snapshot.pp
index e5aa734f..35ca692e 100644
--- a/modules/catdap/manifests/snapshot.pp
+++ b/modules/catdap/manifests/snapshot.pp
@@ -1,5 +1,5 @@
 define catdap::snapshot($location, $git_location, $git_branch = 'master') {
-    file { "$location/catdap_local.yml":
+    file { "${location}/catdap_local.yml":
         group   => apache,
         mode    => '0640',
         content => template('catdap/catdap_local.yml'),
diff --git a/modules/mediawiki/manifests/instance.pp b/modules/mediawiki/manifests/instance.pp
index 54f4d969..ac962fa6 100644
--- a/modules/mediawiki/manifests/instance.pp
+++ b/modules/mediawiki/manifests/instance.pp
@@ -6,7 +6,7 @@ define mediawiki::instance( $title,
 
     $path = $name
     $lang = $name
-    $wiki_root = "$mediawiki::base::root/${path}"
+    $wiki_root = "${mediawiki::base::root}/${path}"
     $db_name = "mediawiki_${name}"
     $db_user = $mediawiki::base::user
     $db_password = $mediawiki::config::pgsql_password
diff --git a/modules/mirror/manifests/mirrordir.pp b/modules/mirror/manifests/mirrordir.pp
index c4c2c543..2100bc6c 100644
--- a/modules/mirror/manifests/mirrordir.pp
+++ b/modules/mirror/manifests/mirrordir.pp
@@ -2,7 +2,7 @@ define mirror::mirrordir ($remoteurl,
                           $localdir,
                           $rsync_options='-avH --delete') {
     include mirror::base
-    $lockfile = "$mirror::base::locksdir/${name}"
+    $lockfile = "${mirror::base::locksdir}/${name}"
 
     file { $localdir:
         ensure => directory,
diff --git a/modules/openldap/manifests/slave.pp b/modules/openldap/manifests/slave.pp
index a3559ef8..7b22587f 100644
--- a/modules/openldap/manifests/slave.pp
+++ b/modules/openldap/manifests/slave.pp
@@ -2,7 +2,7 @@ class openldap::slave($rid) inherits openldap {
 
     @@openldap::exported_slave { $rid: }
 
-    $sync_password = extlookup("ldap_syncuser-$::hostname",'x')
+    $sync_password = extlookup("ldap_syncuser-${::hostname}",'x')
 
     # same access rights as master
     Openldap::Config['/etc/openldap/mandriva-dit-access.conf'] {
diff --git a/modules/openssh/manifests/server.pp b/modules/openssh/manifests/server.pp
index ce60646b..a162c8d5 100644
--- a/modules/openssh/manifests/server.pp
+++ b/modules/openssh/manifests/server.pp
@@ -1,6 +1,6 @@
 class openssh::server {
     # some trick to manage sftp server, who is arch dependent on mdv
-    $path_to_sftp = "$::lib_dir/ssh/"
+    $path_to_sftp = "${::lib_dir}/ssh/"
 
     package { 'openssh-server': }
 
diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp
index 7d84ff54..553b0f74 100644
--- a/modules/phpbb/manifests/config.pp
+++ b/modules/phpbb/manifests/config.pp
@@ -3,10 +3,10 @@ define phpbb::config($key, $value, $database) {
         command     => "/usr/local/bin/phpbb_apply_config.pl ${key}",
         user        => 'root',
         environment => ["PGDATABASE=${database}",
-                        "PGUSER=$phpbb::base::user",
-                        "PGPASSWORD=$phpbb::base::pgsql_password",
+                        "PGUSER=${phpbb::base::user}",
+                        "PGPASSWORD=${phpbb::base::pgsql_password}",
                         "PGHOST=pgsql.${::domain}",
-                        "VALUE=$value"],
+                        "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 e717ea7f..d688b019 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -57,13 +57,13 @@ define phpbb::instance() {
 
     phpbb::config {
         "ldap_user/${lang}":
-            key => 'ldap_user', value => "cn=phpbb-$::hostname,ou=System Accounts,$::dc_suffix";
+            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}";
         "ldap_password/${lang}":
             key => 'ldap_password', value => $ldap_password;
         "ldap_base_dn/${lang}":
-            key => 'ldap_base_dn', value => "ou=People,$::dc_suffix";
+            key => 'ldap_base_dn', value => "ou=People,${::dc_suffix}";
         "auth_method/${lang}":
             key => 'auth_method', value => 'ldap';
         "ldap_mail/${lang}":
diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp
index b8c671fb..d566681c 100644
--- a/modules/puppet/manifests/master.pp
+++ b/modules/puppet/manifests/master.pp
@@ -6,7 +6,7 @@ class puppet::master inherits puppet {
 #   do not enable until bug 4591 is solved
 #    include puppet::thin
 
-    package { ["ruby-$puppet::stored_config::database", 'ruby-rails']: }
+    package { ["ruby-${puppet::stored_config::database}", 'ruby-rails']: }
 
     File['/etc/puppet/puppet.conf'] {
         content => template('puppet/puppet.conf',
diff --git a/modules/subversion/manifests/repository.pp b/modules/subversion/manifests/repository.pp
index f7dbaba2..c5d8509b 100644
--- a/modules/subversion/manifests/repository.pp
+++ b/modules/subversion/manifests/repository.pp
@@ -59,7 +59,7 @@ define subversion::repository($group = 'svn',
     }
 
     file { "${name}/hooks/pre-revprop-change":
-        ensure  => "$subversion::server::local_dir/pre-revprop-change",
+        ensure  => "${subversion::server::local_dir}/pre-revprop-change",
         mode    => '0755',
         require => File["${name}/hooks/pre-commit"],
     }
diff --git a/modules/sympa/manifests/list.pp b/modules/sympa/manifests/list.pp
index ed0d55e2..a77d8ab1 100644
--- a/modules/sympa/manifests/list.pp
+++ b/modules/sympa/manifests/list.pp
@@ -20,7 +20,7 @@ define sympa::list( $subject,
         require => Package[sympa],
     }
 
-    exec { "sympa.pl --create_list --robot=$sympa::variable::vhost --input_file=${xml_file}":
+    exec { "sympa.pl --create_list --robot=${sympa::variable::vhost} --input_file=${xml_file}":
         require => File[$xml_file],
         creates => "/var/lib/sympa/expl/${name}",
         before  => File["/var/lib/sympa/expl/${name}/config"],
diff --git a/modules/sympa/manifests/scenario/sender_restricted.pp b/modules/sympa/manifests/scenario/sender_restricted.pp
index 0ca9face..c69d3669 100644
--- a/modules/sympa/manifests/scenario/sender_restricted.pp
+++ b/modules/sympa/manifests/scenario/sender_restricted.pp
@@ -3,7 +3,7 @@ define sympa::scenario::sender_restricted(
     $ldap_group       = false,
     $allow_subscriber = false
 ) {
-    file { "/etc/sympa/scenari/send.restricted_$name":
+    file { "/etc/sympa/scenari/send.restricted_${name}":
         content => template('sympa/scenari/sender.restricted')
     }
 }
diff --git a/modules/xymon/manifests/client.pp b/modules/xymon/manifests/client.pp
index 58d44257..551d5775 100644
--- a/modules/xymon/manifests/client.pp
+++ b/modules/xymon/manifests/client.pp
@@ -3,7 +3,7 @@ class xymon::client {
 
     service { 'xymon-client':
         hasstatus => false,
-        status    => "$::lib_dir/xymon/client/runclient.sh status",
+        status    => "${::lib_dir}/xymon/client/runclient.sh status",
         require   => Package['xymon-client'],
     }
 
diff --git a/modules/xymon/manifests/server.pp b/modules/xymon/manifests/server.pp
index 223dab6b..fb1f1a80 100644
--- a/modules/xymon/manifests/server.pp
+++ b/modules/xymon/manifests/server.pp
@@ -3,7 +3,7 @@ class xymon::server {
 
     service { 'xymon':
         hasstatus => false,
-        status    => "su xymon -c '$::lib_dir/xymon/server/hobbit.sh status'",
+        status    => "su xymon -c '${::lib_dir}/xymon/server/hobbit.sh status'",
         require   => Package['xymon'],
     }