lint fixes for mediawiki

2 files changed, 13 insertions, 13 deletions

diff --git a/modules/mediawiki/manifests/base.pp b/modules/mediawiki/manifests/base.pp
index 52600ac1..43b33274 100644
--- a/modules/mediawiki/manifests/base.pp
+++ b/modules/mediawiki/manifests/base.pp
@@ -25,7 +25,7 @@ class mediawiki::base {
     if $vhost {
         apache::vhost::redirect_ssl { $vhost: }
 
-        apache::vhost::base { "ssl_$vhost":
+        apache::vhost::base { "ssl_${vhost}":
             location => $root,
             use_ssl  => true,
             vhost    => $vhost,
diff --git a/modules/mediawiki/manifests/instance.pp b/modules/mediawiki/manifests/instance.pp
index 301c9809..54f4d969 100644
--- a/modules/mediawiki/manifests/instance.pp
+++ b/modules/mediawiki/manifests/instance.pp
@@ -6,8 +6,8 @@ define mediawiki::instance( $title,
 
     $path = $name
     $lang = $name
-    $wiki_root = "$mediawiki::base::root/$path"
-    $db_name = "mediawiki_$name"
+    $wiki_root = "$mediawiki::base::root/${path}"
+    $db_name = "mediawiki_${name}"
     $db_user = $mediawiki::base::user
     $db_password = $mediawiki::config::pgsql_password
     $secret_key = $mediawiki::config::secretkey
@@ -17,38 +17,38 @@ define mediawiki::instance( $title,
         ensure => directory
     }
 
-    file { "$wiki_root/skins":
+    file { "${wiki_root}/skins":
         ensure  => link,
         target  => $skinsdir,
         require => File[$wiki_root],
     }
 
-    exec { "wikicreate $name":
-        command => "mediawiki-create $wiki_root",
+    exec { "wikicreate ${name}":
+        command => "mediawiki-create ${wiki_root}",
         cwd     => $mediawiki::base::root,
         require => [File[$wiki_root],Package['mediawiki-minimal']],
-        creates => "$wiki_root/index.php",
+        creates => "${wiki_root}/index.php",
     }
 
     postgresql::remote_database { $db_name:
         user            => $db_user,
-        callback_notify => Exec["deploy_db $name"],
+        callback_notify => Exec["deploy_db ${name}"],
     }
 
-    exec { "deploy_db $name":
-        command     => "php /usr/local/bin/init_wiki.php $wiki_root",
+    exec { "deploy_db ${name}":
+        command     => "php /usr/local/bin/init_wiki.php ${wiki_root}",
         refreshonly => true,
-        onlyif      => "/usr/bin/test -d $wiki_root/config",
+        onlyif      => "/usr/bin/test -d ${wiki_root}/config",
     }
 
-    file { "$wiki_root/LocalSettings.php":
+    file { "${wiki_root}/LocalSettings.php":
         owner   => 'apache',
         mode    => '0600',
         content => template('mediawiki/LocalSettings.php'),
         # if LocalSettings is created first, the wikicreate script
         # do not create a confg directory, and so it doesn't
         # trigger deploy_db exec
-        require => Exec["wikicreate $name"],
+        require => Exec["wikicreate ${name}"],
     }
 }