svn commit: r395441 - in head/www: nginx nginx-devel nginx-devel/files nginx/files
Veniamin Gvozdikov
vg at FreeBSD.org
Thu Aug 27 17:36:33 UTC 2015
Author: vg
Date: Thu Aug 27 17:36:31 2015
New Revision: 395441
URL: https://svnweb.freebsd.org/changeset/ports/395441
Log:
Added 3rd party tarantool upstream module:
Tarantool NginX upstream module
- Benefit from nginx features and tarantool features over HTTP(S).
- Call tarantool methods via JSON RPC.
- Load Balancing with elastic configuration.
- Backup and fault tolerance.
- Low overhead.
PR: ports/202593
Approved by: osa
Added:
head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config (contents, props changed)
head/www/nginx/files/extra-patch-ngx_http_tarantool-config (contents, props changed)
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/distinfo
head/www/nginx/Makefile
head/www/nginx/distinfo
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Thu Aug 27 17:29:49 2015 (r395440)
+++ head/www/nginx-devel/Makefile Thu Aug 27 17:36:31 2015 (r395441)
@@ -79,6 +79,7 @@ OPTIONS_DEFINE= \
HTTP_REDIS \
HTTP_RESPONSE \
HTTP_SUBS_FILTER \
+ HTTP_TARANTOOL \
HTTP_UPLOAD \
HTTP_UPLOAD_PROGRESS \
HTTP_UPSTREAM_FAIR \
@@ -174,6 +175,7 @@ HTTP_PUSH_STREAM_DESC= 3rd party push s
HTTP_REDIS_DESC= 3rd party http_redis module
HTTP_RESPONSE_DESC= 3rd party http_response module
HTTP_SUBS_FILTER_DESC= 3rd party subs filter module
+HTTP_TARANTOOL_DESC= 3rd party tarantool upstream module
HTTP_UPLOAD_DESC= 3rd party upload module
HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module
HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module
@@ -530,6 +532,17 @@ GH_TAGNAME+= ${NGINX_HTTP_SUBS_FILTER_VE
CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
.endif
+.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
+LIB_DEPENDS+= libmsgpuck.so:${PORTSDIR}/devel/msgpuck \
+ libyajl.so:${PORTSDIR}/devel/yajl
+GH_ACCOUNT+= tarantool:nginx_tarantool
+GH_PROJECT+= nginx_upstream_module:nginx_tarantool
+GH_TAGNAME+= 966f2f5:nginx_tarantool
+CFLAGS+= -I${LOCALBASE}/include/msgpuck
+CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
+.endif
+
.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
CONFIGURE_ARGS+=--with-http_secure_link_module
.endif
@@ -1022,6 +1035,11 @@ post-patch:
's!%%PREFIX%%!${LOCALBASE}!g' \
${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure
.endif
+.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
+ @${REINPLACE_CMD} \
+ 's!%%PREFIX%%!${LOCALBASE}!g' \
+ ${WRKSRC_nginx_tarantool}/config
+.endif
pre-configure:
.if ${PORT_OPTIONS:MMODSECURITY}
Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo Thu Aug 27 17:29:49 2015 (r395440)
+++ head/www/nginx-devel/distinfo Thu Aug 27 17:36:31 2015 (r395441)
@@ -64,6 +64,8 @@ SHA256 (wandenberg-nginx-push-stream-mod
SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17
SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878
+SHA256 (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 8142475d8ecf0c02d2fc8051364729d842fe06b0b445b416c87c2f796bb42fa7
+SIZE (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 873343
SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05
SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296
SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
Added: head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config Thu Aug 27 17:36:31 2015 (r395441)
@@ -0,0 +1,11 @@
+--- ../nginx_upstream_module-966f2f5/config.orig 2015-08-20 23:33:02.000000000 +0300
++++ ../nginx_upstream_module-966f2f5/config 2015-08-23 16:04:59.572045669 +0300
+@@ -4,7 +4,7 @@
+ "
+
+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs \
+- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \
++ %%PREFIX%%/lib/libyajl_s.a \
+ "
+
+ HTTP_MODULES="$HTTP_MODULES \
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Thu Aug 27 17:29:49 2015 (r395440)
+++ head/www/nginx/Makefile Thu Aug 27 17:36:31 2015 (r395441)
@@ -77,6 +77,7 @@ OPTIONS_DEFINE= \
HTTP_REDIS \
HTTP_RESPONSE \
HTTP_SUBS_FILTER \
+ HTTP_TARANTOOL \
HTTP_UPLOAD \
HTTP_UPLOAD_PROGRESS \
HTTP_UPSTREAM_FAIR \
@@ -168,6 +169,7 @@ HTTP_PUSH_STREAM_DESC= 3rd party push s
HTTP_REDIS_DESC= 3rd party http_redis module
HTTP_RESPONSE_DESC= 3rd party http_response module
HTTP_SUBS_FILTER_DESC= 3rd party subs filter module
+HTTP_TARANTOOL_DESC= 3rd party tarantool upstream module
HTTP_UPLOAD_DESC= 3rd party upload module
HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module
HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module
@@ -523,6 +525,17 @@ GH_TAGNAME+= ${NGINX_HTTP_SUBS_FILTER_VE
CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
.endif
+.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
+LIB_DEPENDS+= libmsgpuck.so:${PORTSDIR}/devel/msgpuck \
+ libyajl.so:${PORTSDIR}/devel/yajl
+GH_ACCOUNT+= tarantool:nginx_tarantool
+GH_PROJECT+= nginx_upstream_module:nginx_tarantool
+GH_TAGNAME+= 966f2f5:nginx_tarantool
+CFLAGS+= -I${LOCALBASE}/include/msgpuck
+CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
+.endif
+
.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
CONFIGURE_ARGS+=--with-http_secure_link_module
.endif
@@ -971,6 +984,11 @@ post-patch:
's!%%PREFIX%%!${LOCALBASE}!g' \
${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure
.endif
+.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
+ @${REINPLACE_CMD} \
+ 's!%%PREFIX%%!${LOCALBASE}!g' \
+ ${WRKSRC_nginx_tarantool}/config
+.endif
pre-configure:
.if ${PORT_OPTIONS:MMODSECURITY}
Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo Thu Aug 27 17:29:49 2015 (r395440)
+++ head/www/nginx/distinfo Thu Aug 27 17:36:31 2015 (r395441)
@@ -64,6 +64,8 @@ SHA256 (wandenberg-nginx-push-stream-mod
SIZE (wandenberg-nginx-push-stream-module-0.3.5_GH0.tar.gz) = 153122
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 2814340bf57581a04873e26d773ec216bfceebb1abb87d4904ce314790897b17
SIZE (yaoweibin-ngx_http_substitutions_filter_module-0.6.2_GH0.tar.gz) = 91878
+SHA256 (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 8142475d8ecf0c02d2fc8051364729d842fe06b0b445b416c87c2f796bb42fa7
+SIZE (tarantool-nginx_upstream_module-966f2f5_GH0.tar.gz) = 873343
SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05
SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296
SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1
Added: head/www/nginx/files/extra-patch-ngx_http_tarantool-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-ngx_http_tarantool-config Thu Aug 27 17:36:31 2015 (r395441)
@@ -0,0 +1,11 @@
+--- ../nginx_upstream_module-966f2f5/config.orig 2015-08-20 23:33:02.000000000 +0300
++++ ../nginx_upstream_module-966f2f5/config 2015-08-23 16:04:59.572045669 +0300
+@@ -4,7 +4,7 @@
+ "
+
+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs \
+- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \
++ %%PREFIX%%/lib/libyajl_s.a \
+ "
+
+ HTTP_MODULES="$HTTP_MODULES \
More information about the svn-ports-all
mailing list