Thu Feb 20 23:34:38 2020 UTC ()
Add stream-ssl-preread option to nginx

Allows nginx to be used as a proxy to share a port between https and
ssh/openvpn or similar

Not enabled by default


(abs)
diff -r1.53 -r1.54 pkgsrc/www/nginx/options.mk
cvs diff -r1.53 -r1.54 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2020/02/12 11:32:53 1.53
+++ pkgsrc/www/nginx/options.mk 2020/02/20 23:34:38 1.54
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: options.mk,v 1.53 2020/02/12 11:32:53 jperkin Exp $ 1# $NetBSD: options.mk,v 1.54 2020/02/20 23:34:38 abs Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \ 4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
5 pcre push realip ssl sub uwsgi image-filter \ 5 pcre push realip ssl sub uwsgi image-filter \
6 debug slice status nginx-autodetect-cflags echo \ 6 debug slice status nginx-autodetect-cflags echo \
7 set-misc headers-more array-var encrypted-session \ 7 set-misc headers-more array-var encrypted-session \
8 form-input perl gzip http2 auth-request secure-link rtmp 8 form-input perl gzip http2 auth-request secure-link rtmp \
 9 stream-ssl-preread
9PKG_OPTIONS_LEGACY_OPTS+= v2:http2 10PKG_OPTIONS_LEGACY_OPTS+= v2:http2
10 11
11PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 12PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
12 13
13PLIST_VARS+= naxsi perl uwsgi 14PLIST_VARS+= naxsi perl uwsgi
14 15
15.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
16 17
17# documentation says naxsi must be the first module 18# documentation says naxsi must be the first module
18.if !empty(PKG_OPTIONS:Mnaxsi) 19.if !empty(PKG_OPTIONS:Mnaxsi)
19PLIST.naxsi= yes 20PLIST.naxsi= yes
20CONFIGURE_ARGS+= --add-module=../${NAXSI_DISTNAME}/naxsi_src 21CONFIGURE_ARGS+= --add-module=../${NAXSI_DISTNAME}/naxsi_src
21.endif 22.endif
@@ -216,23 +217,27 @@ PLIST.perl= yes @@ -216,23 +217,27 @@ PLIST.perl= yes
216 217
217.if !empty(PKG_OPTIONS:Mgzip) 218.if !empty(PKG_OPTIONS:Mgzip)
218CONFIGURE_ARGS+= --with-http_gzip_static_module 219CONFIGURE_ARGS+= --with-http_gzip_static_module
219.endif 220.endif
220 221
221.if !empty(PKG_OPTIONS:Mauth-request) 222.if !empty(PKG_OPTIONS:Mauth-request)
222CONFIGURE_ARGS+= --with-http_auth_request_module 223CONFIGURE_ARGS+= --with-http_auth_request_module
223.endif 224.endif
224 225
225.if !empty(PKG_OPTIONS:Msecure-link) 226.if !empty(PKG_OPTIONS:Msecure-link)
226CONFIGURE_ARGS+= --with-http_secure_link_module 227CONFIGURE_ARGS+= --with-http_secure_link_module
227.endif 228.endif
228 229
 230.if !empty(PKG_OPTIONS:Mstream-ssl-preread)
 231CONFIGURE_ARGS+= --with-stream --with-stream_ssl_preread_module
 232.endif
 233
229.if !empty(PKG_OPTIONS:Mrtmp) 234.if !empty(PKG_OPTIONS:Mrtmp)
230CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME} 235CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME}
231.endif 236.endif
232.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) 237.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum)
233RTMP_VERSION= 1.2.1 238RTMP_VERSION= 1.2.1
234RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION} 239RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION}
235RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz 240RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz
236SITES.${RTMP_DISTFILE}= -https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_VERSION}.tar.gz 241SITES.${RTMP_DISTFILE}= -https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_VERSION}.tar.gz
237DISTFILES+= ${RTMP_DISTFILE} 242DISTFILES+= ${RTMP_DISTFILE}
238.endif 243.endif