From owner-svn-ports-all@freebsd.org Mon Nov 27 14:48:33 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B2D8E532B7; Mon, 27 Nov 2017 14:48:33 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C978273FCA; Mon, 27 Nov 2017 14:48:32 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAREmVWf087309; Mon, 27 Nov 2017 14:48:31 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAREmVoW087308; Mon, 27 Nov 2017 14:48:31 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201711271448.vAREmVoW087308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Mon, 27 Nov 2017 14:48:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454960 - head/www/nginx/files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/www/nginx/files X-SVN-Commit-Revision: 454960 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2017 14:48:33 -0000 Author: joneum Date: Mon Nov 27 14:48:31 2017 New Revision: 454960 URL: https://svnweb.freebsd.org/changeset/ports/454960 Log: www/nginx: fastdfs patch garbled from last commit PR: 223377 Reported by: daniel@blodan.se Approved by: rene (mentor) Differential Revision: https://reviews.freebsd.org/D13258 Modified: head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Modified: head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf ============================================================================== --- head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Mon Nov 27 14:45:03 2017 (r454959) +++ head/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf Mon Nov 27 14:48:31 2017 (r454960) @@ -43,50 +43,3 @@ #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 -