Commit Graph

215 Commits

Author SHA1 Message Date
Florian Ermisch
bff3e5d199 Merge pull request #80 from llua/use_pam
do not set UsePAM on OpenBSD
2017-01-15 12:04:07 +01:00
Eric Cook
686fc2c4ee do not set UsePAM on OpenBSD
Upstream opensshd does not support PAM
2017-01-14 18:38:37 -05:00
Forrest
086937b84f Merge pull request #76 from freach/master
openssh.auth will produce invalid SLS definition if sshd_config configs are missing
2016-11-02 09:06:07 -07:00
Simon Pirschel
1b69ecab2c fix issue with stripping new line will result in invalid SLS definition if AuthorizedKeysFile is missing in sshd_config 2016-11-02 15:21:50 +01:00
Forrest
0c06e247d5 Merge pull request #75 from freach/master
sshd won't start if AddressFamily option is specified
2016-11-01 09:09:49 -07:00
Simon Pirschel
2a1b8fbc66 fix issue sshd won't start if AddressFamily is specified, because it must be defined before ListenAddress 2016-11-01 13:24:30 +01:00
Forrest
ec663a6f5e Merge pull request #51 from mathieupotier/master
Put ssh keys on configured path in sshd_config (AuthorizedKeysFile)
2016-10-31 09:32:50 -07:00
Forrest
263575e57e Merge pull request #74 from llua/arch_sftp
fix Subsystem directive on archlinux
2016-10-29 21:15:46 -07:00
Eric Cook
51fd8b1391 fix Subsystem directive on archlinux 2016-10-30 00:06:02 -04:00
Forrest
8c1d02f249 Merge pull request #73 from omltorg/updated_archlinux_pkg_name
Update name of package containing dig on ArchLinux
2016-10-14 16:17:59 -07:00
omltorg
de66dbee97 Update name of package containing dig on ArchLinux 2016-10-14 22:25:56 +00:00
Forrest
8d1e730907 Merge pull request #72 from kyrias/AuthKeysCmd
Add AuthorizedKeysCommand support
2016-10-02 11:59:37 -07:00
Johannes Löthberg
a74d859992 Add AuthorizedKeysCommand to pillar.example
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-10-02 10:37:11 +02:00
Johannes Löthberg
02b52fa7cf Add AuthorizedKeysCommand support
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-10-01 20:53:44 +02:00
Forrest
329a762e01 Merge pull request #71 from BT-dschleich/patch-1
Fix mine function example in README.rst
2016-09-08 09:11:50 -07:00
Dominik Schleich
7113243334 Fix mine function example in README.rst
like it was already done in the pillar.example in this PR https://github.com/saltstack-formulas/openssh-formula/pull/36 to avoid confusions.
2016-09-08 13:28:22 +02:00
Mathieu POTIER
760a2ad277 fix the path to authkeys
Allow user to specify aliased path (with %u)
2016-08-02 09:54:46 +02:00
Mathieu POTIER
4c814843f8 Merge remote-tracking branch 'refs/remotes/saltstack-formulas/master' 2016-08-02 09:46:08 +02:00
Forrest
5e979f3843 Merge pull request #69 from pepoluan/pepoluan-moduli_pull
Allow moduli to be pulled as file
2016-08-01 10:14:30 -07:00
Pandu E Poluan
11ba2acea7 Give information on using moduli_source
Give additional comments to inform that moduli can also be provided via a file, using the moduli_source key.
2016-08-02 00:03:14 +07:00
Pandu E Poluan
e6603ae62a Allow moduli to be pulled as file
Added Jinja logic to allow the option to pull the moduli from an online source.
2016-08-01 23:59:11 +07:00
Forrest
8ea31fd661 Merge pull request #68 from levlozhkin/master
Convert dig exist check to unless req to remove spurious change in report
2016-07-19 13:46:56 -07:00
Lev Lozhkin
781be61881 Convert dig exist check to unless req 2016-07-19 13:23:48 -07:00
Niels Abspoel
7eefd1a0f1 Merge pull request #67 from anderbubble/redhat-openssh-cl
Correct openssh-clients package name for Red Hat
2016-07-04 22:08:04 +02:00
Jonathon Anderson
87057c7c6b Correct openssh-clients package name for Red Hat 2016-07-01 23:53:00 -06:00
Wolodja Wentland
118577283a Merge pull request #65 from aboe76/more_authentication_options
add more authentication options
2016-05-26 22:04:16 +02:00
Niels Abspoel
641851632f add more authentication options 2016-05-26 21:57:02 +02:00
Niels Abspoel
e6657df0d8 Merge pull request #64 from Atomics/master
Implement Session idle time out
2016-05-25 09:55:16 +02:00
Matthieu DERASSE
3542a1f534 Implement Session idle time out 2016-05-25 00:06:45 +02:00
Forrest
22037f7b8b Merge pull request #63 from llua/arch_bind_utils
set dig_pkg on arch linux for issue #59
2016-05-09 20:52:42 -07:00
Forrest
6f9c7b7dba Merge pull request #62 from llua/patch-1
add OpenBSD to map.jinja
2016-05-09 20:52:07 -07:00
Eric Cook
dfb04a43b4 set dig_pkg on arch linux for issue #59 2016-05-09 23:47:57 -04:00
llua
bd8d46d784 add OpenBSD to map.jinja 2016-05-09 23:44:20 -04:00
Forrest
f7c84783f0 Merge pull request #61 from babilen/relax-ssh-defaults
Drop overly biased ssh_config defaults
2016-05-04 12:32:48 -07:00
Wolodja Wentland
49923a6371 Drop overly opinionated ssh_config defaults
This set of options reflect the ssh_config options that are set by
default on Debian. The way this was set before has the potential to
break exisisting setups that rely on "normal" defaults, rather than the
rather opinionated ones that are now being shipped with this formula.
2016-05-04 18:25:01 +02:00
Forrest
d3ac3734f4 Merge pull request #58 from smlloyd/master
Add sshd_config to map.jinja, and only install dig package if dig command not found.
2016-04-18 18:13:49 -07:00
Simon Lloyd
daed52de19 Add sshd_config to map.jinja and check if dig command is available before installing 'dig' package. 2016-04-19 02:53:14 +02:00
Niels Abspoel
a85c19c256 Merge pull request #57 from tampakrap/fix_subsystem_sftp_path_for_sle
Fix the default Subystem sftp-server path for SLE
2016-03-23 14:52:52 +01:00
Theo Chatzimichos
0abbaac60d Fix the default Subystem sftp-server path for SLE 2016-03-23 14:41:25 +01:00
Forrest
d5db2a6e89 Merge pull request #55 from nigelsim/default-host
Allow Host: * options to be overridden in the pillar
2016-01-13 22:18:47 -08:00
Nigel Sim
1e515b0f5d make the host option rendering support lists by refactoring the main option rendering code
put the ssh_config Host:* options in the defaults file so they can be overridden
2016-01-14 02:57:45 +00:00
puneet kandhari
a2408d5e1e Merge pull request #54 from ketzacoatl/patch-1
Add support for Host definitions in ssh_config
2016-01-03 14:56:04 -06:00
ketzacoatl
143451eb19 Add support for Host definitions in ssh_config
This gives us the ability to define system-wide definitions for specific Hosts, and their options.

For example, with this in pillar:

```
# this is the place for host-wide SSH config
ssh_config:
  ...
  Hosts:
    # this simplifies cloning with custom params
    # eg: git clone my-git:foo/bar
    my-git:
      User: git
      HostName: git.example.com
      Port: 2222
```

This would add a section in `/etc/ssh/ssh_config`:

```
Host my-git
    User git
    HostName git.example.com
    Port 2222
```
2016-01-02 18:12:55 -05:00
ek9
33344743b0 Add ability to control SSH server status (default: on) 2015-12-27 18:17:01 +01:00
Nitin Madhok
d14f8db721 Merge pull request #53 from abednarik/replace_deprecated_function_iteritems
Replaced iteritems deprecated function with items
2015-11-30 07:31:35 -05:00
abednarik
b813b4b52a Replaced iteritems deprecated function with items 2015-11-30 09:25:28 -03:00
Forrest
c5aaffa9a9 Merge pull request #52 from abednarik/frebsd_stpf_subsystem_path
Added default path for sftp Subsystem in FreeBSD
2015-11-29 13:31:39 -08:00
abednarik
3791b11380 Added default path for sftp Subsystem in FreeBSD 2015-11-29 15:56:17 -03:00
POTIER Mathieu
f55445211c Specify config clause only if defined in pillar.
Signed-off-by: POTIER Mathieu <mathieu.potier@onzeway.eu>
2015-11-18 20:33:50 +01:00
POTIER Mathieu
dda1fb5128 Put ssh keys on configured path in sshd_config (AuthorizedKeysFile)
Signed-off-by: POTIER Mathieu <mathieu.potier@onzeway.eu>
2015-11-17 11:09:37 +01:00