saving uncommitted changes in /etc prior to apt run

diff --git a/bind/db.root b/bind/db.root
index f0b79d2af39435154908c1658cc263acd0648eb9..6c19741298de182bd1b6e00a727610136b6ac16a 100644 (file)
--- a/bind/db.root
+++ b/bind/db.root
@@ -9,32 +9,30 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    February 17, 2016
-;       related version of root zone:   2016021701
+;       last update:    Jan 3, 2013
+;       related version of root zone:   2013010300
 ;
 ; formerly NS.INTERNIC.NET
 ;
-.                        3600000      NS    A.ROOT-SERVERS.NET.
+.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
 A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
+A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
 ;
 ; FORMERLY NS1.ISI.EDU
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
 B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::b
 ;
 ; FORMERLY C.PSI.NET
 ;
 .                        3600000      NS    C.ROOT-SERVERS.NET.
 C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
 ;
 ; FORMERLY TERP.UMD.EDU
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
+D.ROOT-SERVERS.NET.     3600000      AAAA  2001:500:2D::D
 ;
 ; FORMERLY NS.NASA.GOV
 ;
@@ -45,7 +43,7 @@ E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
 ;
 .                        3600000      NS    F.ROOT-SERVERS.NET.
 F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
+F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
 ;
 ; FORMERLY NS.NIC.DDN.MIL
 ;
@@ -55,26 +53,26 @@ G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
 ; FORMERLY AOS.ARL.ARMY.MIL
 ;
 .                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     198.97.190.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::53
+H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
+H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
 ;
 ; FORMERLY NIC.NORDU.NET
 ;
 .                        3600000      NS    I.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
 ;
 ; OPERATED BY VERISIGN, INC.
 ;
 .                        3600000      NS    J.ROOT-SERVERS.NET.
 J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
+J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
 ;
 ; OPERATED BY RIPE NCC
 ;
 .                        3600000      NS    K.ROOT-SERVERS.NET.
 K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
+K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
 ;
 ; OPERATED BY ICANN
 ;
@@ -86,5 +84,5 @@ L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
 ;
 .                        3600000      NS    M.ROOT-SERVERS.NET.
 M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
-; End of file
+M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
+; End of File

diff --git a/logrotate.d/chrony b/logrotate.d/chrony
index 355118eaeadfa53abcc01533b31e31d518db971d..9a94e1c79279de7ed58a9001b9640a51d4bedf0e 100644 (file)
--- a/logrotate.d/chrony
+++ b/logrotate.d/chrony
@@ -10,6 +10,6 @@
        sharedscripts
        create 644
        postrotate
-               /usr/bin/chronyc -a cyclelogs > /dev/null 2>&1 || true
+               /usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true
        endscript
 }

diff --git a/postfix/main.cf b/postfix/main.cf
index f6ab2684d46c0fa121d2dfa1d118fbfb96357503..5fc5e8232b777355a451036e6ee64b0936055a46 100644 (file)
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -68,12 +68,9 @@ mynetworks =
        [::1]/128,
        10.12.20.2/32,
        185.48.118.128/32,
-       2001:6f8:1c00:365::2/128,
        2001:6f8:1db7::2/128,
        fe80::1:4eff:feed:632a/128,
        fe80::1:d8ff:fea2:5ec1/128,
-       fe80::4f8:1c00:365:2/128,
-       fe80::9bcd:bbd1:4ef8:6169/128,
 mailbox_command = procmail -a "$EXTENSION"
 mailbox_size_limit = 0
 recipient_delimiter = +

diff --git a/rsyslog.conf b/rsyslog.conf
index 588556929ff187fbdefa5a426c1dbda9de71d8a1..0f6dca3649793d84f6cb1466107e204eee39a721 100644 (file)
--- a/rsyslog.conf
+++ b/rsyslog.conf
@@ -10,18 +10,18 @@ $AbortOnUncleanConfig on
 #### MODULES ####
 #################
 
-$ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support
-#$ModLoad immark  # provides --MARK-- message capability
+module(load="imuxsock") # provides support for local system logging
+module(load="imklog")   # provides kernel logging support
+#module(load="immark")  # provides --MARK-- message capability
 module(load="immark" Interval="600")
 
 # provides UDP syslog reception
-#$ModLoad imudp
-#$UDPServerRun 514
+#module(load="imudp")
+#input(type="imudp" port="514")
 
 # provides TCP syslog reception
-#$ModLoad imtcp
-#$InputTCPServerRun 514
+#module(load="imtcp")
+#input(type="imtcp" port="514")
 
 
 ###########################
@@ -50,17 +50,6 @@ $FileCreateMode 0640
 $DirCreateMode 0755
 $Umask 0022
 
-module(
-        load="builtin:omfile"
-        Template="RSYSLOG_FileFormat"
-        FileCreateMode="0644"
-        DirCreateMode="0755"
-        fileOwnerNum="0"
-        fileGroupNum="0"
-        dirOwnerNum="0"
-        dirGroupNum="0"
-)
-
 #
 # Where to place spool and state files
 #
@@ -118,25 +107,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 # Emergencies are sent to everybody logged in.
 #
 *.emerg                                :omusrmsg:*
-
-#
-# I like to have messages displayed on the console, but only on a virtual
-# console I usually leave idle.
-#
-#daemon,mail.*;\
-#      news.=crit;news.=err;news.=notice;\
-#      *.=debug;*.=info;\
-#      *.=notice;*.=warn       /dev/tty8
-
-# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
-# you must invoke `xconsole' with the `-file' option:
-# 
-#    $ xconsole -file /dev/xconsole [...]
-#
-# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
-#      busy site..
-#
-daemon.*;mail.*;\
-       news.err;\
-       *.=debug;*.=info;\
-       *.=notice;*.=warn       |/dev/xconsole