Commit Graph

507 Commits

Author SHA1 Message Date
Shane Poage
a0d7d9fa6e Fixed indentation in key contents for authorized_keys 2015-08-21 11:20:07 -05:00
Shane Poage
ff189c1613 Added ability to provide pillar path for ssh_auth. 2015-08-21 05:17:49 -05:00
puneet kandhari
23ede3ac67 Merge pull request #88 from 0xf10e/rm_iteritems
iteritems() -> items, break some way to long lines
2015-08-18 09:30:36 -05:00
Florian Ermisch
99a1a66010 break some of those horribly long lines
sry, could not resist.
2015-08-18 16:27:25 +02:00
Florian Ermisch
17cc04c041 iteritems() -> items() for python3 2015-08-18 16:12:36 +02:00
Simon Lloyd
60e94564d1 Don't add sudo group by default.
This formula doesn't really require the sudo group (unless
there are actually users in that group). Moreover, on FreeBSD
the 'admin' group would be wheel and not sudo.
2015-08-13 23:57:09 +02:00
puneet kandhari
b0e964f942 Merge pull request #86 from amontalban/master
Add support for .profile file
2015-08-09 13:36:57 -05:00
Andres Montalban
750f2e6345 Add support for .profile file 2015-08-09 13:59:51 -03:00
Forrest
71c7323683 Merge pull request #85 from titilambert/patch-1
Add missing ssh_config test to create .ssh folder
2015-08-03 22:25:12 -07:00
Thibault Cohen
3df9d8ae21 Add missing ssh_config test to create .ssh folder 2015-08-04 01:08:28 -04:00
puneet kandhari
ba11c68c24 Revert "@XenophonF made me do it"
This reverts commit a0392693e3.
2015-07-27 12:50:49 -05:00
puneet kandhari
a0392693e3 @XenophonF made me do it 2015-07-27 12:45:56 -05:00
puneet kandhari
03f2158f23 Merge pull request #83 from irtnog/fix-ignore-enforce_password-false
Do not escape value of `enforce_password`
2015-07-27 10:32:25 -05:00
Matthew X. Economou
c201269d1d Do not escape value of enforce_password
Fixes #82.
2015-07-27 11:13:11 -04:00
puneet kandhari
0e72cc20b9 Merge pull request #77 from irtnog/add-managed-file-permissions-to-ssh_keys_pillar-states
Rework ssh_keys_pillar-related states
2015-07-25 15:32:33 -05:00
puneet kandhari
5e91782cbe Merge pull request #79 from iamseth/master
Adding support for the enforce_password option.
2015-07-17 09:47:01 -07:00
Seth Miller
7dca1ebfd2 Adding support for the enforce_password option.
This will allow users change their passwords after the initial setting in Salt.
2015-07-17 10:18:38 -05:00
puneet kandhari
a7d348fb1f Merge pull request #78 from colekowalski/ssh-auth-file
the user's .ssh directory should be created if ssh_auth_file is supplied
2015-07-16 13:32:33 -07:00
Cole Kowalski
7dda5571db the user's .ssh directory should be created if ssh_auth_file is supplied 2015-07-16 15:23:43 -04:00
Matthew X. Economou
2f4c088e5d Rework ssh_keys_pillar-related states
SSH key pairs deployed via the user's ssh_keys_pillar dict aren't
handled the same as the user's ssh_keys, e.g., file ownership and
permissions aren't specified, and the keying material gets copied
directly into the SLS file.  This change rewrites the two templated
file.managed states to behave as follows:

  - set the files' owner to be the user

  - set the files' group to be the user's primary group

  - for the public key, set the mode to 644 (u=rw,go=r)

  - for the private key, set the mode to 600 (u=rw,g=)

  - pull the files' contents directly from pillar
2015-07-13 15:22:45 -04:00
puneet kandhari
001e913e77 Merge pull request #76 from pcdummy/master
Some smaller changes.
2015-07-13 07:24:35 -05:00
René Jochum
a1d6591447 Fix users/init.sls.
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 13:51:02 +02:00
René Jochum
2c4ed3edc9 Merge branch 'master' of github.com:pcdummy/saltstack-users-formula
Signed-off-by: René Jochum <rene@jochums.at>

Conflicts:
	pillar.example
	users/init.sls
2015-07-13 13:27:27 +02:00
René Jochum
00cc889683 Fix some smaller bugs.
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-11 10:35:15 +02:00
puneet kandhari
827fb76304 Merge pull request #75 from amontalban/master
Add sudo_rules syntax examples for rules with colons
2015-07-04 07:56:41 -05:00
Andres Montalban
e0acdc9b30 Add sudo_rules syntax examples for rules with colons 2015-07-04 09:30:50 -03:00
Forrest
b8f390e087 Merge pull request #73 from maytechnet/master
fix permission of GA config file
2015-07-01 10:34:19 -07:00
Bohdan Kmit
d0bbbda8aa readd 2fa pam enforcement 2015-07-01 19:15:31 +03:00
Bohdan Kmit
a467d2a80f fix permission of GA config file 2015-07-01 18:39:53 +03:00
Nitin Madhok
b64401c6b2 Merge pull request #71 from aboe76/improve_bashrc_vimrc
Enable/disable bashrc/vimrc per user
2015-06-11 17:41:28 -04:00
Niels Abspoel
622b846d7f Enable/disable bashrc/vimrc per user
Made both states configurable per user in pillar data
Had to drop extend, for this otherwise the extend would be empty if manage is
False
2015-06-11 23:34:16 +02:00
Nitin Madhok
7a7acd3c8e Merge pull request #70 from aboe76/add_vimrc
Add vimrc extension
2015-06-10 17:06:02 -04:00
Niels Abspoel
35b9679b1f Updated the Readme 2015-06-10 23:00:58 +02:00
Niels Abspoel
b4acac9de7 Added vimrc extension to users-formula
This will ensure that a given vimrc file in a users home dir is managed
Default it will search for a vimrc in salt://users/files/vimrc/{{ username
}}/vimrc
If this isn't found it will install salt://users/files/vimrc/vimrc
2015-06-10 22:56:57 +02:00
Nitin Madhok
605711f1a4 Merge pull request #69 from aboe76/add_bashrc
Added bashrc extension to users-formula
2015-06-10 16:39:54 -04:00
Niels Abspoel
eac091bf66 fix sources to source 2015-06-10 22:03:26 +02:00
Niels Abspoel
29ce431151 Added bashrc extension to users-formula
This will ensure a given bashrc file in a users home dir.
Default it will search for a bashrc in salt://users/files/bashrc/{{ username }}/bashrc
If no file is found it will install the default from
salt://users/files/bashrc/bashrc
2015-06-10 21:40:52 +02:00
Brian Jackson
69a4d981f3 Merge pull request #68 from roedie/add-ssh-config-management
Add ~/.ssh/config management
2015-05-19 12:31:30 -05:00
Sander Klein
3a8d72b947 Add "Do Not Edit" part 2015-05-16 09:56:20 +02:00
Sander Klein
57c82f3324 Add ~/.ssh/config management
This adds the ability to manage the ~/.ssh/config file for users.
2015-05-15 21:47:40 +02:00
Nitin Madhok
3fc2a2bac9 Removing extra new line characters 2015-05-07 13:39:04 -04:00
Forrest
9b11ec775b Merge pull request #67 from daschatten/master
Add prefix 'users_' to all first level keys to prevent duplicate ids …
2015-05-06 15:39:50 -07:00
Florian Bittner
701326e23f Add prefix 'users_' to all first level keys to prevent duplicate ids (e.g. in combination with zabbix-formula and key zabbis_user). 2015-05-07 00:07:06 +02:00
Forrest
4e70e924f4 Merge pull request #66 from c10b10/master
Add the ability to pull ssh keys from a different pillar
2015-05-01 11:12:28 -07:00
Alex Ciobica
031d6ce81f Add pulling keys from other pillar.
Example pillar:

ssh_keys:
  id_rsa:
    privkey: |
      -----BEGIN RSA PRIVATE KEY-----
      MIIEowIBAAKCAQEAoQiwO3JhBquPAalQF9qP1lLZNXVjYMIswrMe2HcWUVBgh+vY
      U7sCwx/dH6+VvNwmCoqmNnP+8gTPKGl1vgAObJAnMT623dMXjVKwnEagZPRJIxDy
      B/HaAre9euNiY3LvIzBTWRSeMfT+rWvIKVBpvwlgGrfgz70m0pqxu+UyFbAGLin+
      GpxzZAMaFpZw4sSbIlRuissXZj/sHpQb8p9M5IeO4Z3rjkCP1cxI
      -----END RSA PRIVATE KEY-----
    pubkey: |
      ssh-rsa MIIEowIBAAKCAQEAoQiwO3JhBquPAalQF9qP1lLZNXVjYMIswrMe2H....
2015-05-01 18:48:28 +03:00
Brian Jackson
fffad7d07a Merge pull request #65 from tiger-seo/master
fixing example for sudo defaults for specific user
2015-04-11 12:00:34 -05:00
tiger-seo
0aab4b5516 fixing example for sudo defaults for specific user 2015-04-11 15:14:36 +03:00
Nitin Madhok
a41e092d62 Merge pull request #64 from tiger-seo/master
possibility to define Defaults specific to user
2015-04-10 18:06:16 -04:00
tiger-seo
1546e2d186 possibility to define user-specific Defaults 2015-04-06 22:34:59 +03:00
Forrest
d11e7046ec Merge pull request #63 from andrew-vant/auth_from_files
Added option to source ssh public keys from files.
2015-04-02 10:57:08 -07:00