refactor things for >2.7

manifests/base.pp

 class imapproxy::base {
 
-    package { up-imapproxy:
-        ensure => present,
-    }
+  package { up-imapproxy:
+    ensure => present,
+  }
 
-    file{'/etc/imapproxy.conf':
-        source => [ "puppet:///modules/site-imapproxy/${fqdn}/imapproxy.conf",
-                    "puppet:///modules/site-imapproxy/imapproxy.conf",
-                    "puppet:///modules/imapproxy/imapproxy.conf" ],
-        require => Package[up-imapproxy],
-        notify => Service[imapproxy],
-        owner => root, group => 0, mode => 0644;
-    }
+  file{'/etc/imapproxy.conf':
+    source => [ "puppet:///modules/site_imapproxy/${::fqdn}/imapproxy.conf",
+                "puppet:///modules/site_imapproxy/imapproxy.conf",
+                "puppet:///modules/imapproxy/imapproxy.conf" ],
+    require => Package[up-imapproxy],
+    notify => Service[imapproxy],
+    owner => root, group => 0, mode => 0644;
+  }
 
-    service {'imapproxy':
-        ensure  => running,
-        enable => true,
-    }
+  service {'imapproxy':
+    ensure  => running,
+    enable => true,
+  }
 }

manifests/disable.pp

 class imapproxy::disable inherits imapproxy {
-    case $operatingsystem {
-        default: { include imapproxy::disable::base }
-    }
+  case $::operatingsystem {
+    default: { include imapproxy::disable::base }
+  }
 }

manifests/gentoo.pp

 class imapproxy::gentoo inherits imapproxy::base {
-    Package[up-imapproxy]{
-        category => 'net-mail',
-    }
+  Package[up-imapproxy]{
+    category => 'net-mail',
+  }
 }

manifests/init.pp

@@ -4,12 +4,12 @@
 #
 
 class imapproxy {
-    case $operatingsystem {
-        gentoo: { include imapproxy::gentoo }
-        default: { include imapproxy::base }
-    }
+  case $::operatingsystem {
+    gentoo: { include imapproxy::gentoo }
+    default: { include imapproxy::base }
+  }
 
-    if $use_shorewall {
-        include shorewall::rules::out::imap
-    }
+  if hiera('use_shorewall',false) {
+    include shorewall::rules::out::imap
+  }
 }