.travis.yml

@@ -4,10 +4,12 @@ language: ruby
 cache: bundler
 
 before_install:
+  - if [ $BUNDLER_VERSION ]; then
+      gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
+    fi
   - bundle -v
   - rm Gemfile.lock || true
-  - gem update --system
-  - gem update bundler
+  - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
 
@@ -18,24 +20,20 @@ script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3" FIXTURES_YML=".fixtures-puppetv3.yml" FUTURE_PARSER="yes" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4"
+    env: PUPPET_GEM_VERSION="~> 4" RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
   - rvm: 2.4.1
     env: PUPPET_GEM_VERSION="~> 5"
   - rvm: 2.5.1

CHANGELOG.md

@@ -1,3 +1,6 @@
+### v3.59.1 - 2019-02-28
+  * Put Match block at end of sshd_config
+
 ### v3.59.0 - 2018-01-03
   * Support Puppet 6
 

README.md

@@ -23,7 +23,7 @@ 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, v4 and v5.  See `.travis.yml`
+latest Puppet v3, v3 with future parser, v4, v5 and v6.  See `.travis.yml`
 for the exact matrix of supported Puppet and ruby versions.
 
  * Debian 7

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "ghoneycutt-ssh",
-  "version": "3.59.0",
+  "version": "3.59.1",
   "author": "ghoneycutt",
   "summary": "Manages SSH",
   "license": "Apache-2.0",

templates/sshd_config.erb

@@ -264,15 +264,6 @@ AllowGroups <%= @sshd_config_allowgroups_real.join(' ') %>
 <% if @sshd_config_key_revocation_list_real -%>
 RevokedKeys <%= @sshd_config_key_revocation_list_real %>
 <% end -%>
-<% if @sshd_config_match -%>
-
-<%   @sshd_config_match.sort.each do |key, hash| -%>
-Match <%= key %>
-<%     hash.sort.each do |values| -%>
-  <%= values %>
-<%     end -%>
-<%   end -%>
-<% end -%>
 <% if @sshd_config_hostcertificate_real.class == Array -%>
 <%   @sshd_config_hostcertificate_real.each do |cert| -%>
 HostCertificate <%= cert %>
@@ -286,3 +277,12 @@ TrustedUserCAKeys <%= @sshd_config_trustedusercakeys_real %>
 <% if @sshd_config_authorized_principals_file_real -%>
 AuthorizedPrincipalsFile <%= @sshd_config_authorized_principals_file_real %>
 <% end -%>
+<% if @sshd_config_match -%>
+
+<%   @sshd_config_match.sort.each do |key, hash| -%>
+Match <%= key %>
+<%     hash.sort.each do |values| -%>
+  <%= values %>
+<%     end -%>
+<%   end -%>
+<% end -%>