Date: Sat, 14 Oct 2017 12:32:17 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452061 - in head/www/nginx: . files Message-ID: <201710141232.v9ECWHEo093600@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Sat Oct 14 12:32:17 2017 New Revision: 452061 URL: https://svnweb.freebsd.org/changeset/ports/452061 Log: - www/nginx: fix for fastdfs module - As of ftp/fastdfs 5.0.11 nginx wont start by default if the fastdfs module is loaded. Provided patch sorts that out by adding the missing params to the mod_fastdfs.conf file. While patching mod_fastdfs.conf i also changed the storage paths to match the ftp/fastds port PR: 222067 Reported by: Daniel Ylitalo <daniel@blodan.se> Approved by: miwi (mentor) MFH: 2017Q4 Differential Revision: https://reviews.freebsd.org/D12246 Added: head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf (contents, props changed) Modified: head/www/nginx/Makefile Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Oct 14 12:25:57 2017 (r452060) +++ head/www/nginx/Makefile Sat Oct 14 12:32:17 2017 (r452061) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.12.1 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -479,7 +479,8 @@ NGINX_FASTDFS_VERSION= 5a8110f GH_ACCOUNT+= happyfish100:fastdfs GH_PROJECT+= fastdfs-nginx-module:fastdfs GH_TAGNAME+= ${NGINX_FASTDFS_VERSION}:fastdfs -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config \ + ${PATCHDIR}/extra-patch-fastdfs-src-mod_fastdfs.conf BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \ ${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \ Added: head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Sat Oct 14 12:32:17 2017 (r452061) @@ -0,0 +1,92 @@ +--- ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200 ++++ ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200 +@@ -59,8 +59,8 @@ + # store_path#, based 0, if store_path0 not exists, it's value is base_path + # the paths must be exist + # must same as storage.conf +-store_path0=/home/yuqing/fastdfs +-#store_path1=/home/yuqing/fastdfs1 ++store_path0=/var/db/fastdfs/storage ++#store_path1=/var/db/fastdfs/storage2 + + # standard log level as syslog, case insensitive, value list: + ### emerg for emergency +@@ -92,6 +92,14 @@ + # NOTE: #include is an include directive, do NOT remove the # before include + #include http.conf + ++# HTTP default content type ++http.default_content_type = application/octet-stream ++ ++# MIME types mapping filename ++# MIME types file format: MIME_type extensions ++# such as: image/jpeg jpeg jpg jpe ++# you can use apache's MIME file: mime.types ++http.mime_types_filename=/usr/local/etc/nginx/mime.types + + # if support flv + # default value is false +@@ -119,8 +127,8 @@ + #group_name=group1 + #storage_server_port=23000 + #store_path_count=2 +-#store_path0=/home/yuqing/fastdfs +-#store_path1=/home/yuqing/fastdfs1 ++#store_path0=/var/db/fastdfs/storage ++#store_path1=/var/db/fastdfs/storage2 + + # group settings for group #2 + # since v1.14 +@@ -129,5 +137,5 @@ + #group_name=group2 + #storage_server_port=23000 + #store_path_count=1 +-#store_path0=/home/yuqing/fastdfs ++#store_path0=/var/db/fastdfs/storage + +--- ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf.orig 2017-09-05 14:19:44.560907000 +0200 ++++ ../fastdfs-nginx-module-5a8110f/src/mod_fastdfs.conf 2017-09-05 14:24:43.475900000 +0200 +@@ -59,8 +59,8 @@ + # store_path#, based 0, if store_path0 not exists, it's value is base_path + # the paths must be exist + # must same as storage.conf +-store_path0=/home/yuqing/fastdfs +-#store_path1=/home/yuqing/fastdfs1 ++store_path0=/var/db/fastdfs/storage ++#store_path1=/var/db/fastdfs/storage2 + + # standard log level as syslog, case insensitive, value list: + ### emerg for emergency +@@ -92,6 +92,14 @@ + # NOTE: #include is an include directive, do NOT remove the # before include + #include http.conf + ++# HTTP default content type ++http.default_content_type = application/octet-stream ++ ++# MIME types mapping filename ++# MIME types file format: MIME_type extensions ++# such as: image/jpeg jpeg jpg jpe ++# you can use apache's MIME file: mime.types ++http.mime_types_filename=/usr/local/etc/nginx/mime.types + + # if support flv + # default value is false +@@ -119,8 +127,8 @@ + #group_name=group1 + #storage_server_port=23000 + #store_path_count=2 +-#store_path0=/home/yuqing/fastdfs +-#store_path1=/home/yuqing/fastdfs1 ++#store_path0=/var/db/fastdfs/storage ++#store_path1=/var/db/fastdfs/storage2 + + # group settings for group #2 + # since v1.14 +@@ -129,5 +137,5 @@ + #group_name=group2 + #storage_server_port=23000 + #store_path_count=1 +-#store_path0=/home/yuqing/fastdfs ++#store_path0=/var/db/fastdfs/storage +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710141232.v9ECWHEo093600>