move portmap to base

manifests/portmap.pp

+#
+# Portmap service for Sun RPC.  Needed on systems providing RPC services, such
+# as NFS servers, and occasionally for other reasons.
+
+# This class intentionally does not add iptables rules.  You should add with
+# server-specific iptables rules to allow only specific sites to talk to port
+# 111.
+class base::portmap {
+
+  case $::operatingsystem {
+    'redhat': {
+        include base::xinetd
+
+            case $::lsbdistcodename {
+
+                'santiago': {
+                    package { 'rpcbind': ensure => present }
+                    service { 'rpcbind': ensure => running }
+                }
+                default: {
+                    package { 'portmap': ensure => present }
+
+                    # Ensure service is running.  Also notify xinetd in case the
+                    # services need to be re-registered with the portmap.
+                    service { 'portmap':
+                        ensure    => running,
+                        enable    => true,
+                        hasstatus => true,
+                        require   => Package['portmap'],
+                        restart   => '/etc/init.d/portmap restart',
+                        notify    => Service['xinetd'],
+                    }
+                }# rhel4/5
+            }
+    }
+    'debian': {
+        package { 'portmap': ensure => present }
+        service{ 'portmap':
+            ensure    => running,
+            enable    => true,
+            hasstatus => false,
+            status    => 'pidof portmap',
+            require   => Package['portmap'],
+            restart   => '/etc/init.d/portmap restart',
+        }
+    }
+    # Ubuntu 11.10 switched to "rpcbind" like EL6
+    'ubuntu': {
+        package { 'rpcbind': ensure => present }
+        service { 'portmap': ensure => running }
+    }
+  }
+}

manifests/rstatd.pp

@@ -4,7 +4,7 @@
 
 class base::rstatd {
     include base::xinetd,
-            portmap
+            base::portmap
 
     case $::operatingsystem {
         'redhat': {