Merge remote-tracking branch 'remotes/camptocamp/master' into develop

Conflicts:
	manifests/init.pp

5 files changed, 23 insertions, 23 deletions

diff --git a/manifests/backup.pp b/manifests/backup.pp
index a880718..527cf16 100644
--- a/manifests/backup.pp
+++ b/manifests/backup.pp
@@ -9,33 +9,33 @@ class couchdb::backup {
 
   file {$couchdb::params::backupdir:
     ensure  => directory,
-    mode    => 755,
-    require => Package["couchdb"],
+    mode    => '0755',
+    require => Package['couchdb'],
   }
 
-  file { "/usr/local/sbin/couchdb-backup.py":
+  file { '/usr/local/sbin/couchdb-backup.py':
     ensure  => present,
     owner   => root,
     group   => root,
-    mode    => 755,
-    content => template("couchdb/couchdb-backup.py.erb"),
+    mode    => '0755',
+    content => template('couchdb/couchdb-backup.py.erb'),
     require => File[$couchdb::params::backupdir],
   }
 
-  cron { "couchdb-backup":
-    command => "/usr/local/sbin/couchdb-backup.py 2> /dev/null",
+  cron { 'couchdb-backup':
+    command => '/usr/local/sbin/couchdb-backup.py 2> /dev/null',
     hour    => 3,
     minute  => 0,
-    require => File["/usr/local/sbin/couchdb-backup.py"],
+    require => File['/usr/local/sbin/couchdb-backup.py'],
   }
 
 
-  case $operatingsystem {
+  case $::operatingsystem {
     /Debian|Ubunu/: {
       # note: python-couchdb >= 0.8 required, which is found in debian wheezy.
-      package { ["python-couchdb", "python-simplejson"]:
+      package { ['python-couchdb', 'python-simplejson']:
         ensure => present,
-        before => File["/usr/local/sbin/couchdb-backup.py"],
+        before => File['/usr/local/sbin/couchdb-backup.py'],
       }
     }
     /RedHat|Centos/: {
diff --git a/manifests/base.pp b/manifests/base.pp
index 0671d07..fbbf08e 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,14 +1,14 @@
 class couchdb::base {
 
-  package {"couchdb":
+  package {'couchdb':
     ensure => present,
   }
 
-  service {"couchdb":
+  service {'couchdb':
     ensure    => running,
     hasstatus => true,
     enable    => true,
-    require   => Package["couchdb"],
+    require   => Package['couchdb'],
   }
 
 }
diff --git a/manifests/debian.pp b/manifests/debian.pp
index 053d17a..14678e2 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,7 +1,7 @@
 class couchdb::debian inherits couchdb::base {
 
-  package {"libjs-jquery":
+  package {'libjs-jquery':
     ensure => present,
   }
-  
+
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index cc25f10..092086b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,9 @@
 class couchdb {
-  case $operatingsystem {
+  case $::operatingsystem {
     Debian: {
-      case $lsbdistcodename {
-        /lenny|squeeze|wheezy/: { include couchdb::debian }
-        default:         { fail "couchdb not available for ${operatingsystem}/${lsbdistcodename}"}
+      case $::lsbdistcodename {
+        /lenny|squeeze/: { include couchdb::debian }
+        default:         { fail "couchdb not available for ${::operatingsystem}/${::lsbdistcodename}" }
       }
     }
     RedHat: { include couchdb::redhat }
diff --git a/manifests/params.pp b/manifests/params.pp
index 67efcd4..8993282 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,17 +1,17 @@
 class couchdb::params {
 
   $bind_address = $couchdb_bind_address ? {
-    ""      => "127.0.0.1",
+    ''      => '127.0.0.1',
     default => $couchdb_bind_address,
   }
 
   $port = $couchdb_port ? {
-    ""      => "5984",
+    ''      => '5984',
     default => $couchdb_port,
   }
 
   $backupdir = $couchdb_backupdir ? {
-    ""      => "/var/backups/couchdb",
+    ''      => '/var/backups/couchdb',
     default => $couchdb_backupdir,
   }