0
0
Fork 0
mirror of https://github.com/atmoz/sftp.git synced 2024-12-08 13:05:39 -05:00
Commit graph

154 commits

Author SHA1 Message Date
Adrian Dvergsdal
662bc14ece
Merge branch 'master' into debian-jessie 2018-11-29 13:17:56 +01:00
Adrian Dvergsdal
bd437a09cb
Merge branch 'tyranron-fix-return-statement-usage' 2018-11-29 13:16:52 +01:00
tyranron
45c555254d
Fix 'return' statement usage in shell scripts 2018-11-29 13:21:38 +02:00
Adrian Dvergsdal
b5cc641442
Test dir with spaces 2018-11-16 16:04:28 +01:00
Adrian Dvergsdal
a4e3fd3721
Merge branch 'master' into debian-jessie 2018-11-16 01:10:46 +01:00
Adrian Dvergsdal
8dcc6914b1
LICENCE.txt -> LICENSE.txt 2018-11-16 01:06:09 +01:00
Adrian Dvergsdal
67e73dfd9a
Move script and config to own directory 2018-11-16 01:02:50 +01:00
Adrian Dvergsdal
b571394a43
Tests in shunit2 and extracted user creation 2018-11-16 00:57:33 +01:00
Adrian Dvergsdal
54919bfbae
Merge branch 'master' into debian-jessie 2018-11-07 10:50:54 +01:00
Adrian Dvergsdal
cb0ee51c85
Remove old alpine image links 2018-11-07 10:48:54 +01:00
Adrian Dvergsdal
edc34e8cfd
Shellcheck 2018-11-07 09:49:47 +01:00
Adrian Dvergsdal
c34c8f4313
Merge branch 'master' into debian-jessie 2018-01-23 22:38:35 +01:00
Adrian Dvergsdal
844bcb4409
Merge branch 'pieterlange-fix/concat-authorized_keys' 2018-01-23 22:35:55 +01:00
Pieter Lange
428707c086 Properly concatenate public key so each key is separated by newline 2018-01-23 22:29:45 +01:00
Adrian Dvergsdal
a4eba65ce6
Merge branch 'master' into debian-jessie 2018-01-17 23:40:39 +01:00
Adrian Dvergsdal
87bd5bd594
Update README.md on Alpine 3.7 2018-01-17 22:53:46 +01:00
Adrian Dvergsdal
d5d670f682
Use lower-case usernames in test.
See #109 for more info.
2018-01-17 22:52:57 +01:00
Adrian Dvergsdal
d2906f92e0
Merge branch 'rfeijolo-master' 2018-01-05 13:15:21 +01:00
Adrian Dvergsdal
5427a7d59b
Fix if-else syntax and change log message 2018-01-05 13:14:29 +01:00
Adrian Dvergsdal
4314252745
Merge branch 'master' of https://github.com/rfeijolo/sftp into rfeijolo-master 2018-01-05 13:11:32 +01:00
Adrian Dvergsdal
a2863269a0
Remove unused stdin args and parse args from env 2018-01-04 20:16:17 +01:00
Adrian Dvergsdal
9405974cc9
Tidy up variables in createUser() 2018-01-04 19:22:15 +01:00
Adrian Dvergsdal
4edb2a932e
Merge branch 'propelai-master' 2018-01-04 19:21:55 +01:00
Hollin Wilkins
6ba0edae23 Make sure to reset chpasswdOptions. 2017-12-27 00:33:10 -08:00
Rodrigo Aiala Feijolo Rodrigues
7fed52f018
Update entrypoint 2017-11-20 17:26:27 -03:00
Adrian Dvergsdal
a8550acbc3
Merge branch 'master' into debian-jessie 2017-10-22 23:35:12 +02:00
Adrian Dvergsdal
59ad42f086
Less stricter username regex (but still POSIX)
For more info See this answer: https://serverfault.com/a/578264

Relevant issue: https://github.com/atmoz/sftp/issues/94
2017-10-22 23:25:52 +02:00
Adrian Dvergsdal
77aabe6f5a
Merge branch 'master' into debian-jessie 2017-10-14 00:03:11 +02:00
Adrian Dvergsdal
f3212b3377
Consistent syntax for subshell 2017-10-13 23:39:04 +02:00
Adrian Dvergsdal
0fba0da794
Use getent to check the existence of user/group 2017-10-13 23:31:17 +02:00
Adrian Dvergsdal
84f4940fcb Merge branch 'master' into debian-jessie 2017-10-08 19:13:58 +02:00
Adrian Dvergsdal
f315792bd7 Allow comments in users.conf 2017-10-08 19:08:53 +02:00
Adrian Dvergsdal
ce4a480b3e Only change permission on newly created dirs 2017-10-08 18:44:15 +02:00
Adrian Dvergsdal
da53454b4b Validation of args and allow command override
Using regex to validate arguments. Remove readme and usage output from
image (expecting people to read documentation online). Some cleanups.
2017-10-08 18:36:51 +02:00
Adrian Dvergsdal
c76e237875 Merge branch 'master' into debian-jessie 2017-09-29 15:27:41 +02:00
Adrian Dvergsdal
06a7f85d0f Note in README.md on required capability for mount 2017-09-29 15:24:24 +02:00
Adrian Dvergsdal
cbe09b5863 Removed fixed wrapping on text in README.md
hub.docker.com render markdown in a silly way, putting <br/> after each
line break.
2017-09-29 15:21:42 +02:00
Adrian Dvergsdal
4bb0bc299c Keep using jessie in debian-jessie branch 2017-09-23 23:58:05 +02:00
Adrian Dvergsdal
4a431d5fe5 Add Debian Stretch 2017-09-23 21:59:00 +02:00
Adrian Dvergsdal
1739dd64b7 Add section about which OpenSSH version to expect 2017-09-23 21:36:30 +02:00
Adrian Dvergsdal
67d13ec458 Use relative path in instruction on host keys
Also remove host keys in above examples
2017-09-23 20:55:07 +02:00
Adrian Dvergsdal
d0d27520a1 Fix formatting issue on hub.docker.com 2017-09-06 22:21:29 +02:00
Adrian Dvergsdal
4c9df57799 Add openssh.png 2017-09-06 22:12:09 +02:00
Adrian Dvergsdal
19dea3a02a Celebrating 100M pulls with OpenSSH logo 2017-09-06 22:10:43 +02:00
Adrian Dvergsdal
0bcd1fdf1d Add some shield stats to README.md 2017-09-06 21:45:43 +02:00
Adrian Dvergsdal
2f5dc6d579 Merge branch 'thoralf-gutierrez-fix_chown_on_alpine' 2017-06-25 15:47:16 +02:00
Adrian Dvergsdal
77c0fd7860 Merge branch 'fix_chown_on_alpine' of https://github.com/thoralf-gutierrez/sftp into thoralf-gutierrez-fix_chown_on_alpine 2017-06-25 15:46:56 +02:00
Adrian Dvergsdal
2891aab052 Test usernames with dots 2017-06-25 15:16:41 +02:00
Adrian Dvergsdal
c4fd217a7e Backward compatibility with legacy config path 2017-06-25 14:05:22 +02:00
Adrian Dvergsdal
177d7aedde Merge branch 'chaosaffe-master' 2017-06-25 01:58:49 +02:00