Commit Graph

428 Commits

Author SHA1 Message Date
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
puneet kandhari
67e500fb11 Merge pull request #49 from cloud-hero/master
Added configuration options for ssh_config
2015-10-27 12:54:13 -05:00
Bogdan Radulescu
84296a8f90 Updated the readme to clarify that people need to explicitly turn off root login 2015-10-27 16:48:06 +00:00
Bogdan Radulescu
13cf374efe Added configuration options for ssh_config
Made a small change to reflect the default sshd_config
2015-10-01 15:21:16 +00:00
puneet kandhari
331493194a Merge pull request #47 from bogdanr/master
The default value for ServerKeyBits is 1024 both upstream and in distros
2015-07-30 07:36:40 -05:00
Bogdan Radulescu
fd4381b769 The default value for ServerKeyBits is 1024 both upstream and in distros 2015-07-30 12:27:05 +00:00
Forrest
1af5151bc9 Merge pull request #45 from pcdummy/master
Use iteritems() instead of items().
2015-07-13 12:48:25 -07:00
René Jochum
c27f9a81f3 Use iteritems() instead of items().
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 16:00:22 +02:00
René Jochum
064d489f41 Use iteritems() instead of items().
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 15:59:44 +02:00
René Jochum
a013b79027 Use iteritems() instead of items().
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 15:56:25 +02:00
Nitin Madhok
1c5f6ee889 Merge pull request #44 from elfixit/master
add options to give a key size to generate_key
2015-07-12 12:27:18 -04:00
elfixit
18ba94d0fc add options to give a key size to generate_key 2015-07-12 18:09:26 +02:00
Forrest
22309fdee6 Merge pull request #43 from ingben/feature/ssh_moduli
Adds support to customize /etc/ssh/moduli file
2015-07-02 10:41:26 -07:00
Ingo Bente
a927107b28 Adds support to customize /etc/ssh/moduli file 2015-07-02 19:09:41 +02:00
Forrest
9c5f3ea819 Merge pull request #41 from ingben/feature/harden_sshd_config
adds support to harden sshd_config (KeyExchange, Ciphers, MACs)
2015-06-30 12:01:58 -07:00
Ingo Bente
83bb5ac5a0 adds support to harden sshd_config (KeyExchange, Ciphers, MACs) 2015-06-30 14:33:57 +02:00
Forrest
bec4a2a77e Merge pull request #40 from TJuberg/master
Stop messing up the first line in ssh_known_hosts
2015-06-25 10:33:45 -07:00
Thomas Juberg
6b68c44583 Stop messing up the first line in ssh_known_hosts 2015-06-25 14:28:26 +02:00
Forrest
92c2d24acb Merge pull request #39 from imran1008/arch-fix
Fix service name for Arch Linux
2015-06-20 13:21:49 -07:00
Imran Haider
4dddff0ccd Fix service name for Arch Linux 2015-06-20 14:24:51 -04:00
Forrest
f15a112e13 Merge pull request #38 from aboe76/remove_host_key_via_pillar
Add option to remove ssh_host_keys
2015-06-07 17:07:49 -07:00
Niels Abspoel
2a68ccac1a Add option to remove ssh_host_keys 2015-06-07 20:37:33 +02:00
Nitin Madhok
329ad59401 Merge pull request #37 from aboe76/add_defaults_map_jinja
Improve default lookup
2015-06-02 17:08:28 -04:00
Niels Abspoel
ca62b7d118 Improve default lookup
Added defaults.yaml and map.jinja similar to template-formula and salt-formula
2015-06-02 22:52:59 +02:00
puneet kandhari
e9bf653c03 Merge pull request #36 from aboe76/fix_mine_function_2015.5
Fix mine_function example in pillar.example
2015-05-28 16:08:17 -05:00
Niels Abspoel
3c828d9e08 Fix mine_function example in pillar.example
This fixes #34, salt version 2015.5.x needs an extra argument
for shell routines.
2015-05-28 23:00:27 +02:00
Forrest
0dd6a19fd3 Merge pull request #35 from zhujinhe/master
added the missing ":" and delete the redundant lines
2015-05-27 23:09:16 -07:00
朱金贺
5f65e92ebd added the missing ":" and delete the redundant lines 2015-05-28 13:36:11 +08:00
puneet kandhari
3ed21c0d3a Merge pull request #32 from onestic/master
Fix bug that added : at the end of the key
2015-05-22 07:39:47 -05:00
jvblasco
60691ef20d Fix bug that added : at the end of the key 2015-05-22 14:32:57 +02:00
Raphaël Hertzog
1b74efd2d0 Add a new openssh.known_hosts state
This state manages /etc/ssh/ssh_known_hosts and fills it with
public SSH host keys of other minions.
2015-03-26 17:50:32 +01:00
Nitin Madhok
9940513b6c Merge pull request #30 from sys4/master
add gentoo support
2015-03-23 12:58:46 -04:00
Marc Schiffbauer
c6aeaf4dc5 add gentoo support 2015-03-23 14:56:12 +01:00
Marc Schiffbauer
28e0916840 sort distros alphabetically 2015-03-23 14:55:40 +01:00
Nitin Madhok
7adb33ca01 Merge pull request #29 from brot/f/user_with_more_keys
Refactor auth.sls to allow more keys for one user
2015-01-29 10:55:12 +05:30
Bernd Schlapsi
128d4acfa2 Update pillar.example with two valid ssh-keys 2015-01-28 23:00:47 +01:00
Bernd Schlapsi
6efc981885 Refactor auth.sls to allow more keys for one user 2015-01-28 22:17:07 +01:00
Nitin Madhok
4e49e73e76 Merge pull request #28 from aboe76/allow_deny_users
Added AllowUsers,AllowGroups,DenyUsers,DenyGroups
2015-01-18 00:53:57 +05:30