master updates

.travis.yml

@@ -1,17 +1,24 @@
 ---
+sudo: false
 language: ruby
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.6.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
 notifications:
   email: false

CHANGELOG.md

@@ -1,13 +1,30 @@
+## 2015-04-28 - 1.4.1 (Bugfixe release)
+
+#### Bugfixes:
+
+- Fixed #19 use of wrong variable for osfamily on servers
+
+## 2015-04-22 - 1.4.0 (Feature/Bugfixe release)
+
+#### Features:
+
+- Issue #17 Add support for Amazon linux
+
+#### Bugfixes:
+
+- Fixed #16 revert default permissions from 0777 to 0755
+- Fixed #18 problems with a host being client & server
+
 ## 2015-03-20 - 1.3.1 (Feature/Bugfixe release)
 
 #### Features:
 
-- #11 Add function to easy handle large numer of clients (see README "A large number of clients")
+- Issue #11 Add function to easy handle large numer of clients (see README "A large number of clients")
 
 #### Bugfixes:
 
-- #13 RHEL 7: handle service enable correct
-- #12 RHEL 7: ensure client mount works correct with undef mounts
+- Fixed #13 RHEL 7: handle service enable correct
+- Fixed #12 RHEL 7: ensure client mount works correct with undef mounts
 
 ## 2015-03-05 - 1.3.0 (Feature release)
 

README.md

@@ -176,7 +176,7 @@ they were exported from on the server
 
 ```puppet
 node client {
-  class { 'nfs::server':
+  class { 'nfs::client':
     nfs_v4 = true,
     nfs_v4_export_root_clients =>
       '10.0.0.0/24(rw,fsid=root,insecure,no_subtree_check,async,no_root_squash)'
@@ -193,7 +193,7 @@ the 'mounted' option.
 node client2 {
   $server = 'server'
 
-  class { '::nfs::server':
+  class { '::nfs::client':
     nfs_v4 = true,
   }
   Nfs::Client::Mount::Nfs_v4::Root <<| server == $server |>> { 
@@ -246,7 +246,7 @@ Just to show you, how complex we can make things ;-)
   }
 
   node client {
-    class { 'nfs::server':
+    class { 'nfs::client':
       nfs_v4              => true,
       nfs_v4_idmap_domain => $::domain
       nfs_v4_mount_root   => '/srv',
@@ -401,6 +401,9 @@ Default is undef. Used to identify a catalog item for filtering by storeconfigs
 
 Default is 'localhost(ro)'. Copied directly into /etc/exports as a string, for simplicity.
 
+#####`server` (optional)
+
+Default is `$::clientcert`. Used to specify a other ip/name for the client to connect to. Usefull in machines with multiple ip addresses or network interfaces
 #####Example
 
 ```puppet

manifests/client/debian/service.pp

@@ -12,6 +12,7 @@
   if $nfs::client::debian::nfs_v4 {
     service { 'idmapd':
       ensure    => running,
+      name      => 'nfs-common',
       subscribe => Augeas['/etc/idmapd.conf', '/etc/default/nfs-common'],
     }
   } else {

manifests/client/mount.pp

@@ -2,7 +2,7 @@
   $server,
   $share,
   $ensure    = 'mounted',
-  $mount     = $title,
+  $mount     = undef,
   $remounts  = false,
   $atboot    = false,
   $options   = '_netdev',

manifests/server/configure.pp

@@ -2,7 +2,7 @@
 
   concat {'/etc/exports':
     ensure  => present,
-    require => Class["nfs::server::${::nfs::server::params::osfamily}"],
+    require => Class["nfs::server::${::nfs::params::osfamily}"],
   }
 
 

manifests/server/export.pp

@@ -11,7 +11,8 @@
   $atboot         = false,
   $options        = '_netdev',
   $bindmount      = undef,
-  $nfstag         = undef
+  $nfstag         = undef,
+  $server         = $::clientcert
 ) {
 
 
@@ -39,7 +40,7 @@
       bindmount => $bindmount,
       nfstag    => $nfstag,
       share     => $v4_export_name,
-      server    => $::clientcert,
+      server    => $server,
     }
 
     } else {
@@ -64,7 +65,7 @@
       options  => $options,
       nfstag   => $nfstag,
       share    => $v3_export_name,
-      server   => $::clientcert,
+      server   => $server,
     }
   }
 }

metadata.json

@@ -23,11 +23,11 @@
     },
     {
       "name": "puppet",
-      "version_requirement": ">=2.7.20 <4.0.0"
+      "version_requirement": ">=2.7.20 <5.0.0"
     }
   ],
   "name": "echocat-nfs",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "source": "git clone https://github.com/echocat/puppet-nfs.git",
   "author": "echocat",
   "license": "Apache-2.0",