saving uncommitted changes in /etc prior to apt run

diff --git a/chrony/chrony.conf b/chrony/chrony.conf
index 51d69084eaf7a92a8ce4c7b935c5f68e9b03ed46..edbcf16cb56e2a4745e0c2b0860a64f31f243e4f 100644 (file)
--- a/chrony/chrony.conf
+++ b/chrony/chrony.conf
@@ -12,14 +12,29 @@
 # the link is up at boot time and set the online status accordingly.  If
 # you have an always-on connection such as cable omit the 'offline'
 # directive and chronyd will default to online.
+#
+# Note that if Chrony tries to go "online" and dns lookup of the servers
+# fails they will be discarded.  Thus under some circumstances it is 
+# better to use IP numbers than host names.
 
-pool 2.debian.pool.ntp.org offline iburst
+server 0.debian.pool.ntp.org auto_offline iburst minpoll 8
+server 1.debian.pool.ntp.org auto_offline iburst minpoll 8
+server 2.debian.pool.ntp.org auto_offline iburst minpoll 8
+server 3.debian.pool.ntp.org auto_offline iburst minpoll 8
 
-# This directive specify the location of the file containing ID/key pairs for
-# NTP authentication.
+# Look here for the admin password needed for chronyc.  The initial
+# password is generated by a random process at install time.  You may
+# change it if you wish.
 
 keyfile /etc/chrony/chrony.keys
 
+# Set runtime command key.  Note that if you change the key (not the
+# password) to anything other than 1 you will need to edit
+# /etc/ppp/ip-up.d/chrony, /etc/ppp/ip-down.d/chrony, /etc/init.d/chrony
+# and /etc/cron.weekly/chrony as these scripts use it to get the password.
+
+commandkey 1
+
 # I moved the driftfile to /var/lib/chrony to comply with the Debian
 # filesystem standard.
 
@@ -42,18 +57,30 @@ dumponexit
 
 dumpdir /var/lib/chrony
 
-# This directive lets 'chronyd' to serve time even if unsynchronised to any
-# NTP server.
+# Let computer be a server when it is unsynchronised.
+
+local stratum 10
+
+# GRIDSCALE - Disable server functionality and only bind on localhost
+bindcmdaddress 127.0.0.1
+bindcmdaddress ::1
+port 0
 
-#local stratum 10
+# GRIDSCALE - Allow stepping the clock. Normally, it’s recommended to allow the step only in
+# the first few updates, but in some cases (a virtual machine which can be suspended and resumed
+# with incorrect time) it may be necessary to allow the step at any clock update.
+makestep 1 -1
 
-# This directive designates subnets (or nodes) from which NTP clients are allowed
-# to access to 'chronyd'.
+# Allow computers on the unrouted nets to use the server.
 
-#allow foo.example.net
-#allow 10/8
-#allow 0/0 (allow access by any IPv4 node)
-#allow ::/0 (allow access by any IPv6 node)
+allow 10/8
+allow 192.168/16
+allow 172.16/12
+
+# This directive forces `chronyd' to send a message to syslog if it
+# makes a system clock adjustment larger than a threshold value in seconds.
+
+logchange 0.5
 
 # This directive defines an email address to which mail should be sent
 # if chronyd applies a correction exceeding a particular threshold to the
@@ -61,12 +88,17 @@ dumpdir /var/lib/chrony
 
 # mailonchange root@localhost 0.5
 
-# This directive tells 'chronyd' to parse the 'adjtime' file to find out if the
-# real-time clock keeps local time or UTC. It overrides the 'rtconutc' directive.
-
-hwclockfile /etc/adjtime
+# This directive tells chrony to regulate the real-time clock and tells it
+# Where to store related data.  It may not work on some newer motherboards
+# that use the HPET real-time clock.  It requires enhanced real-time
+# support in the kernel.  I've commented it out because with certain
+# combinations of motherboard and kernel it is reported to cause lockups.
 
-# This directive enables kernel synchronisation (every 11 minutes) of the
-# real-time clock. Note that it can’t be used along with the 'rtcfile' directive.
+# rtcfile /var/lib/chrony/chrony.rtc
 
-rtcsync
+# If the last line of this file reads 'rtconutc' chrony will assume that
+# the CMOS clock is on UTC (GMT).  If it reads '# rtconutc' or is absent
+# chrony will assume local time.  The line (if any) was written by the
+# chrony postinst based on what it found in /etc/default/rcS.  You may
+# change it if necessary. 
+rtconutc

diff --git a/logrotate.d/chrony b/logrotate.d/chrony
index 520fa1d2a5d5281f885b6804b548b20bed57ff40..9a94e1c79279de7ed58a9001b9640a51d4bedf0e 100644 (file)
--- a/logrotate.d/chrony
+++ b/logrotate.d/chrony
@@ -5,6 +5,8 @@
        notifempty
        compress
        delaycompress
+       dateext
+       size 4M
        sharedscripts
        create 644
        postrotate

diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog
index 5463612c8043a2520ad2796ac2ff0bef770eb4fb..e74fa837c06d478a2bd76fc6090a787a74eea22a 100644 (file)
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -1,19 +1,17 @@
-/var/log/syslog
-/var/log/messages
-{
-    rotate 7
-    daily
-    missingok
-    notifempty
-    delaycompress
-    compress
-    dateext
-    size 4M
-    olddir /var/log/.old
-    sharedscripts
-    postrotate
-        invoke-rc.d rsyslog rotate > /dev/null
-    endscript
+/var/log/syslog /var/log/messages {
+       rotate 7
+       daily
+       missingok
+       notifempty
+       compress
+       delaycompress
+       dateext
+       size 4M
+       olddir /var/log/.old
+       sharedscripts
+       postrotate
+               invoke-rc.d rsyslog rotate > /dev/null
+       endscript
 }
 
 /var/log/all.log
@@ -30,36 +28,35 @@
 /var/log/debug
 /var/log/debug.log
 {
-    rotate 4
-    weekly
-    missingok
-    notifempty
-    compress
-    delaycompress
-    dateext
-    size 4M
-    olddir /var/log/.old
-    sharedscripts
-    postrotate
-        invoke-rc.d rsyslog rotate > /dev/null
-    endscript
+       rotate 4
+       weekly
+       missingok
+       notifempty
+       compress
+       delaycompress
+       dateext
+       size 4M
+       olddir /var/log/.old
+       sharedscripts
+       postrotate
+               invoke-rc.d rsyslog rotate > /dev/null
+       endscript
 }
 
 /var/log/syslog.d/*.log {
-    rotate 10
-    weekly
-    missingok
-    notifempty
-    size 4M
-    delaycompress
-    dateext
-    compress
-    olddir /var/log/syslog.d/.old
-    sharedscripts
-    postrotate
-        invoke-rc.d rsyslog rotate > /dev/null
-    endscript
+       rotate 10
+       weekly
+       missingok
+       notifempty
+       size 4M
+       delaycompress
+       dateext
+       compress
+       olddir /var/log/syslog.d/.old
+       sharedscripts
+       postrotate
+               invoke-rc.d rsyslog rotate > /dev/null
+       endscript
 }
 
-
 # vim: ts=4 filetype=conf et

diff --git a/rsyslog.conf b/rsyslog.conf
index b90619bcf70624324e6b0e57cabab0a40426f024..da3bab1548d0373e0ec8505b36a2e5c3845b982b 100644 (file)
--- a/rsyslog.conf
+++ b/rsyslog.conf
@@ -39,7 +39,7 @@ module(load="impstats"
 # Use traditional timestamp format.
 # To enable high precision timestamps, comment out the following line.
 #
-# $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 
 #
 # Set the default permissions for all log files.