diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2019-11-28 10:17:37 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2019-11-28 10:17:37 +0000 |
| commit | ab082438f713eb30023acda00eb98169bfbc33f8 (patch) | |
| tree | 310238bc0604baee3d4a3cd2e392a26a6e46c03c /www/nginx/files | |
| parent | Update devel/etcd33 to version 3.3.18. (diff) | |
- Add support for FreeBSD accept filters [1]
- Fix build with HTTP_AUTH_KRB5 after r518471 [2]
- Update 3rd party Modul
PR: 238739 [1], 242256 [2]
Sponsored by: Netzkommune GmbH
Diffstat (limited to 'www/nginx/files')
| -rw-r--r-- | www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config | 2 | ||||
| -rw-r--r-- | www/nginx/files/nginx.in | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config index 37543286589a..7f2022d6da24 100644 --- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,5 +1,5 @@ --- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig 2017-04-15 13:07:01.159506000 -0400 -+++ ../spnego-http-auth-nginx-module-7e028a5/config 2018-04-20 00:15:08.515289000 +0200 ++++ ../spnego-http-auth-nginx-module-21bb963/config 2018-04-20 00:15:08.515289000 +0200 @@ -1,9 +1,6 @@ ngx_addon_name=ngx_http_auth_spnego_module -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" diff --git a/www/nginx/files/nginx.in b/www/nginx/files/nginx.in index c0765f6b676f..3478a6948cb3 100644 --- a/www/nginx/files/nginx.in +++ b/www/nginx/files/nginx.in @@ -21,6 +21,9 @@ # Extra flags passed to start command. # nginxlimits_args (str): Default to "-e -U %%WWWOWN%%" # Arguments of pre-start limits run. +# nginx_http_accept_enable (bool): Set to "NO" by default. +# Set to yes to check for accf_http kernel module +# on start-up and load if not loaded. . /etc/rc.subr @@ -44,6 +47,7 @@ extra_commands="reload configtest upgrade gracefulstop" [ -z "$nginx_enable" ] && nginx_enable="NO" [ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" [ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" +[ -z "$nginx_http_accept_enable" ] && nginx_http_accept_enable="NO" load_rc_config $name @@ -123,6 +127,11 @@ nginx_upgrade() nginx_precmd() { + if checkyesno nginx_http_accept_enable + then + required_modules="$required_modules accf_http accf_data" + fi + nginx_checkconfig if checkyesno nginxlimits_enable |