mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
sysutils/munin-*: 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. 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. Reviewed by: mandree (D17088) Approved by: mat (maintainer) Differential Revision: https://reviews.freebsd.org/D17089
This commit is contained in:
Ben Woods
parent
865e1123ad
commit
b044e71547
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=485721
9 changed files with 82 additions and 2 deletions
16
UPDATING
16
UPDATING
|
|
@ -5,6 +5,22 @@ they are unavoidable.
|
|||
You should get into the habit of checking this file for changes each time
|
||||
you update your ports collection, before attempting any port upgrades.
|
||||
|
||||
20181124:
|
||||
AFFECTS: users of sysutils/munin-master, sysutils/munin-node, www/owncloud, mail/mailman, net/ntpa
|
||||
AUTHOR: woodsb02@FreeBSD.org
|
||||
|
||||
The newsyslog.conf(5) filename installed by the port has been changed:
|
||||
OLD: ${PREFIX}/etc/newsyslog.conf.d/${PORTNAME}
|
||||
NEW: ${PREFIX}/etc/newsyslog.conf.d/${PORTNAME}.conf
|
||||
|
||||
Any file found at the old location will be automatically moved to the new
|
||||
location. This will ensure log rotation will continue to work after change
|
||||
r340318 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.
|
||||
|
||||
20181111
|
||||
AFFECTS: users of graphics/mesa-libs
|
||||
AUTHOR: jbeich@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= munin
|
||||
PORTVERSION= ${MUNIN_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils perl5
|
||||
MASTER_SITES= ${MUNIN_SITES}
|
||||
PKGNAMESUFFIX= -master
|
||||
|
|
|
|||
|
|
@ -10,3 +10,13 @@ If you need to customize the munin crontab, remove the lines
|
|||
containing #BEGIN_MUNIN_MAIN and #END_MUNIN_MAIN, and add a line
|
||||
with #MANUAL_MUNIN_CRONTAB.
|
||||
********************************************************************
|
||||
The munin-master newsyslog.conf(5) filename has been changed:
|
||||
OLD: ${PREFIX}/etc/newsyslog.conf.d/munin-master
|
||||
NEW: ${PREFIX}/etc/newsyslog.conf.d/munin-master.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 '.'.
|
||||
********************************************************************
|
||||
|
|
|
|||
|
|
@ -60,6 +60,23 @@ move_www_dir() {
|
|||
fi
|
||||
}
|
||||
|
||||
move_newsyslog_conf() {
|
||||
oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-master
|
||||
newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-master.conf
|
||||
samplefile=${PKG_PREFIX}/etc/munin/munin-master.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
|
||||
}
|
||||
|
||||
########################################################################
|
||||
|
||||
|
|
@ -78,5 +95,6 @@ MAILTO=root
|
|||
#END_MUNIN_MAIN
|
||||
EOT
|
||||
fi
|
||||
move_newsyslog_conf
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ bin/munin-cron
|
|||
@comment BSD.local.dist but if not registered here, it will not exist in PREFIX
|
||||
@comment when the package is installed.
|
||||
@dir etc/newsyslog.conf.d
|
||||
@sample %%ETCDIR%%/munin-master.newsyslog etc/newsyslog.conf.d/munin-master
|
||||
@sample %%ETCDIR%%/munin-master.newsyslog etc/newsyslog.conf.d/munin-master.conf
|
||||
%%SITE_PERL%%/Munin/Master/Config.pm
|
||||
%%SITE_PERL%%/Munin/Master/GraphOld.pm
|
||||
%%SITE_PERL%%/Munin/Master/Group.pm
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
PORTNAME= munin
|
||||
PORTVERSION= ${MUNIN_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils perl5
|
||||
MASTER_SITES= ${MUNIN_SITES}
|
||||
PKGNAMESUFFIX= -node
|
||||
|
|
|
|||
|
|
@ -24,3 +24,19 @@ For a list of plugins that will probably work run
|
|||
If this is a fresh install run
|
||||
%%PREFIX%%/sbin/munin-node-configure --shell | sh -x
|
||||
to install the plugins automatically
|
||||
|
||||
********************************************************************
|
||||
The munin-node newsyslog.conf(5) filename has been changed:
|
||||
OLD: ${PREFIX}/etc/newsyslog.conf.d/munin-node
|
||||
NEW: ${PREFIX}/etc/newsyslog.conf.d/munin-node.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.
|
||||
********************************************************************
|
||||
|
|
|
|||
|
|
@ -12,6 +12,23 @@ init_plugins() {
|
|||
echo "done."
|
||||
}
|
||||
|
||||
move_newsyslog_conf() {
|
||||
oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-node
|
||||
newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-node.conf
|
||||
samplefile=${PKG_PREFIX}/etc/munin/munin-node.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
|
||||
}
|
||||
|
||||
########################################################################
|
||||
|
||||
|
|
@ -20,5 +37,6 @@ case $2 in
|
|||
if [ -z "${PACKAGE_BUILDING}" ]; then
|
||||
init_plugins
|
||||
fi
|
||||
move_newsyslog_conf
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ bin/munindoc
|
|||
@comment BSD.local.dist but if not registered here, it will not exist in PREFIX
|
||||
@comment when the package is installed.
|
||||
@dir etc/newsyslog.conf.d
|
||||
@sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node
|
||||
@sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node.conf
|
||||
%%SITE_PERL%%/Munin/Node/Config.pm
|
||||
%%SITE_PERL%%/Munin/Node/Configure/Debug.pm
|
||||
%%SITE_PERL%%/Munin/Node/Configure/History.pm
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue