Commit graph

88 commits

Author SHA1 Message Date
intrigeri
2f7903bcc4 Merge remote branch 'shared/master'
Conflicts:
	templates/sshd_config/Debian_squeeze.erb

I always picked the shared repository version when conflicts arose.
The only exception to this rule was:
I kept my branch's "HostbasedUsesNameFromPacketOnly yes" in order
to be consistent with existing Etch and Lenny templates.
This is not the default Debian setting, but I would find it weird if a host
had this setting changed by Puppet after upgrading to Squeeze.
The right way to proceed would probably be to make this configurable.
2011-02-14 17:17:31 +01:00
Silvio Rhatto
ac30247bf9 Perfect forward secrecy config at squeeze template 2011-02-13 18:42:36 -02:00
Silvio Rhatto
505692a72e Merge branch 'master' of git://labs.riseup.net/shared-sshd 2011-02-13 15:13:10 -02:00
Gabriel Filion
5654d69add Enable support for Ubuntu
The sshd class currently has a mechanism to make resources for Ubuntu
similar to the ones for Debian, but the sshd::client class doesn't.

Also, There are no templates for sshd_config on Ubuntu so provide for
them. Since Ubuntu releases almost all use ssh versions that are as
recent as the Debian squeeze one, and the default sshd_config file is
usually the same as on Debian, add a default (Ubuntu.erb) template so
that it fits all Ubuntu releases.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2011-01-30 21:47:40 -05:00
Gabriel Filion
abb8566742 Add sshd_config template for Debian sid
Debian's unstable branch currently has no template for sshd_config, and
thus cannot use the sshd class.

Add a template for Debian sid.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2011-01-30 21:28:36 -05:00
Gabriel Filion
3662c5a2a5 Finish fixing ChallengeResponseAuthentication
This value was hardcoded in both the Debian lenny and etch templates.
The lenny template was fixed with commit 167cf53271 but the etch
template was left out.

Fix the etch template so that the ChallengeResponseAuthentication
instruction is not overridden.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2011-01-30 21:24:00 -05:00
Gabriel Filion
35768ed1e8 Add an sshd_config template for FreeBSD
Since there is no "catch-all" default configuration file for sshd, we
need to add for each OS.

Add a template for FreeBSD so that sshd can be configured on this OS.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2011-01-30 21:15:35 -05:00
Micah Anderson
2188f46db7 fix debian squeeze sshd_config template to add a missing newline 2010-12-20 14:18:30 -05:00
Silvio Rhatto
30a4593a05 Introducing perfect forward secrecy for SSH 2010-12-16 20:20:53 -02:00
Micah Anderson
0ec0562257 remote KerberosGetAFSToken, its actually not a functional configuration option, even though it is listed in the man page, and commented out in the default config file. I filed a bug with debian (#607238) 2010-12-15 20:38:07 -05:00
Micah Anderson
167cf53271 "ChallengeResponseAuthentication no" was being hardcoded later in the Debian Lenny sshd_config template, even though we offer it as a variable. With this commit, the variable will actually work, rather than be overriden 2010-12-14 13:41:05 -05:00
Micah Anderson
72e24df3b6 add Debian Squeeze sshd template. Enabled kerberos and gssapi options, using the defaults when not specified 2010-12-14 13:22:43 -05:00
mh
7e6d3af6f8 lenny already has AcceptEnv by default 2010-10-21 15:31:31 +02:00
intrigeri
8cb562f87c Syntax fix. 2010-10-16 22:32:25 +02:00
intrigeri
a643172a79 New option sshd_ports that obsoletes sshd_port.
Backward compatibility is preserved.
2010-10-16 16:05:00 +02:00
intrigeri
23efb583bf Cleanup templates: sshd_port is guaranteed by init.pp not to be empty. 2010-10-16 16:01:24 +02:00
intrigeri
b9a8b7b3df Add template for Debian Squeeze. 2010-10-03 19:56:48 +02:00
intrigeri
0615dc635c Actually allow enabling ChallengeResponseAuthentication on Debian Lenny. 2010-10-03 19:56:04 +02:00
Silvio Rhatto
0e9f8844a0 Adding Ubuntu_lucid.erb 2010-05-18 20:30:50 -03:00
Silvio Rhatto
bbc03d2c10 PrintMotd using default OpenSSH setting 2009-12-27 14:01:55 -02:00
mh
caccb4deb5 set protocol 2 for centos, required. 2009-12-11 09:35:34 +01:00
mh
bdf7bd334e merged with riseup module, various cleaning up 2009-12-10 23:15:07 +01:00
mh
37736c895f upstream capability, fix new lines
- added new upstream options
- don't put new lines for control statements
2009-12-07 16:03:57 -05:00
mh
57eae8bc84 disable gssapi 2009-12-07 16:03:52 -05:00
Micah Anderson
93e2f4d4c0 Template out the possibility of specifying the key word 'off' to the
$sshd_port parameter, which simply puts a comment in front of that
option, rather than specifying it.
2009-07-07 20:55:13 -04:00
Micah Anderson
f44776cbbf replace the sshd_additional_options variable with two, one called
sshd_head_additional_options and one called sshd_tail_additional_options.
the first puts the value at the beginning of the file, and the second at
the end.

This is necessary due to some option ordering requiring things to be
before others
2009-07-07 20:52:40 -04:00
Micah Anderson
78938cde2a Fix location of default sftp-server on Debian, and uncomment the sftp
configuration line to get the sshd_config file defaults to be more
like the standard shipped defaults from Debian
2008-12-07 12:15:41 -05:00
Micah Anderson
1f25b213e1 Debian's sshd config typically has PrintMotd no set because its already printed via PAM.
Without it set, it is defaulted to 'yes', which results in the MOTD being printed twice, so
we return the Debian default configuration in this commit
2008-10-27 15:45:11 -04:00
mh
96bbe0adb8 new options, cleaned up real_ hack
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2527 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-10-20 22:46:50 +00:00
mh
1bda0022c1 added link for lsb stuff
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2264 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-09-29 22:41:25 +00:00
mh
9ce186f5c3 merged with riseup
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2263 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-09-29 22:37:26 +00:00
mh
8f006bb6a0 removing PrintMotd and PrintLastLog disabling options from debian template, they should be enabled imho
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@1876 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-07-17 16:09:00 +00:00
mh
ece3afde12 merged with puzzle
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@1614 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-06-13 21:01:39 +00:00
mh
0603077ce6 moved /dist/-stuff to /files/, heavily refactored a lot, made it more look all the same way. some sources added here and there. hope it still works everything, the location on the disk of /files/ is still call dists. no need to hurry to change that
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@1160 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-04-04 15:30:26 +00:00
mh
c140469f04 added new var to template
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@831 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-02-17 21:15:28 +00:00
mh
cdafb27013 added Debian sshd config
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@728 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-02-02 00:05:14 +00:00
mh
58304b2f27 added barricada
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@343 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-01-02 18:02:20 +00:00
mh
ddb169a36e moved sshd to templates so they are cpable of having different allowed_users
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@330 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2007-12-27 15:42:16 +00:00