Merge pull request #76069 from misuzu/package-3proxy

nixos/3proxy: manual validation fix
This commit is contained in:
Florian Klink 2019-12-20 02:15:45 +01:00 committed by GitHub
commit e46abc6b8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -23,17 +23,17 @@ in {
Example users file with plain-text passwords: Example users file with plain-text passwords:
<para> <literal>
test1:CL:password1 test1:CL:password1
test2:CL:password2 test2:CL:password2
</para> </literal>
Example users file with md5-crypted passwords: Example users file with md5-crypted passwords:
<para> <literal>
test1:CR:$1$tFkisVd2$1GA8JXkRmTXdLDytM/i3a1 test1:CR:$1$tFkisVd2$1GA8JXkRmTXdLDytM/i3a1
test2:CR:$1$rkpibm5J$Aq1.9VtYAn0JrqZ8M.1ME. test2:CR:$1$rkpibm5J$Aq1.9VtYAn0JrqZ8M.1ME.
</para> </literal>
You can generate md5-crypted passwords via https://unix4lyfe.org/crypt/ You can generate md5-crypted passwords via https://unix4lyfe.org/crypt/
Note that htpasswd tool generates incompatible md5-crypted passwords. Note that htpasswd tool generates incompatible md5-crypted passwords.
@ -129,7 +129,8 @@ in {
</itemizedlist> </itemizedlist>
Double authentication is possible, e.g. Double authentication is possible, e.g.
<para>
<literal>
{ {
auth = [ "iponly" "strong" ]; auth = [ "iponly" "strong" ];
acl = [ acl = [
@ -143,7 +144,7 @@ in {
} }
]; ];
} }
</para> </literal>
In this example strong username authentication is not required to access 192.168.0.0/16. In this example strong username authentication is not required to access 192.168.0.0/16.
''; '';
}; };