lint fixes for phpbb

5 files changed, 27 insertions, 27 deletions

diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp
index 52bd5419..90e01f5e 100644
--- a/modules/phpbb/manifests/config.pp
+++ b/modules/phpbb/manifests/config.pp
@@ -1,8 +1,8 @@
 define phpbb::config($key, $value, $database) {
-    exec { "phpbb_apply $name":
-        command     => "/usr/local/bin/phpbb_apply_config.pl $key",
+    exec { "phpbb_apply ${name}":
+        command     => "/usr/local/bin/phpbb_apply_config.pl ${key}",
         user        => 'root',
-        environment => ["PGDATABASE=$database",
+        environment => ["PGDATABASE=${database}",
                         "PGUSER=$phpbb::base::user",
                         "PGPASSWORD=$phpbb::base::pgsql_password",
                         "PGHOST=pgsql.$::domain",
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
index 1ca8e57b..486b2d3a 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -2,27 +2,27 @@ define phpbb::instance() {
     include phpbb::base
 
     $lang = $name
-    $database = "${phpbb::base::db}_$lang"
+    $database = "${phpbb::base::db}_${lang}"
 
     $user = $phpbb::base::user
     $pgsql_password = $phpbb::base::pgsql_password
     $forums_dir = $phpbb::base::forums_dir
 
     include git::client
-    exec { "git_clone $lang":
-        command =>"git clone git://git.$::domain/web/forums/ $lang",
+    exec { "git_clone ${lang}":
+        command =>"git clone git://git.$::domain/web/forums/ ${lang}",
         cwd     => $forums_dir,
-        creates => "$forums_dir/$lang",
+        creates => "${forums_dir}/${lang}",
         require => File[$forums_dir],
-        notify  => Exec["rm_install $lang"],
+        notify  => Exec["rm_install ${lang}"],
     }
 
     # remove this or the forum will not work ( 'board disabled' )
     # maybe it would be better to move this elsehwere, I
     # am not sure ( and in any case, that's still in git )
-    exec { "rm_install $lang":
-        command => "rm -Rf $forums_dir/$lang/phpBB/install",
-        onlyif  => "test -d $forums_dir/$lang/phpBB/install",
+    exec { "rm_install ${lang}":
+        command => "rm -Rf ${forums_dir}/${lang}/phpBB/install",
+        onlyif  => "test -d ${forums_dir}/${lang}/phpBB/install",
     }
 
     # list found by reading ./install/install_install.php
@@ -33,15 +33,15 @@ define phpbb::instance() {
             'files',
             'store' ]
 
-    $dir_names = regsubst($writable_dirs,'^',"$forums_dir/$lang/phpBB/")
+    $dir_names = regsubst($writable_dirs,'^',"${forums_dir}/${lang}/phpBB/")
 
     file { $dir_names:
         ensure  => directory,
         owner   => 'apache',
-        require => Exec["git_clone $lang"],
+        require => Exec["git_clone ${lang}"],
     }
 
-    file { "$forums_dir/$lang/phpBB/config.php":
+    file { "${forums_dir}/${lang}/phpBB/config.php":
         content => template('phpbb/config.php'),
     }
 
@@ -56,25 +56,25 @@ define phpbb::instance() {
     $ldap_password = extlookup( 'phpbb_ldap','x')
 
     phpbb::config {
-        "ldap_user/$lang":
+        "ldap_user/${lang}":
             key => 'ldap_user', value => "cn=phpbb-$::hostname,ou=System Accounts,$::dc_suffix";
-        "ldap_server/$lang":
+        "ldap_server/${lang}":
             key => 'ldap_server', value => "ldaps://ldap.$::domain ldaps://ldap-slave-1.$::domain";
-        "ldap_password/$lang":
+        "ldap_password/${lang}":
             key => 'ldap_password', value => $ldap_password;
-        "ldap_base_dn/$lang":
+        "ldap_base_dn/${lang}":
             key => 'ldap_base_dn', value => "ou=People,$::dc_suffix";
-        "auth_method/$lang":
+        "auth_method/${lang}":
             key => 'auth_method', value => 'ldap';
-        "ldap_mail/$lang":
+        "ldap_mail/${lang}":
             key => 'ldap_mail', value => 'mail';
-        "ldap_uid/$lang":
+        "ldap_uid/${lang}":
             key => 'ldap_uid', value => 'uid';
-        "cookie_domain/$lang":
+        "cookie_domain/${lang}":
             key => 'cookie_domain', value => "forums.$::domain";
-        "server_name/$lang":
+        "server_name/${lang}":
             key => 'server_name', value => "forums.$::domain";
-        "default_lang/$lang":
+        "default_lang/${lang}":
             key => 'default_lang', value => $lang;
     }
 }
diff --git a/modules/phpbb/manifests/locale_db.pp b/modules/phpbb/manifests/locale_db.pp
index 8111f18f..93046c47 100644
--- a/modules/phpbb/manifests/locale_db.pp
+++ b/modules/phpbb/manifests/locale_db.pp
@@ -1,7 +1,7 @@
 define phpbb::locale_db($tag = 'default',
                         $user = $phpbb::base::user) {
     postgresql::database { $name:
-        description => "$lang db for phpbb forum",
+        description => "${lang} db for phpbb forum",
         user        => $user,
         tag         => $tag,
 # this break due to the way it is remotely declared
diff --git a/modules/phpbb/manifests/redirection_instance.pp b/modules/phpbb/manifests/redirection_instance.pp
index 48446d3e..9eb6bb8b 100644
--- a/modules/phpbb/manifests/redirection_instance.pp
+++ b/modules/phpbb/manifests/redirection_instance.pp
@@ -1,6 +1,6 @@
 define phpbb::redirection_instance($url) {
     $lang = $name
-    file { "/etc/httpd/conf/vhosts.d/forums.d/redirect_$name.conf":
+    file { "/etc/httpd/conf/vhosts.d/forums.d/redirect_${name}.conf":
         content => template('phpbb/forums_redirect.conf'),
         notify  => Exec['service httpd configtest'],
     }
diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf
index 2c715485..014cf902 100644
--- a/modules/phpbb/templates/forums_vhost.conf
+++ b/modules/phpbb/templates/forums_vhost.conf
@@ -1,6 +1,6 @@
     # TODO redirect based on language settings
     # and the presence of the forum
-    
+
     # for locale redirection
     Include conf/vhosts.d/forums.d/*.conf