Merge pull request #71 from echocat/develop

backmerge for release 1.8.1
echocat · Mar 19, 2016 · d42e22c · d42e22c
2 parents e7ed580 + 9b98772
commit d42e22c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2016-03-19 - 1.8.1 (Bugfix release)
+
+#### Bugfixes:
+
+- (60cfca6) #68 recognize newer releases of Amazon Linux
+- (be6b4af) Debian: rpcmountdopts has double quotes
+
 ## 2016-01-18 - 1.8.0 (Feature release)
 
 *Warning:* Requires [puppetlabs-stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) > =4.8.0 !

diff --git a/Gemfile b/Gemfile
@@ -7,3 +7,5 @@ gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 0.3.2'
 gem 'facter', facterversion
 gem 'rspec', '< 3.2.0'
+# rubi <1.9 versus rake 11.0.0 workaround
+gem 'rake', '< 11.0.0'
diff --git a/README.md b/README.md
@@ -24,7 +24,9 @@
 
 This module installs, configures and manages everything on NFS clients and servers.
 
-Github Master: [![Build Status](https://secure.travis-ci.org/echocat/puppet-nfs.png?branch=master)](https://travis-ci.org/echocat/puppet-nfs)
+[![Puppet Forge](http://img.shields.io/puppetforge/v/echocat/nfs.svg)](https://forge.puppetlabs.com/echocat/nfs)
+[![Build Status](https://secure.travis-ci.org/echocat/puppet-nfs.png?branch=master)](https://travis-ci.org/echocat/puppet-nfs)
+[![Puppet Forge Downloads](http://img.shields.io/puppetforge/dt/echocat/nfs.svg)](https://forge.puppetlabs.com/echocat/nfs) 
 
 ##Module Description
 

diff --git a/manifests/client/redhat/params.pp b/manifests/client/redhat/params.pp
@@ -13,14 +13,18 @@
     /^7\.\d+/: {
       $osmajor = 7
     }
-    # TODO: workaround for Fedora
-    /^\d{2,}/: {
-      $osmajor = 7
+    # Newer Amazon Linux releases use YYYY.MM (e.g. "2014.09" or "2015.03")
+    /^\d{4}\.\d{2}$/: {
+      $osmajor = 6
     }
     # Amazon linux operatingsystemrelease is verbose: 3.10.35-43.137.amzn1.x86_64
     /^[34]\.(\d|-|\.)+(amzn){1}/: {
       $osmajor = 6
     }
+    # TODO: workaround for Fedora
+    /^\d{2,}/: {
+      $osmajor = 7
+    }
     default:{
       fail("Operatingsystemrelease ${::operatingsystemrelease} not supported")
     }

diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp
@@ -18,7 +18,7 @@
     file_line { 'rpc-mount-options':
       ensure => present,
       path   => '/etc/default/nfs-kernel-server',
-      line   => "RPCMOUNTDOPTS=--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}",
+      line   => "RPCMOUNTDOPTS=\"--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}\"",
       match  => '^#?RPCMOUNTDOPTS';
     }
 

diff --git a/metadata.json b/metadata.json
@@ -60,7 +60,7 @@
     }
   ],
   "name": "echocat-nfs",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "source": "git clone https://github.com/echocat/puppet-nfs.git",
   "author": "echocat",
   "license": "Apache-2.0",