Commit Graph

160 Commits

Author SHA1 Message Date
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
Niels Abspoel
6e65cdad03 add DenyUsers and DenyGroups example 2015-01-17 20:04:03 +01:00
Niels Abspoel
33ee945557 Added AllowUsers,AllowGroups,DenyUsers,DenyGroups
This will add more options to set to secure openssh
- AllowUsers
- AllowGroups
- DenyUsers
- DenyGroups
2015-01-16 22:56:59 +01:00
Forrest
23c725aaeb Merge pull request #27 from maytechnet/feature/config
add ed25519 host key type; add AuthenticationMethods option
2015-01-16 10:49:33 -08:00
Bohdan Kmit
b843d8168b add ed25519 host key type; add AuthenticationMethods option 2015-01-16 17:21:10 +00:00
Forrest
b62872591c Merge pull request #25 from aboe76/archlinux_support
added archlinux support to openssh map.jinja
2014-12-31 16:28:59 -08:00
Niels Abspoel
5871efb5bd added archlinux support to openssh map.jinja 2015-01-01 00:44:17 +01:00
Wolodja Wentland
e4944f7f8f Merge pull request #24 from fpletz/feature/ed25519_host_keys
Add support for ed25519 host keys
2014-12-15 10:09:25 +00:00
Franz Pletz
5d0f69ad2c Cleanups for host key pillar example 2014-12-15 07:00:45 +01:00
Franz Pletz
33f21a0976 Add support for ED25519 host keys 2014-12-15 07:00:17 +01:00
Nitin Madhok
620cc0f199 Update map.jinja 2014-12-08 16:01:00 -05:00
Nitin Madhok
131a5cafcb Update map.jinja 2014-12-08 15:46:30 -05:00
Nitin Madhok
9263857193 Update map.jinja
Correct indentation
2014-12-08 15:43:40 -05:00
Nitin Madhok
d697cf0570 Merge pull request #23 from aboe76/opensuse_support
Added Opensuse support to map.jinja
2014-12-08 15:41:50 -05:00
Niels Abspoel
1efce43d55 Added Opensuse support to map.jinja 2014-12-08 21:38:23 +01:00
Nitin Madhok
74b1e189c3 Merge pull request #22 from openenvi-formulas/master
Fix jinja spacing mistake for unknown options
2014-11-18 18:09:56 -05:00
Skyler Berg
a83409182f Fix jinja spacing mistake for unknown options
When specifying multiple unknown ssh options, they would all appear on
the same line.
2014-11-18 14:58:57 -08:00
Nitin Madhok
1542a3592f Merge pull request #19 from TimJones/patch-1
Allow newline after ListenAddress
2014-10-26 12:33:06 -07:00
Tim Jones
09ca7de060 Allow newline after ListenAddress 2014-10-26 20:27:11 +01:00