diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 8c2f222..4c8cb58 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -82,7 +82,7 @@ describe 'ssh' do :sshd_service_name => 'sshd', :sshd_service_hasstatus => true, :sshd_config_fixture => 'sshd_config_suse_x86_64', - :ssh_config_fixture => 'ssh_config_suse', + :ssh_config_fixture => 'ssh_config_suse_old', }, 'Suse-10-i386' => { :architecture => 'i386', @@ -95,13 +95,13 @@ describe 'ssh' do :sshd_service_name => 'sshd', :sshd_service_hasstatus => true, :sshd_config_fixture => 'sshd_config_suse_i386', - :ssh_config_fixture => 'ssh_config_suse', + :ssh_config_fixture => 'ssh_config_suse_old', }, 'Suse-11-x86_64' => { :architecture => 'x86_64', :osfamily => 'Suse', :operatingsystemrelease => '11.4', - :ssh_version => '6.6.1p1', + :ssh_version => 'OpenSSH_6.6.1p1', :ssh_version_numeric => '6.6', :ssh_packages => ['openssh'], :sshd_config_mode => '0600', @@ -114,7 +114,7 @@ describe 'ssh' do :architecture => 'i386', :osfamily => 'Suse', :operatingsystemrelease => '11.4', - :ssh_version => '6.6.1p1', + :ssh_version => 'OpenSSH_6.6.1p1', :ssh_version_numeric => '6.6', :ssh_packages => ['openssh'], :sshd_config_mode => '0600', @@ -127,7 +127,7 @@ describe 'ssh' do :architecture => 'x86_64', :osfamily => 'Suse', :operatingsystemrelease => '12.0', - :ssh_version => '6.6.1p1', + :ssh_version => 'OpenSSH_6.6.1p1', :ssh_version_numeric => '6.6', :ssh_packages => ['openssh'], :sshd_config_mode => '0600', diff --git a/spec/fixtures/ssh_config_suse b/spec/fixtures/ssh_config_suse index df3d4bc..4a1466c 100644 --- a/spec/fixtures/ssh_config_suse +++ b/spec/fixtures/ssh_config_suse @@ -54,6 +54,7 @@ Host * # to the original X11 display. As virtually no X11 client supports the untrusted # mode correctly we set this to yes. ForwardX11Trusted yes + UseRoaming no # Send locale-related environment variables SendEnv LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT diff --git a/spec/fixtures/ssh_config_suse_old b/spec/fixtures/ssh_config_suse_old new file mode 100644 index 0000000..df3d4bc --- /dev/null +++ b/spec/fixtures/ssh_config_suse_old @@ -0,0 +1,60 @@ +# This file is being maintained by Puppet. +# DO NOT EDIT + +# $OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for some commonly used options. For a comprehensive +# list of available options, their meanings and defaults, please see the +# ssh_config(5) man page. + +# Host * +# ForwardAgent no +# ForwardX11 no +# RhostsRSAAuthentication no +# RSAAuthentication yes + PasswordAuthentication yes + PubkeyAuthentication yes +# HostbasedAuthentication no +# BatchMode no +# CheckHostIP yes +# AddressFamily any +# ConnectTimeout 0 +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity + IdentityFile ~/.ssh/id_rsa + IdentityFile ~/.ssh/id_dsa +# Port 22 + Protocol 2 +# Cipher 3des +# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc +# EscapeChar ~ +# Tunnel no +# TunnelDevice any:any +# PermitLocalCommand no +# HashKnownHosts no + HashKnownHosts no + GlobalKnownHostsFile /etc/ssh/ssh_known_hosts +Host * +# GSSAPIAuthentication yes + GSSAPIAuthentication yes +# If this option is set to yes then remote X11 clients will have full access +# to the original X11 display. As virtually no X11 client supports the untrusted +# mode correctly we set this to yes. + ForwardX11Trusted yes +# Send locale-related environment variables + SendEnv LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES + SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT + SendEnv LC_IDENTIFICATION LC_ALL