Page MenuHomeFreeBSD
Files F147408638

D12246.id32720.diff
No OneTemporary
Actions

D12246.id32720.diff
View Options

Index: www/nginx/Makefile
===================================================================
--- www/nginx/Makefile
+++ www/nginx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.12.1
-PORTREVISION?= 1
+PORTREVISION?= 2
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@@ -481,7 +481,8 @@
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 \
Index: www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
===================================================================
--- /dev/null
+++ www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
@@ -0,0 +1,46 @@
+--- ../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
+

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 11, 6:11 PM (8 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29522206
Default Alt Text
D12246.id32720.diff (2 KB)

Event Timeline