Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chrony: rework loading of configuration

Browse source 
Instead of loading /etc/chrony/chrony.conf from the file generated from
the chrony UCI configuration, use the confdir directive in the main
config to load the generated file. This should make it obvious that
chrony is configured in UCI and it can also be easily disabled.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
This commit is contained in:
Miroslav Lichvar 2020-10-30 17:02:49 +01:00
parent f07319d6b1
commit 1dc8c501a6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/chrony/files/chrony.conf
View file

@ -1,4 +1,5 @@
# This file is included from config file generated from /etc/config/chrony
# Load UCI configuration
confdir /var/etc/chrony.d
# Log clock errors above 0.5 seconds
logchange 0.5

11
net/chrony/files/chronyd.init
View file

@ -4,8 +4,8 @@
START=15
USE_PROCD=1
PROG=/usr/sbin/chronyd
CONFIGFILE=/var/etc/chrony.conf
INCLUDEFILE=/etc/chrony/chrony.conf
CONFIGFILE=/etc/chrony/chrony.conf
INCLUDEFILE=/var/etc/chrony.d/10-uci.conf
handle_source() {
local cfg=$1 sourcetype=$2 hostname minpoll maxpoll iburst
@ -57,20 +57,19 @@ start_service() {
. /lib/functions/network.sh
procd_open_instance
procd_set_param command $PROG -n -f $CONFIGFILE
procd_set_param command $PROG -n
procd_set_param file $CONFIGFILE
procd_set_param file $INCLUDEFILE
procd_close_instance
config_load chrony
mkdir -p $(dirname $CONFIGFILE)
mkdir -p $(dirname $INCLUDEFILE)
(
echo include $INCLUDEFILE
config_foreach handle_source server server
config_foreach handle_source pool pool
config_foreach handle_source peer peer
config_foreach handle_allow allow
config_foreach handle_makestep makestep
) > $CONFIGFILE
) > $INCLUDEFILE
}