Date: Sat, 24 Nov 2018 03:44:02 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485724 - in head/www/owncloud: . files Message-ID: <201811240344.wAO3i2JM076364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Sat Nov 24 03:44:02 2018 New Revision: 485724 URL: https://svnweb.freebsd.org/changeset/ports/485724 Log: www/owncloud: Use .conf suffix for /usr/local/etc/newsyslog.conf.d/ - Rename the files installed to /usr/local/etc/newsyslog.conf.d/ to end with a '.conf' suffix. - Add pkg-install script to automatically move any copies of the old newsyslog file to the new location if it was modified from the default or delete the old file if it is has not been modified. - Add a note to UPDATING and pkg-message to warn users of this, in case they are using provisioning/configuration management tools which need to be modified. Note the UPDATING entry was committed in r485721. Recent changes to /etc/newsyslog.conf (r340318) will only include files from the /usr/local/etc/newsyslog.conf.d/ directory which end with '.conf' and do not beginning with a '.' character. Approved by: sunpoet (maintainer timeout) Differential Revision: https://reviews.freebsd.org/D17090 Added: head/www/owncloud/pkg-install (contents, props changed) Modified: head/www/owncloud/Makefile head/www/owncloud/files/pkg-message.in head/www/owncloud/pkg-plist Modified: head/www/owncloud/Makefile ============================================================================== --- head/www/owncloud/Makefile Sat Nov 24 03:10:29 2018 (r485723) +++ head/www/owncloud/Makefile Sat Nov 24 03:44:02 2018 (r485724) @@ -3,6 +3,7 @@ PORTNAME= owncloud PORTVERSION= 10.0.10 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://download.owncloud.org/community/ Modified: head/www/owncloud/files/pkg-message.in ============================================================================== --- head/www/owncloud/files/pkg-message.in Sat Nov 24 03:10:29 2018 (r485723) +++ head/www/owncloud/files/pkg-message.in Sat Nov 24 03:44:02 2018 (r485724) @@ -16,3 +16,19 @@ like this: </Directory> And restart Apache. + +******************************************************************** +The owncloud newsyslog.conf(5) filename has been changed: + OLD: ${PREFIX}/etc/newsyslog.conf.d/owncloud + NEW: ${PREFIX}/etc/newsyslog.conf.d/owncloud.conf + +Any file found at the old location has been automatically moved to +the new location. This was done to ensure log rotation continued to +work after change r340318 made to FreeBSD base, where the default +newsyslog configuration now only includes filenames that end with +'.conf' and do not begin with '.'. + +If you use provisioning/configuration management tools to create or +edit this file, you will need to change their configuration to use +the new filename. +******************************************************************** Added: head/www/owncloud/pkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/owncloud/pkg-install Sat Nov 24 03:44:02 2018 (r485724) @@ -0,0 +1,29 @@ +#! /bin/sh +# ex:sw=4 sts=4 + +move_newsyslog_conf() { + oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/owncloud + newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/owncloud.conf + samplefile=${PKG_PREFIX}/share/examples/owncloud/newsyslog + if [ -f ${oldfile} ]; then + echo "Configuration file found in old location: ${oldfile}" + if cmp -s ${samplefile} ${newfile} > /dev/null; then + echo "Configuration file in new location has not been modified from the default: ${newfile}" + echo " => Moving old configuration file to new location" + mv -f ${oldfile} ${newfile} + else + echo "Configuration file in new location has been modified from the default: ${newfile}" + echo " => Deleting old configuration file" + rm ${oldfile} + fi + fi +} + + +######################################################################## + +case $2 in + POST-INSTALL) + move_newsyslog_conf + ;; +esac Modified: head/www/owncloud/pkg-plist ============================================================================== --- head/www/owncloud/pkg-plist Sat Nov 24 03:10:29 2018 (r485723) +++ head/www/owncloud/pkg-plist Sat Nov 24 03:44:02 2018 (r485724) @@ -1,5 +1,5 @@ @dir etc/newsyslog.conf.d -@sample %%EXAMPLESDIR%%/newsyslog etc/newsyslog.conf.d/owncloud +@sample %%EXAMPLESDIR%%/newsyslog etc/newsyslog.conf.d/owncloud.conf %%WWWDIR%%/.htaccess %%WWWDIR%%/.user.ini %%WWWDIR%%/AUTHORS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811240344.wAO3i2JM076364>