Attachment 205256 Details for Bug 238739 – nginx.in diff (for both www/nginx and www/nginx-devel)

[patch] nginx.in diff (for both www/nginx and www/nginx-devel)

nginx.in.diff (text/plain), 2.59 KB, created by Jeremy Chadwick on 2019-06-21 09:24:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Chadwick

Created: 2019-06-21 09:24:12 UTC

Size: 2.59 KB

patch

obsolete

>Index: nginx/files/nginx.in
>===================================================================
>--- nginx/files/nginx.in	(revision 504769)
>+++ nginx/files/nginx.in	(working copy)
>@@ -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
> 
>@@ -39,11 +42,13 @@ _pidprefix="%%NGINX_RUNDIR%%"
> pidfile="${_pidprefix}/${name}.pid"
> _tmpprefix="%%NGINX_TMPDIR%%"
> required_files=%%PREFIX%%/etc/nginx/nginx.conf
>+required_modules=""
> 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 +128,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
>Index: nginx-devel/files/nginx.in
>===================================================================
>--- nginx-devel/files/nginx.in	(revision 504769)
>+++ nginx-devel/files/nginx.in	(working copy)
>@@ -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
> 
>@@ -39,11 +42,13 @@ _pidprefix="%%NGINX_RUNDIR%%"
> pidfile="${_pidprefix}/${name}.pid"
> _tmpprefix="%%NGINX_TMPDIR%%"
> required_files=%%PREFIX%%/etc/nginx/nginx.conf
>+required_modules=""
> 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 +128,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

Actions: View | Diff

Attachments on bug 238739: 205253 | 205256