mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-01 05:45:45 +00:00
net/ntpa: 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: portmgr blanket
This commit is contained in:
parent
4d5a2b1df4
commit
f73023b7d8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=485725
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= ntpa
|
||||
PORTVERSION= 0.8.2
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://dist1.innolan.net/ \
|
||||
http://dist2.innolan.net/
|
||||
|
28
net/ntpa/pkg-install
Normal file
28
net/ntpa/pkg-install
Normal file
@ -0,0 +1,28 @@
|
||||
#! /bin/sh
|
||||
# ex:sw=4 sts=4
|
||||
|
||||
move_newsyslog_conf() {
|
||||
oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/ntpa
|
||||
newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/ntpa.conf
|
||||
samplefile=${PKG_PREFIX}/etc/ntpa/ntpa.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
|
@ -7,3 +7,19 @@ If you are upgrading from a previous version of NTP Analyzer be sure to
|
||||
take a backup of your database before starting ntpa in upgrade mode.
|
||||
|
||||
************************************************************************
|
||||
|
||||
The ntpa newsyslog.conf(5) filename has been changed:
|
||||
OLD: ${PREFIX}/etc/newsyslog.conf.d/ntpa
|
||||
NEW: ${PREFIX}/etc/newsyslog.conf.d/ntpa.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.
|
||||
|
||||
************************************************************************
|
||||
|
@ -23,7 +23,7 @@ man/man1/ntpa.1.gz
|
||||
%%DOCSDIR%%/DATABASE
|
||||
%%DOCSDIR%%/INSTALL
|
||||
@dir etc/newsyslog.conf.d
|
||||
@sample %%ETCDIR%%/ntpa.newsyslog etc/newsyslog.conf.d/ntpa
|
||||
@sample %%ETCDIR%%/ntpa.newsyslog etc/newsyslog.conf.d/ntpa.conf
|
||||
@sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample
|
||||
@owner www
|
||||
@group www
|
||||
|
Loading…
Reference in New Issue
Block a user