Commit Graph

201 Commits

Author SHA1 Message Date
Karsten Kosmala c9fecc1d96 renamed variables 2016-06-13 17:24:43 +02:00
Karsten Kosmala c735c6e915 add pillar data 2016-06-13 17:24:43 +02:00
Karsten Kosmala fa02b954a5 set user and group of user dir in pillar 2016-06-13 17:24:43 +02:00
Niels Abspoel ee75a7ecd1 Merge pull request #116 from myii/PR_FixGitConfigError
Resolve `git.config` error where minion does not have Git installed #115
2016-06-09 10:40:45 +02:00
Imran Iqbal 846634bfd7 Resolve `git.config` error where minion does not have Git installed #115 2016-06-09 09:13:32 +01:00
Niels Abspoel 0ab6e3d12b Merge pull request #114 from hatifnatt/hatifnatt-user_files.sls
Default path for home folder in user_files.sls if home omitted in pillar [fixed style].
2016-06-02 19:42:58 +02:00
Roman 4b1432fa92 Merge pull request #8 from hatifnatt/master
Pull changes from master
2016-06-02 16:50:13 +03:00
Roman 39bf6aa207 Merge pull request #7 from saltstack-formulas/master
Pull changes from main repo.
2016-06-02 16:49:04 +03:00
Niels Abspoel aed2394758 Merge pull request #112 from saltstack-formulas/revert-107-master
Revert "User files state without defined home directory"
2016-05-25 21:56:07 +02:00
Forrest b7370f7dfb Revert "User files state without defined home directory" 2016-05-12 11:18:44 -07:00
Forrest d3e3122624 Merge pull request #107 from phadadi/master
User files state without defined home directory
2016-03-10 13:01:37 -08:00
Peter Hadadi dd27842da3 User files state without defined home directory 2016-03-10 21:47:19 +01:00
Wolodja Wentland eeb232d9f6 Merge pull request #106 from iondulgheru/master
also load ssh keys from pillar data
2016-02-02 15:07:36 +01:00
Ion Dulgheru 78914053ae also load ssh keys from pillar data 2016-02-02 15:58:39 +02:00
Roman c2abcabb7e Merge pull request #6 from hatifnatt/master
Pull changes from main repo.
2015-12-25 00:52:54 +03:00
Roman 6e3c771b52 Merge pull request #5 from saltstack-formulas/master
Pull changes from main repo.
2015-12-25 00:50:58 +03:00
Forrest 741b256684 Merge pull request #104 from leifcr/leifcr-user-group-patch
Use the primary group for the user when creating authorized_keys
2015-12-16 10:56:15 -08:00
Leif Ringstad 90021bf848 Use the primary group for the user when creating authorized_keys
If a primary group is set on the user, and a authorized_keys is provied in ssh_auth_file, the formula fails. This solves that by using the user_group set earlier in the formula
2015-12-15 21:21:00 +01:00
puneet kandhari a93f97fb3d Merge pull request #102 from 0xf10e/mitigate_salt_29004
Mitigate Salt issue #29004, fixes "expire" on *BSD
2015-11-18 09:42:19 -06:00
root 3760fea1f5 Mitigate Salt issue #29004, fixes "expire" on *BSD
Unreasonable values for 'expire' (after 9999-12-31
on Linux, before 1975-01-01 on *BSD) get divided
by 86400 (number of seconds in a day) when too big
or multiplied by 86400 when too small.

Tested on CentOS 6 (Salt 2015.5.5) and FreeBSD 10.2
(Salt 2015.8.0) with following values:

  - 24854 (2038-01-18 in days since epoch)
  - 157766400 (1975-01-01 00:00:00 UTC in seconds since epoch)
  - 3313526400 (2075-01-01 00:00:00 UTC in seconds since epoch)
  - 16000 (2013-10-22 in days since epoch)
  - 18000 (2019-04-14 in days since epoch)

(Sponsored by av.tu-berlin.de and fokus.fraunhofer.de)
2015-11-18 16:13:55 +01:00
Forrest 76f646ec06 Merge pull request #87 from smlloyd/master
Don't add sudo group by default.
2015-11-13 12:35:08 -08:00
Roman aa20e793d9 Merge pull request #4 from saltstack-formulas/master
Pull changes from main repo.
2015-11-12 20:57:35 +03:00
Roman c05d2e635b Update user_files.sls
Default path for home folder in user_files.sls if home omitted in pillar.
2015-11-12 20:53:07 +03:00
Wolodja Wentland e808c18cb4 Merge pull request #101 from ketzacoatl/patch-1
update pillar.example to include uid
2015-11-11 14:19:11 +01:00
ketzacoatl 27075b073d update pillar.example to include uid
in an attempt to save others from digging into the source (to confirm this detail)
2015-11-11 05:02:07 -05:00
Roman 2763338abe Update user_files.sls
Fix for:
Rendering SLS 'base:users.user_files' failed: Jinja variable 'dict object' has no attribute 'home'
2015-11-09 02:31:45 +03:00
puneet kandhari bcd6b44c70 Merge pull request #98 from outime/master
Adds 'empty_password' statement for states.user.present (issue #97)
2015-09-27 12:00:07 -05:00
outime 965372d0d2 Changed 'empty_password' key retrieval method 2015-09-27 18:59:09 +02:00
outime 441d3cb635 Fixed typo and 'empty_password' key check 2015-09-27 17:46:29 +02:00
outime 851a59e952 Adds 'empty_password' statement for states.user.present 2015-09-27 16:20:45 +02:00
Forrest d3d6cfba61 Merge pull request #96 from skandyla/master
changing visudo checking to avoid wrong reporting when launched in a test mode
2015-09-21 10:36:37 -07:00
Serg Kand 819d73a596 changing visudo checking to avoid wrong reporting when launched with test=true 2015-09-20 16:21:34 +03:00
Forrest 7b0b86f01f Merge pull request #94 from M2Mobi/master
Fix minor bug for ssh known_hosts management with salt >= 2015.5.5.
2015-09-17 10:19:59 -07:00
Heinz Wiesinger 221f1ccef4 Fix minor bug for ssh known_hosts management with salt >= 2015.5.5.
This version complains that "argument port can not be used in
conjunction with argument hash_hostname", so add hash_hostname
to the fields we handle in the formula so we can override it
if needed.
2015-09-17 10:04:38 +02:00
Forrest 014805de29 Merge pull request #93 from maschinetheist/master
Added ability to specify room number, home phone, and work phone
2015-09-13 12:04:37 -07:00
maschinetheist f087f165f3 Added ability to specify room number, home phone, and work phone as per https://docs.saltstack.com/en/develop/ref/states/all/salt.states.user.html 2015-09-12 16:22:42 -05:00
Forrest 3d2a32432f Merge pull request #92 from M2Mobi/master
Add possibility to manage the user's global git configuration.
2015-09-11 09:52:03 -07:00
Heinz Wiesinger 452b8ee8cf Add possibility to manage the user's global git configuration. 2015-09-11 13:25:19 +02:00
puneet kandhari 9dd98d57e7 Merge pull request #91 from M2Mobi/master
Add possibility to manage ssh's known_hosts file.
2015-08-28 07:39:07 -05:00
Heinz Wiesinger 74d5f6cc3c Add possibility to manage ssh's known_hosts file. 2015-08-28 11:49:38 +02:00
Forrest 57811826af Merge pull request #90 from spoage/manage-arbitrary-user-files
Manage arbitrary user files
2015-08-21 18:39:49 -07:00
Shane Poage b986e1e7f2 Skips user if it's enabled without a specified source, and their directory does not exist. 2015-08-21 20:03:20 -05:00
Shane Poage cdb862e968 Added feature to allow syncing arbitrary sets of files per user. 2015-08-21 15:42:25 -05:00
puneet kandhari 9629cfe348 Merge pull request #89 from spoage/ssh_auth-use-pillars
Add ssh_auth_pillar option.
2015-08-21 12:18:37 -05:00
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