Commit Graph

231 Commits

Author SHA1 Message Date
Forrest
b873db1aee Merge pull request #137 from soniah/current
temp fix on git executable
2016-12-07 21:34:26 -08:00
Sonia Hamilton
e81f6e695c temp fix on git executable 2016-12-08 03:29:03 +00:00
Forrest
bd4ffe5f5b Merge pull request #136 from Takios/master
Add support for hash_password
2016-12-01 09:07:14 -08:00
Fabian Niepelt
153d07452c Add support for hash_password 2016-12-01 16:59:51 +01:00
Matthias Nüßle
e014498dab Merge pull request #135 from saltstack-formulas/fix_absent_users
fix wrong variable name in absent_users
2016-11-30 16:36:29 +01:00
Matthias Nüssle
0d7ca5728c fix wrong variable name in absent_users 2016-11-30 16:33:38 +01:00
Forrest
2a8ef9f466 Merge pull request #108 from kossmac/master
set user and group of user dir in pillar
2016-11-29 09:19:03 -08:00
Karsten Kosmala
5985275022 Merge branch 'master' of https://github.com/saltstack-formulas/users-formula 2016-11-29 16:15:16 +01:00
Forrest
0c364461c7 Merge pull request #129 from aboe76/master
fix warning on managed file state for /etc/sudoers.d/username
2016-08-30 09:40:20 -07:00
Niels Abspoel
15ce6493cc fix warning on managed file state for /etc/sudoers.d/username 2016-08-30 17:36:29 +02:00
Wolodja Wentland
95e61e1abe Merge pull request #127 from daks/master
fixing removing of users based on pillar['absent_users'], fix #126
2016-08-10 18:12:38 +02:00
Eric Veiras Galisson
57fce16643 fixing removing of users based on pillar['absent_users'], fix #126 2016-08-10 10:32:46 +02:00
Forrest
214f690af7 Merge pull request #125 from jraby/Support-for-optional_groups
Support for optional_groups
2016-08-05 12:17:05 -07:00
jraby
8aa174782a Add example pillar data for optional_groups 2016-08-05 15:04:53 -04:00
jraby
5538eb18ab Support for optional_groups 2016-08-05 14:05:12 -04:00
Wolodja Wentland
6bc25c9099 Merge pull request #124 from SkypLabs/patch-1
Fix typos in README.rst
2016-07-28 19:09:05 +02:00
Skyper
83ab48c316 Fix typos in README.rst 2016-07-28 18:53:32 +02:00
Wolodja Wentland
4caa3f8d4b Merge pull request #121 from tomduijf/master
Keep existing user's home and shell unless explicitly defined
2016-07-04 19:34:25 +02:00
Forrest
7bd4e9080b Merge pull request #123 from myii/PR_multi-line-authorized_keys
Use `contents_pillar` to work with multi-line authorized_keys file
2016-07-03 12:55:41 -07:00
Imran Iqbal
b94514529d Display "managed by Salt" header in user sudoers files 2016-07-03 16:38:02 +01:00
Imran Iqbal
4b840e646c Add missing keys in pillar.example (found in init.sls) 2016-07-03 16:37:57 +01:00
Imran Iqbal
984317fca1 Use contents_pillar to work with multiple-line authorized_keys file 2016-07-03 16:36:07 +01:00
Niels Abspoel
21fc8df0b6 Merge pull request #122 from adnanJP/master
Properly handle dependencies on ssh_auth when home is not create with…
2016-07-01 20:55:21 +02:00
adnanJP
8aa062c08e Properly handle dependencies on ssh_auth when home is not create with the formula. 2016-07-01 08:20:20 +02:00
Tom Duijf
5cd73534ad Updated remaining files to retain home dir existing user 2016-06-23 21:43:01 +02:00
Tom Duijf
2ac21426af use already available home variable for user's ssh-key configuration 2016-06-23 21:19:17 +02:00
Wolodja Wentland
ebc81c806b Merge pull request #119 from rhertzog/system-group
Create a system usergroup if user is a system user
2016-06-22 14:13:17 +02:00
Raphaël Hertzog
cf122d1bd6 Create a system usergroup if user is a system user
If the user to be created is a system user, it makes no sense to create
him a primary group which is not a system group too.
2016-06-22 12:08:39 +02:00
Karsten Kosmala
4f3d60e08e Merge branch 'master' of github.com:kossmac/users-formula 2016-06-13 17:27:30 +02:00
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
Karsten Kosmala
346463c7e7 set user and group of user dir in pillar 2016-03-17 12:21:23 +01: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