Commit Graph

474 Commits

Author SHA1 Message Date
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
Forrest
d27e4c94bf Merge pull request #18 from rfairburn/master
Support the 'match' syntax in sshd_config
2014-09-19 10:22:28 -07:00
Robert Fairburn
8616d3d130 fix comment 2014-09-19 12:01:57 -05:00
Robert Fairburn
51277cc2f9 add pillar example 2014-09-19 11:42:17 -05:00
Robert Fairburn
b24101264f make sure to match options as the options dict! 2014-09-19 11:26:10 -05:00
Robert Fairburn
1a2de43ed7 defaults do not need a prefix 2014-09-19 11:21:31 -05:00
Robert Fairburn
85c97b450a fix a typo in keywords being sent improperly 2014-09-19 11:19:37 -05:00
Robert Fairburn
abf6e09fbb Fix a typo in the match jinja 2014-09-19 11:16:58 -05:00
Robert Fairburn
ba72c1e8b7 remove prefix when not needed 2014-09-19 10:55:19 -05:00
Robert Fairburn
c100fc88a3 allow for "Match" inside of an sshd_config 2014-09-19 10:47:35 -05:00
Nitin Madhok
df61e44fea Merge pull request #17 from alanpearce/generate-keys
Config: Add support for generating keys
2014-08-24 10:46:53 -05:00
Alan Pearce
eb9dec1b9d Update pillar example 2014-08-24 16:44:45 +01:00
Alan Pearce
6fb57f40bc Config: Add support for generating keys 2014-08-24 16:09:12 +01:00
Nitin Madhok
7a409e1821 Merge pull request #16 from alanpearce/ecdsa
Add support for ECDSA host keys
2014-08-24 09:02:09 -05:00
Alan Pearce
25aa1a6733 Update pillar.example 2014-08-24 12:18:37 +01:00
Alan Pearce
73eaef4ea0 Config: Add support for ECDSA host keys 2014-08-24 11:55:38 +01:00
Alan Pearce
ce46343562 Config: Refactor host key provisioning into loop 2014-08-24 11:55:38 +01:00
Seth House
91b5030018 Merge pull request #15 from alanpearce/root-group
Remove reference to root group
2014-08-19 18:05:18 -06:00
Alan Pearce
2876a691b0 Remove reference to root group
By not specifying it, root user's group should be used.
2014-08-19 21:44:38 +01:00
Forrest
2f844e5b21 Merge pull request #14 from alanpearce/freebsd
Add FreeBSD compatibility
2014-08-08 09:55:48 -07:00
Alan Pearce
edc208b79b Add FreeBSD compatibility 2014-08-08 13:38:27 +01:00
Nitin Madhok
b39ea29c0c Update README.rst
Fixing broken link
2014-07-28 19:03:24 -04:00
Forrest
813c28e633 Merge pull request #13 from westurner/add-UseDNS-option
Add a UseDNS option
2014-07-22 10:28:10 -07:00
Wes Turner
44946b4142 Add a UseDNS option to pillar.example 2014-07-22 00:37:41 -05:00
Wes Turner
970777b9bb Add a UseDNS option to sshd_config 2014-07-22 00:35:11 -05:00
Seth House
11eb243c1c Merge pull request #11 from z-saltstack/config-like-salt-formula-and-ubuntu-default
Readability & Ubuntu default
2014-05-08 08:54:41 -06:00
Oleg Tsarev
48ebd1b07b Changed sshd_config generation to more readable scheme.
Synced file with default from Ubuntu 12.04 latest
2014-05-05 19:28:13 +04:00
Seth House
cee3f097f0 Merge pull request #12 from z-saltstack/auth-sls-clean-whitespaces
Removed unneeded whitespace from auth.sls
2014-04-28 18:03:58 -06:00
Seth House
b5c71c5bf9 Merge pull request #10 from matthew-parlette/master
Cleared out static parts of config since it was causing issues
2014-04-28 18:02:24 -06:00
matthew-parlette
4b4f4b5d3d Explicitly defined options as strings.
This fixes an issue where PyYAML was converting yes and no into True and False in the generated sshd_config file.
2014-04-27 14:52:58 -04:00
matthew-parlette
cdfab3953d Define a line for each option.
This provides a default option (according to the package-provided config file) for each option in the config.
2014-04-26 18:22:17 -04:00
Oleg Tsarev
7521398506 Removed unneeded whitespace from auth.sls 2014-04-26 22:40:29 +02:00
matthew-parlette
2f28a008c2 Cleared out static parts of config since it was causing issues 2014-04-25 16:33:07 -04:00
Seth House
b44c26cd13 Moved the rsa/dsa key management to config.sls 2014-03-17 16:17:04 -06:00
Seth House
351a6b81dc Merge remote-tracking branch 'origin/pr/3'
Conflicts:
	openssh/files/sshd_config
	openssh/init.sls
	pillar.example
2014-03-17 16:14:17 -06:00
Joseph Hall
54b99b5615 Merge pull request #8 from carlosperello/master
Allow to manage ssh certificates from pillar definitions
2014-02-09 17:19:20 -07:00
Carlos Perelló Marín
e2cddca13e Reverted the namespace change to avoid conflicts and backward incompatibilities 2014-02-09 23:42:52 +01:00