lint fixes for sympa

11 files changed, 17 insertions, 22 deletions

diff --git a/modules/sympa/files/scenari/open_web_only_notify b/modules/sympa/files/scenari/open_web_only_notify
index 9c0b1dbc..621e425c 100644
--- a/modules/sympa/files/scenari/open_web_only_notify
+++ b/modules/sympa/files/scenari/open_web_only_notify
@@ -3,4 +3,3 @@ title.gettext anyone on the web, notification is sent to list owner
 # do not notify if it is just an update
 is_subscriber([listname],[sender])       smtp,smime,md5 -> do_it
 true()                                   md5 -> do_it,notify
-
diff --git a/modules/sympa/manifests/datasource/ldap_group.pp b/modules/sympa/manifests/datasource/ldap_group.pp
index 6b34ec92..6060bec4 100644
--- a/modules/sympa/manifests/datasource/ldap_group.pp
+++ b/modules/sympa/manifests/datasource/ldap_group.pp
@@ -1,5 +1,5 @@
 define sympa::datasource::ldap_group {
-    file { "/etc/sympa/data_sources/$name.incl":
+    file { "/etc/sympa/data_sources/${name}.incl":
         content => template('sympa/data_sources/ldap_group.incl')
     }
 }
diff --git a/modules/sympa/manifests/list.pp b/modules/sympa/manifests/list.pp
index 14059f6f..ed0d55e2 100644
--- a/modules/sympa/manifests/list.pp
+++ b/modules/sympa/manifests/list.pp
@@ -13,20 +13,20 @@ define sympa::list( $subject,
     $ldap_password = extlookup('sympa_ldap','x')
     $custom_subject = $name
 
-    $xml_file = "/etc/sympa/lists_xml/$name.xml"
+    $xml_file = "/etc/sympa/lists_xml/${name}.xml"
 
     file { $xml_file:
         content => template('sympa/list.xml'),
         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"],
+        creates => "/var/lib/sympa/expl/${name}",
+        before  => File["/var/lib/sympa/expl/${name}/config"],
     }
 
-    file { "/var/lib/sympa/expl/$name/config":
+    file { "/var/lib/sympa/expl/${name}/config":
         owner   => 'sympa',
         group   => 'sympa',
         mode    => '0750',
diff --git a/modules/sympa/manifests/list/announce.pp b/modules/sympa/manifests/list/announce.pp
index ec064926..c60da20b 100644
--- a/modules/sympa/manifests/list/announce.pp
+++ b/modules/sympa/manifests/list/announce.pp
@@ -3,15 +3,15 @@
 define sympa::list::announce($subject,
                                   $reply_to,
                                   $sender_email,
-				  $subscriber_ldap_group = false,
+                                  $subscriber_ldap_group = false,
                                   $language = 'en',
                                   $topics = false) {
     list { $name:
-        subject      => $subject,
-        language     => $language,
-        topics       => $topics,
-        reply_to     => $reply_to,
-        sender_email => $sender_email,
-	subscriber_ldap_group => $subscriber_ldap_group,
+        subject               => $subject,
+        language              => $language,
+        topics                => $topics,
+        reply_to              => $reply_to,
+        sender_email          => $sender_email,
+        subscriber_ldap_group => $subscriber_ldap_group,
     }
 }
diff --git a/modules/sympa/manifests/list/public.pp b/modules/sympa/manifests/list/public.pp
index cb281910..f0062665 100644
--- a/modules/sympa/manifests/list/public.pp
+++ b/modules/sympa/manifests/list/public.pp
@@ -9,6 +9,6 @@ define sympa::list::public($subject,
         language                => $language,
         topics                  => $topics,
         sender_subscriber       => true,
-        reply_to                => "$name@$sympa::variable::vhost",
+        reply_to                => "${name}@${sympa::variable::vhost}",
     }
 }
diff --git a/modules/sympa/manifests/list/public_restricted.pp b/modules/sympa/manifests/list/public_restricted.pp
index 167139a6..5c316368 100644
--- a/modules/sympa/manifests/list/public_restricted.pp
+++ b/modules/sympa/manifests/list/public_restricted.pp
@@ -12,6 +12,6 @@ define sympa::list::public_restricted($subject,
         subscriber_ldap_group => $subscriber_ldap_group,
         sender_ldap_group     => $subscriber_ldap_group,
         subscription_open     => true,
-        reply_to              => "$name@$sympa::variable::vhost",
+        reply_to              => "${name}@${sympa::variable::vhost}",
     }
 }
diff --git a/modules/sympa/manifests/search_filter/ldap.pp b/modules/sympa/manifests/search_filter/ldap.pp
index 5cbc84f8..b7d0a933 100644
--- a/modules/sympa/manifests/search_filter/ldap.pp
+++ b/modules/sympa/manifests/search_filter/ldap.pp
@@ -1,5 +1,5 @@
 define sympa::search_filter::ldap {
-    file { "/etc/sympa/search_filters/$name.ldap":
+    file { "/etc/sympa/search_filters/${name}.ldap":
         content => template('sympa/search_filters/group.ldap')
     }
 }
diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf
index af998b68..54af2fc5 100644
--- a/modules/sympa/templates/auth.conf
+++ b/modules/sympa/templates/auth.conf
@@ -10,4 +10,3 @@ ldap
         bind_dn                         cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>
         bind_password                   <%= ldap_password %>
         authentication_info_url         <%= authentication_info_url %>
-
diff --git a/modules/sympa/templates/data_sources/ldap_group.incl b/modules/sympa/templates/data_sources/ldap_group.incl
index 4517fe26..daded0ff 100644
--- a/modules/sympa/templates/data_sources/ldap_group.incl
+++ b/modules/sympa/templates/data_sources/ldap_group.incl
@@ -13,4 +13,3 @@ include_ldap_2level_query
         filter2  (objectClass=inetOrgPerson)
         attrs2   mail
         select2  first
-
diff --git a/modules/sympa/templates/scenari/sender.restricted b/modules/sympa/templates/scenari/sender.restricted
index 05700587..66139e6c 100644
--- a/modules/sympa/templates/scenari/sender.restricted
+++ b/modules/sympa/templates/scenari/sender.restricted
@@ -15,4 +15,3 @@ is_subscriber([listname],[sender])   smtp,smime,md5    -> do_it
 true()                               smime,md5         -> do_it
 <%- end -%>
 true()                       smtp,md5,smime -> reject(reason='send_subscriber')
-
diff --git a/modules/sympa/templates/vhost_ml.conf b/modules/sympa/templates/vhost_ml.conf
index ad6b4400..ab03b919 100644
--- a/modules/sympa/templates/vhost_ml.conf
+++ b/modules/sympa/templates/vhost_ml.conf
@@ -2,7 +2,7 @@
     RewriteRule ^/?$ /l/home [R]
     RewriteRule ^/l$ /l/
     RewriteRule ^/l/(.*)$ /wwsympa-wrapper.fcgi/$1
-	
+
     DocumentRoot <%= lib_dir + "/sympa/cgi" %>
 
     Alias /static-sympa /var/lib/sympa/static_content
@@ -11,4 +11,3 @@
         Order allow,deny
         Allow from all
     </Directory>
-