Showing with 11 additions and 19 deletions.

+0 −12 .travis.yml

+3 −0 CHANGELOG.md

+6 −5 README.md

+1 −1 manifests/init.pp

+1 −1 metadata.json
diff --git a/.travis.yml b/.travis.yml
@@ -34,20 +34,8 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3"
   - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.6.0"
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.7.0"
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.8.0"
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.9.0"
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.10.0"
   - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 4"
-  - rvm: 2.4.1
-    env: PUPPET_GEM_VERSION="~> 5.0.0"
   - rvm: 2.4.1
     env: PUPPET_GEM_VERSION="~> 5"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v3.56.1 - 2017-11-20
+  * Fix regex bug with `sshd_config_maxstartups`
+
 ### v3.56.0 - 2017-10-27
   * Support puppetlabs/concat v3 and v4
 

diff --git a/README.md b/README.md
@@ -23,9 +23,8 @@ Host entries in a personal `~/.ssh/config` file.
 # Compatibility
 
 This module has been tested to work on the following systems with the
-latest Puppet v3, v3 with future parser, last few releases of v4 and
-Puppet v5. See .travis.yml for the exact matrix of supported Puppet and
-ruby versions.
+latest Puppet v3, v3 with future parser, v4 and v5.  See `.travis.yml`
+for the exact matrix of supported Puppet and ruby versions.
 
  * Debian 7
  * EL 5
@@ -557,9 +556,11 @@ Array of users for the AllowUsers setting in sshd_config.
 
 - *Default*: undef
 
-sshd_config_maxstartups
+sshd_config_maxstartups (string)
 -----------------------
-Specifies the maximum number of concurrent unauthenticated connections to the SSH daemon.
+Specifies the maximum number of concurrent unauthenticated connections
+to the SSH daemon. Must be a stringified integer or a string with three
+integers separated by colons, such as '10:30:100'.
 
 - *Default*: undef
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -632,7 +632,7 @@
   }
 
   if $sshd_config_maxstartups != undef {
-    validate_re($sshd_config_maxstartups,'^(\d+)+(\d+?:\d+?:\d+)?$',
+    validate_re($sshd_config_maxstartups,'^((\d+)|(\d+?:\d+?:\d+)?)$',
       "ssh::sshd_config_maxstartups may be either an integer or three integers separated with colons, such as 10:30:100. Detected value is <${sshd_config_maxstartups}>.")
   }
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "ghoneycutt-ssh",
-  "version": "3.56.0",
+  "version": "3.56.1",
   "author": "ghoneycutt",
   "summary": "Manages SSH",
   "license": "Apache-2.0",