diff --git a/NEWS b/NEWS index 3be7e998..687112c6 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ by sskaje). - fixed an infinite loop when asking for group if the default group is selected. +- Added the unix-conn-file configuration option. That allows obtaining + plaintext HTTP sessions through a unix domain socket. That is useful + when combined with a forwarder HTTPS server like nginx, nxweb or haproxy. * Version 0.8.4 (released 2014-08-27) diff --git a/src/ocserv-args.def b/src/ocserv-args.def index b3e5c0ab..30d79a70 100644 --- a/src/ocserv-args.def +++ b/src/ocserv-args.def @@ -124,8 +124,10 @@ max-same-clients = 2 tcp-port = 3333 udp-port = 3333 -# Accept connections using a socket file. The connections are -# forwarded without SSL/TLS. +# Accept connections using a socket file. It accepts HTTP +# connections (i.e., without SSL/TLS), and uses it as +# the primary channel. That option cannot be combined with +# certificate authentication. #unix-conn-file = /var/run/ocserv-conn.socket # Keepalive in seconds