Merge pull request #33 from ghoneycutt/three_oh

Release v3.0.0

.gitignore

@@ -28,3 +28,4 @@ doc/
 metadata.json
 coverage/
 spec/fixtures/modules/*
+Gemfile.lock

Modulefile

@@ -1,5 +1,5 @@
 name    'ghoneycutt-ssh'
-version '2.5.1'
+version '3.0.0'
 source 'git://github.com/ghoneycutt/puppet-module-ssh.git'
 author 'ghoneycutt'
 license 'Apache License, Version 2.0'
@@ -8,5 +8,5 @@ description 'Manage SSH'
 project_page 'https://github.com/ghoneycutt/puppet-module-ssh'
 
 dependency 'puppetlabs/stdlib',   '3.2.x'
-dependency 'ghoneycutt/common',   '1.0.0'
+dependency 'ghoneycutt/common',   '1.0.2'
 dependency 'puppetlabs/firewall'

README.md

@@ -63,7 +63,7 @@ ServerAliveInterval option in ssh_config. Not set by default.
 
 ssh_config_sendenv_xmodifiers
 -----------------------
-Set 'SendEnv XMODIFIERS' in ssh_config.
+Boolean to set 'SendEnv XMODIFIERS' in ssh_config.
 
 - *Default*: false
 
@@ -190,13 +190,13 @@ packages
 --------
 Array of package names used for installation.
 
-- *Default*: 'openssh-server', 'openssh-server', 'openssh-clients'
+- *Default*: Based on OS
 
 permit_root_login
 -----------------
-Allow root login. Valid values are 'yes', 'without-password', 'forced-commands-only', 'no'.
+Allow root login. Valid values are 'yes', 'without-password', 'forced-commands-only', and 'no'.
 
-- *Default*: no
+- *Default*: yes
 
 purge_keys
 ----------
@@ -220,7 +220,7 @@ service_name
 ------------
 Name of the SSH service.
 
-- *Default*: 'sshd'
+- *Default*: Based on OS
 
 service_enable
 --------------

manifests/init.pp

@@ -4,7 +4,7 @@
 #
 class ssh (
   $packages                         = 'USE_DEFAULTS',
-  $permit_root_login                = 'no',
+  $permit_root_login                = 'yes',
   $purge_keys                       = 'true',
   $manage_firewall                  = false,
   $ssh_config_path                  = '/etc/ssh/ssh_config',

spec/classes/init_spec.rb

@@ -32,6 +32,7 @@ describe 'ssh' do
     }
 
     it { should contain_file('ssh_config').with_content(/^# This file is being maintained by Puppet.\n# DO NOT EDIT\n\n# \$OpenBSD: ssh_config,v 1.21 2005\/12\/06 22:38:27 reyk Exp \$/) }
+    it { should contain_file('ssh_config').with_content(/^   Protocol 2$/) }
 
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardAgent$/) }
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardX11$/) }
@@ -50,7 +51,7 @@ describe 'ssh' do
 
     it { should contain_file('sshd_config').with_content(/^SyslogFacility AUTH$/) }
     it { should contain_file('sshd_config').with_content(/^LoginGraceTime 120$/) }
-    it { should contain_file('sshd_config').with_content(/^PermitRootLogin no$/) }
+    it { should contain_file('sshd_config').with_content(/^PermitRootLogin yes$/) }
     it { should contain_file('sshd_config').with_content(/^ChallengeResponseAuthentication no$/) }
     it { should contain_file('sshd_config').with_content(/^PrintMotd yes$/) }
     it { should contain_file('sshd_config').with_content(/^UseDNS yes$/) }
@@ -130,6 +131,7 @@ describe 'ssh' do
     }
 
     it { should contain_file('ssh_config').with_content(/^# This file is being maintained by Puppet.\n# DO NOT EDIT\n\n# \$OpenBSD: ssh_config,v 1.21 2005\/12\/06 22:38:27 reyk Exp \$/) }
+    it { should contain_file('ssh_config').with_content(/^   Protocol 2$/) }
 
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardAgent$/) }
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardX11$/) }
@@ -148,7 +150,7 @@ describe 'ssh' do
 
     it { should contain_file('sshd_config').with_content(/^SyslogFacility AUTH$/) }
     it { should contain_file('sshd_config').with_content(/^LoginGraceTime 120$/) }
-    it { should contain_file('sshd_config').with_content(/^PermitRootLogin no$/) }
+    it { should contain_file('sshd_config').with_content(/^PermitRootLogin yes$/) }
     it { should contain_file('sshd_config').with_content(/^ChallengeResponseAuthentication no$/) }
     it { should contain_file('sshd_config').with_content(/^PrintMotd yes$/) }
     it { should contain_file('sshd_config').with_content(/^UseDNS yes$/) }
@@ -211,6 +213,7 @@ describe 'ssh' do
     }
 
     it { should contain_file('ssh_config').with_content(/^# This file is being maintained by Puppet.\n# DO NOT EDIT\n\n# \$OpenBSD: ssh_config,v 1.21 2005\/12\/06 22:38:27 reyk Exp \$/) }
+    it { should contain_file('ssh_config').with_content(/^   Protocol 2$/) }
 
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardAgent$/) }
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardX11$/) }
@@ -229,7 +232,7 @@ describe 'ssh' do
 
     it { should contain_file('sshd_config').with_content(/^SyslogFacility AUTH$/) }
     it { should contain_file('sshd_config').with_content(/^LoginGraceTime 120$/) }
-    it { should contain_file('sshd_config').with_content(/^PermitRootLogin no$/) }
+    it { should contain_file('sshd_config').with_content(/^PermitRootLogin yes$/) }
     it { should contain_file('sshd_config').with_content(/^ChallengeResponseAuthentication no$/) }
     it { should contain_file('sshd_config').with_content(/^PrintMotd yes$/) }
     it { should contain_file('sshd_config').with_content(/^UseDNS yes$/) }
@@ -292,6 +295,7 @@ describe 'ssh' do
     }
 
     it { should contain_file('ssh_config').with_content(/^# This file is being maintained by Puppet.\n# DO NOT EDIT\n\n# \$OpenBSD: ssh_config,v 1.21 2005\/12\/06 22:38:27 reyk Exp \$/) }
+    it { should contain_file('ssh_config').with_content(/^   Protocol 2$/) }
 
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardAgent$/) }
     it { should_not contain_file('ssh_config').with_content(/^\s*ForwardX11$/) }
@@ -310,7 +314,7 @@ describe 'ssh' do
 
     it { should contain_file('sshd_config').with_content(/^SyslogFacility AUTH$/) }
     it { should contain_file('sshd_config').with_content(/^LoginGraceTime 120$/) }
-    it { should contain_file('sshd_config').with_content(/^PermitRootLogin no$/) }
+    it { should contain_file('sshd_config').with_content(/^PermitRootLogin yes$/) }
     it { should contain_file('sshd_config').with_content(/^ChallengeResponseAuthentication no$/) }
     it { should contain_file('sshd_config').with_content(/^PrintMotd yes$/) }
     it { should contain_file('sshd_config').with_content(/^UseDNS yes$/) }
@@ -370,6 +374,7 @@ describe 'ssh' do
     }
 
     it { should contain_file('ssh_config').with_content(/^# This file is being maintained by Puppet.\n# DO NOT EDIT\n\n# \$OpenBSD: ssh_config,v 1.21 2005\/12\/06 22:38:27 reyk Exp \$/) }
+    it { should contain_file('ssh_config').with_content(/^   Protocol 2$/) }
     it { should contain_file('ssh_config').with_content(/^  ForwardAgent yes$/) }
     it { should contain_file('ssh_config').with_content(/^  ForwardX11 yes$/) }
     it { should contain_file('ssh_config').with_content(/^  ServerAliveInterval 300$/) }
@@ -388,7 +393,7 @@ describe 'ssh' do
       {
         :sshd_config_syslog_facility     => 'DAEMON',
         :sshd_config_login_grace_time    => '60',
-        :permit_root_login               => 'yes',
+        :permit_root_login               => 'no',
         :sshd_config_challenge_resp_auth => 'yes',
         :sshd_config_print_motd          => 'no',
         :sshd_config_use_dns             => 'no',
@@ -416,7 +421,7 @@ describe 'ssh' do
 
     it { should contain_file('sshd_config').with_content(/^SyslogFacility DAEMON$/) }
     it { should contain_file('sshd_config').with_content(/^LoginGraceTime 60$/) }
-    it { should contain_file('sshd_config').with_content(/^PermitRootLogin yes$/) }
+    it { should contain_file('sshd_config').with_content(/^PermitRootLogin no$/) }
     it { should contain_file('sshd_config').with_content(/^ChallengeResponseAuthentication yes$/) }
     it { should contain_file('sshd_config').with_content(/^PrintMotd no$/) }
     it { should contain_file('sshd_config').with_content(/^UseDNS no$/) }