Commit graph

281 commits

Author SHA1 Message Date
mh
384b1466ea switch to new lsb way 2009-12-07 16:04:26 -05:00
mh
c8e0ef9ede better set the variables in the init 2009-12-07 16:04:22 -05: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
5e20e07d1f factor everything into its own file 2009-12-07 16:03:55 -05:00
mh
57eae8bc84 disable gssapi 2009-12-07 16:03:52 -05:00
mh
62ba8525f1 do not quote default! 2009-12-07 16:03:49 -05:00
mh
e3cb846f32 try if setting a target fixes the problem 2009-12-07 16:03:46 -05:00
mh
d92fa75793 changed target behaviour 2009-12-07 16:03:42 -05:00
mh
6bf0a1bbc7 adjusted to new usage of booleans 2009-12-07 16:03:39 -05:00
mh
9e36776ee6 adjusted to new usage of booleans 2009-12-07 16:03:34 -05:00
Micah Anderson
6601c38296 Revert "fix missing curly brace" -- this was actually correct
This reverts commit d4fba70a51.
2009-10-01 18:30:02 -04:00
Micah Anderson
d4fba70a51 fix missing curly brace 2009-09-29 15:32:36 -04:00
Micah Anderson
2c3f632e90 fix previous change which took the client/server packages out of the linux class
and instead allow for a version change through an if variable. thanks ng!
2009-07-09 12:15:10 -04:00
Micah Anderson
d86ec97ab0 same problem with the openssh-clients in the sshd::client::linux class 2009-07-07 21:04:23 -04:00
Micah Anderson
55e0a6178b the sshd::linux class cannot also define the openssh package
if we are to have the possibility of potentially overriding the version number it must be done in the base class
2009-07-07 21:02:31 -04: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
dfebe2a9b5 make it possible to override what version of openssh-server and client are installed by providing the variable $sshd_ensure_version, which defaults to the previous value of present when not specified 2009-07-07 20:55:01 -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
60eb9319d3 removed the facter/sshkeys.rb, this is handled by facter now days, so it is no longer necessary to provide it 2009-07-02 13:00:42 -04:00
Micah Anderson
5161c4332a Merge commit 'anarcat/master' 2008-12-07 12:17:12 -05: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
667d7e30df Merge commit 'ng/master'
Conflicts:

	manifests/init.pp

Conflict due to indentation formatting differences
2008-12-07 12:12:33 -05:00
Antoine Beaupre
461bc0c2f0 emit a warning instead of info when the ssh server doesn't have an sshrsa key
also export the key based on ip address, removing all warnings
2008-12-06 19:12:17 -05:00
Antoine Beaupre
992e6e0f07 use the proper fact to export ssh keys. See http://projects.reductivelabs.com/issues/show/1799#note-1 2008-12-06 18:39:53 -05:00
Antoine Beaupre
fa072188dc make saner defaults for authorized_keys
note that this removes the user => root default
2008-12-02 16:56:19 -05:00
mh
ec2501d07c unified naming
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2674 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-11-07 20:40:24 +00:00
mh
7103d6bfcc check ssh with nagios
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2672 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-11-07 20:19:31 +00:00
Micah Anderson
6fb10939af In debian, the daemon is run as 'sshd', but the initscript is
/etc/init.d/ssh, which means that name needs to be set to 'ssh', and
pattern needs to be set to 'sshd', and then we set the hassstatus and
hasrestart depending on the lsbdistcodename
2008-10-27 17:00:39 -04:00
Micah Anderson
49d840dab4 lsbdistcodename is the proper variable to check for if the system is debian or lenny 2008-10-27 16:20:26 -04: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
Micah Anderson
98ddbe8ef5 change the debian 'hasrestart' option to a selector based on which $debian_version is detected,
etch does not have a ssh restart option in the initscript, but lenny does
2008-10-26 12:39:45 -04:00
Micah Anderson
1b2dcaf510 update formatting to be consistent with upstream puppet emacs mode, if this is different from the vim
mode, then there is a difference between these two editor's formatting that needs to be resolved
2008-10-23 15:04:47 -04:00
Micah Anderson
50c52b8483 Merge branch 'master' of gitosis@labs.riseup.net:module_sshd 2008-10-23 15:01:53 -04:00
Micah Anderson
96760cc558 debian has both status and restart options, in fact restart is
preferable because a stop/start operation can leave sshd broken
because the stop wont stop before the start is run. On the next puppet
run ssh will be brought back up, but its a hair-raising few minutes
while you wonder what happened
2008-10-23 14:59:42 -04:00
Pietro Ferrari
ae5215705a Merge commit 'immerda/master' 2008-10-21 02:03:37 +02: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
68b72b545b remove deprecated define
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2317 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-10-02 22:04:31 +00:00
Micah Anderson
90f14f4ae4 Merge commit 'ng/master' 2008-09-30 21:04:46 -04:00
mh
fce684ca58 fix correct inheritance
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2272 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-09-30 20:13:47 +00:00
mh
456fec72ed remove dependency completly
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2267 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-09-29 22:50:28 +00:00
mh
f733562469 moved package depency to the linux class, openbsd doesn't have this package
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2266 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-09-29 22:48:35 +00:00
mh
1afa887a2e factored out the package to some subclasses as openbsd doesn't need such a package
git-svn-id: https://svn/ipuppet/trunk/modules/sshd@2265 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
2008-09-29 22:45:39 +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
Micah Anderson
16dd74a7de include assert_lsbdistcodename for debian 2008-09-28 13:40:35 -04:00
Micah Anderson
aa3badea81 add some comments to clarify how to set variables, and provide examples 2008-09-28 12:38:18 -04:00
Micah Anderson
c751cf22ed clarify in the example about how you can set multiple ListenAddresses with the right syntax
also set the default to be 0.0.0.0 and :: which is the normal default for all IPv4 and all IPv6 addresses
2008-09-27 17:45:57 -04:00
Micah Anderson
d827a52614 rename the templates to coincide with the downcased lsbdistcodename
also add a missing comma in the content selector
2008-09-27 16:51:32 -04:00
Micah Anderson
57eb2df037 Change the template naming:
1. remove the _normal suffix, as it is not used
2. add a selector to look for the variable $lsbdistcodename being set and use that in selecting a template
this is useful to create a Debian_Etch.erb and a Debian_Lenny.erb which can have different values. For example
the Debian Etch version of openssh does not have the AllowAgentForwarding option, and if it is included, ssh will
fail to start
2008-09-27 16:42:08 -04:00
Micah Anderson
0c7bc1b107 remove some newlines from the template to clean it up a bit 2008-09-27 15:32:12 -04:00