]> Frank Brehm's Git Trees - config/bruni/etc-mint.git/commitdiff
committing changes in /etc after apt run
authorFrank Brehm <frank@brehm-online.com>
Wed, 8 Aug 2018 13:18:04 +0000 (15:18 +0200)
committerFrank Brehm <frank@brehm-online.com>
Wed, 8 Aug 2018 13:18:04 +0000 (15:18 +0200)
Package changes:
+chrony 3.2-4ubuntu4.1 amd64

34 files changed:
.etckeeper
NetworkManager/dispatcher.d/20-chrony [new file with mode: 0755]
apparmor.d/local/usr.sbin.chronyd [new file with mode: 0644]
apparmor.d/usr.sbin.chronyd [new file with mode: 0644]
apparmor/init/network-interface-security/usr.sbin.ntpd [deleted symlink]
chrony/chrony.conf [new file with mode: 0644]
chrony/chrony.keys [new file with mode: 0644]
default/chrony [new file with mode: 0644]
dhcp/dhclient-exit-hooks.d/chrony [new file with mode: 0644]
group
group-
gshadow
gshadow-
init.d/chrony [new file with mode: 0755]
logrotate.d/chrony [new file with mode: 0644]
network/if-post-down.d/chrony [new file with mode: 0755]
network/if-up.d/chrony [new file with mode: 0755]
passwd
passwd-
ppp/ip-down.d/chrony [new file with mode: 0755]
ppp/ip-up.d/chrony [new file with mode: 0755]
rc0.d/K01chrony [new symlink]
rc1.d/K01chrony [new symlink]
rc2.d/S01chrony [new symlink]
rc3.d/S01chrony [new symlink]
rc4.d/S01chrony [new symlink]
rc5.d/S01chrony [new symlink]
rc6.d/K01chrony [new symlink]
shadow
shadow-
systemd/system/chronyd.service [new symlink]
systemd/system/multi-user.target.wants/chrony.service [new symlink]
systemd/system/ntp-systemd-netif.path [new symlink]
systemd/system/ntp.service [new symlink]

index affebbdb5d83cb6484820ec16160271fe2b43894..1f58400314ef76b23af6bbd721c1b5c7aeb33ae1 100755 (executable)
@@ -92,6 +92,7 @@ maybe chmod 0755 'NetworkManager/conf.d'
 maybe chmod 0644 'NetworkManager/conf.d/default-wifi-powersave-on.conf'
 maybe chmod 0755 'NetworkManager/dispatcher.d'
 maybe chmod 0755 'NetworkManager/dispatcher.d/01-ifupdown'
+maybe chmod 0755 'NetworkManager/dispatcher.d/20-chrony'
 maybe chmod 0755 'NetworkManager/dispatcher.d/no-wait.d'
 maybe chmod 0755 'NetworkManager/dispatcher.d/ntp'
 maybe chmod 0755 'NetworkManager/dispatcher.d/pre-down.d'
@@ -369,6 +370,7 @@ maybe chmod 0644 'apparmor.d/local/usr.lib.libreoffice.program.soffice.bin'
 maybe chmod 0644 'apparmor.d/local/usr.lib.libreoffice.program.xpdfimport'
 maybe chmod 0644 'apparmor.d/local/usr.lib.libvirt.virt-aa-helper'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.avahi-daemon'
+maybe chmod 0644 'apparmor.d/local/usr.sbin.chronyd'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.cups-browsed'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.cupsd'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.dnsmasq'
@@ -435,6 +437,7 @@ maybe chmod 0644 'apparmor.d/usr.lib.libreoffice.program.soffice.bin'
 maybe chmod 0644 'apparmor.d/usr.lib.libreoffice.program.xpdfimport'
 maybe chmod 0644 'apparmor.d/usr.lib.libvirt.virt-aa-helper'
 maybe chmod 0644 'apparmor.d/usr.sbin.avahi-daemon'
+maybe chmod 0644 'apparmor.d/usr.sbin.chronyd'
 maybe chmod 0644 'apparmor.d/usr.sbin.cups-browsed'
 maybe chmod 0644 'apparmor.d/usr.sbin.cupsd'
 maybe chmod 0644 'apparmor.d/usr.sbin.dnsmasq'
@@ -999,6 +1002,9 @@ maybe chmod 0644 'chatscripts/gprs'
 maybe chmod 0644 'chatscripts/pap'
 maybe chgrp 'dip' 'chatscripts/provider'
 maybe chmod 0640 'chatscripts/provider'
+maybe chmod 0755 'chrony'
+maybe chmod 0644 'chrony/chrony.conf'
+maybe chmod 0640 'chrony/chrony.keys'
 maybe chmod 0755 'cifs-utils'
 maybe chmod 0644 'colordiffrc'
 maybe chmod 0755 'compizconfig'
@@ -1215,6 +1221,7 @@ maybe chmod 0644 'default/bind9'
 maybe chmod 0644 'default/bridge-utils'
 maybe chmod 0644 'default/bsdmainutils'
 maybe chmod 0600 'default/cacerts'
+maybe chmod 0644 'default/chrony'
 maybe chmod 0644 'default/console-setup'
 maybe chmod 0644 'default/crda'
 maybe chmod 0644 'default/cron'
@@ -1270,6 +1277,7 @@ maybe chmod 0755 'dhcp/dhclient-enter-hooks.d/avahi-autoipd'
 maybe chmod 0755 'dhcp/dhclient-enter-hooks.d/resolved'
 maybe chmod 0755 'dhcp/dhclient-enter-hooks.d/samba'
 maybe chmod 0755 'dhcp/dhclient-exit-hooks.d'
+maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/chrony'
 maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/ntp'
 maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/ntpdate'
 maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes'
@@ -1837,6 +1845,7 @@ maybe chmod 0755 'init.d/atd'
 maybe chmod 0755 'init.d/avahi-daemon'
 maybe chmod 0755 'init.d/bind9'
 maybe chmod 0755 'init.d/bluetooth'
+maybe chmod 0755 'init.d/chrony'
 maybe chmod 0755 'init.d/console-setup.sh'
 maybe chmod 0755 'init.d/cron'
 maybe chmod 0755 'init.d/cryptdisks'
@@ -2127,6 +2136,7 @@ maybe chmod 0644 'logrotate.d/apport'
 maybe chmod 0644 'logrotate.d/apt'
 maybe chmod 0644 'logrotate.d/aptitude'
 maybe chmod 0644 'logrotate.d/bind'
+maybe chmod 0644 'logrotate.d/chrony'
 maybe chmod 0644 'logrotate.d/ctdb'
 maybe chmod 0644 'logrotate.d/cups-daemon'
 maybe chmod 0644 'logrotate.d/dpkg'
@@ -2260,6 +2270,7 @@ maybe chmod 0755 'network/if-down.d/bind9'
 maybe chmod 0755 'network/if-down.d/openvpn'
 maybe chmod 0755 'network/if-down.d/postfix'
 maybe chmod 0755 'network/if-post-down.d'
+maybe chmod 0755 'network/if-post-down.d/chrony'
 maybe chmod 0755 'network/if-post-down.d/vde2'
 maybe chmod 0755 'network/if-post-down.d/wireless-tools'
 maybe chmod 0755 'network/if-pre-up.d'
@@ -2270,6 +2281,7 @@ maybe chmod 0755 'network/if-up.d'
 maybe chmod 0755 'network/if-up.d/avahi-autoipd'
 maybe chmod 0755 'network/if-up.d/avahi-daemon'
 maybe chmod 0755 'network/if-up.d/bind9'
+maybe chmod 0755 'network/if-up.d/chrony'
 maybe chmod 0755 'network/if-up.d/ethtool'
 maybe chmod 0755 'network/if-up.d/ntpdate'
 maybe chmod 0755 'network/if-up.d/openssh-server'
@@ -2397,12 +2409,14 @@ maybe chmod 0755 'ppp/ip-down.d'
 maybe chmod 0755 'ppp/ip-down.d/0000usepeerdns'
 maybe chmod 0755 'ppp/ip-down.d/0dns-down'
 maybe chmod 0755 'ppp/ip-down.d/bind9'
+maybe chmod 0755 'ppp/ip-down.d/chrony'
 maybe chmod 0755 'ppp/ip-down.d/postfix'
 maybe chmod 0755 'ppp/ip-up'
 maybe chmod 0755 'ppp/ip-up.d'
 maybe chmod 0755 'ppp/ip-up.d/0000usepeerdns'
 maybe chmod 0755 'ppp/ip-up.d/0dns-up'
 maybe chmod 0755 'ppp/ip-up.d/bind9'
+maybe chmod 0755 'ppp/ip-up.d/chrony'
 maybe chmod 0755 'ppp/ip-up.d/postfix'
 maybe chmod 0755 'ppp/ipv6-down'
 maybe chmod 0755 'ppp/ipv6-down.d'
diff --git a/NetworkManager/dispatcher.d/20-chrony b/NetworkManager/dispatcher.d/20-chrony
new file mode 100755 (executable)
index 0000000..8bd7df0
--- /dev/null
@@ -0,0 +1,41 @@
+#!/bin/sh
+# This is a NetworkManager dispatcher / networkd-dispatcher script for
+# chronyd to set its NTP sources online or offline when a network interface
+# is configured or removed
+
+export LC_ALL=C
+
+# For NetworkManager consider only up/down events
+[ $# -ge 2 ] && [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
+
+# Note: for networkd-dispatcher routable.d ~= on and off.d ~= off
+
+# Check if there is a default route
+
+if /sbin/ip route list 2> /dev/null | grep -q '^default'; then
+  chronyc online > /dev/null 2>&1
+  exit 0
+fi
+
+sources=$(chronyc -c -n sources 2> /dev/null)
+
+[ $? -ne 0 ] && exit 0
+
+# Check each configured source if it has a route
+
+echo "$sources" | while IFS=, read mode state address rest; do
+  [ "$mode" != '^' ] && [ "$mode" != '=' ] && continue
+
+  /sbin/ip route get "$address" > /dev/null 2>&1 && command="online" || command="offline"
+
+  # Set priority of sources so that the selected source is set as
+  # last if offline to avoid unnecessary reselection
+  [ "$state" != '*' ] && priority=1 || priority=2
+
+  echo "$priority $command $address"
+
+done | sort | while read priority command address; do
+  echo "$command $address"
+done | chronyc > /dev/null 2>&1
+
+exit 0
diff --git a/apparmor.d/local/usr.sbin.chronyd b/apparmor.d/local/usr.sbin.chronyd
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/apparmor.d/usr.sbin.chronyd b/apparmor.d/usr.sbin.chronyd
new file mode 100644 (file)
index 0000000..4424e3c
--- /dev/null
@@ -0,0 +1,61 @@
+# Last Modified: Sat Jan 20 10:45:05 2018
+#include <tunables/global>
+#include <tunables/sys>
+
+/usr/sbin/chronyd (attach_disconnected) {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+
+  capability sys_time,
+  capability net_bind_service,
+  capability setuid,
+  capability setgid,
+  capability sys_nice,
+  capability sys_resource,
+  # for /run/chrony to be created
+  capability chown,
+  # for hwtimestamp
+  capability net_admin,
+
+  /usr/sbin/chronyd mr,
+
+  /etc/chrony/{,**} r,
+  /{,var/}run/chronyd.pid w,
+  /{,var/}run/chrony/{,*} rw,
+  /var/lib/chrony/{,*} r,
+  /var/lib/chrony/* w,
+  /var/log/chrony/{,*} r,
+  /var/log/chrony/* w,
+
+  # Using the “tempcomp” directive gives chronyd the ability to improve
+  # the stability and accuracy of the clock by compensating the temperature
+  # changes measured by a sensor close to the oscillator.
+  @{sys}/class/hwmon/hwmon[0-9]*/temp[0-9]*_input r,
+
+  # Support all paths suggested in the man page (LP: #1771028). Assume these
+  # are common use cases; others should be set as local include (see below).
+  # Configs using a 'chrony.' prefix like the tempcomp config file example
+  /etc/chrony.* r,
+  # Example gpsd socket is outside /{,var/}run/chrony/
+  /{,var/}run/chrony.tty{,*}.sock rw,
+  # To sign replies to MS-SNTP clients by the smbd daemon
+  /var/lib/samba/ntp_signd r,
+  /var/lib/samba/ntp_signd/{,*} rw,
+
+  # rtc
+  /etc/adjtime r,
+  /dev/rtc{,[0-9]*} rw,
+
+  # gps devices
+  /dev/pps[0-9]* rw,
+  /dev/ptp[0-9]* rw,
+
+  # For use with clocks that report via shared memory (e.g. gpsd),
+  # you may need to give ntpd access to all of shared memory, though
+  # this can be considered dangerous. See https://launchpad.net/bugs/722815
+  # for details. To enable, add this to local/usr.sbin.chronyd:
+  #     capability ipc_owner,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.sbin.chronyd>
+}
diff --git a/apparmor/init/network-interface-security/usr.sbin.ntpd b/apparmor/init/network-interface-security/usr.sbin.ntpd
deleted file mode 120000 (symlink)
index dbd958f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../apparmor.d/usr.sbin.ntpd
\ No newline at end of file
diff --git a/chrony/chrony.conf b/chrony/chrony.conf
new file mode 100644 (file)
index 0000000..d5a0b37
--- /dev/null
@@ -0,0 +1,45 @@
+# Welcome to the chrony configuration file. See chrony.conf(5) for more
+# information about usuable directives.
+
+# This will use (up to):
+# - 4 sources from ntp.ubuntu.com which some are ipv6 enabled
+# - 2 sources from 2.ubuntu.pool.ntp.org which is ipv6 enabled as well
+# - 1 source from [01].ubuntu.pool.ntp.org each (ipv4 only atm)
+# This means by default, up to 6 dual-stack and up to 2 additional IPv4-only
+# sources will be used.
+# At the same time it retains some protection against one of the entries being
+# down (compare to just using one of the lines). See (LP: #1754358) for the
+# discussion.
+#
+# About using servers from the NTP Pool Project in general see (LP: #104525).
+# Approved by Ubuntu Technical Board on 2011-02-08.
+# See http://www.pool.ntp.org/join.html for more information.
+pool ntp.ubuntu.com        iburst maxsources 4
+pool 0.ubuntu.pool.ntp.org iburst maxsources 1
+pool 1.ubuntu.pool.ntp.org iburst maxsources 1
+pool 2.ubuntu.pool.ntp.org iburst maxsources 2
+
+# This directive specify the location of the file containing ID/key pairs for
+# NTP authentication.
+keyfile /etc/chrony/chrony.keys
+
+# This directive specify the file into which chronyd will store the rate
+# information.
+driftfile /var/lib/chrony/chrony.drift
+
+# Uncomment the following line to turn logging on.
+#log tracking measurements statistics
+
+# Log files location.
+logdir /var/log/chrony
+
+# Stop bad estimates upsetting machine clock.
+maxupdateskew 100.0
+
+# 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.
+rtcsync
+
+# Step the system clock instead of slewing it if the adjustment is larger than
+# one second, but only in the first three clock updates.
+makestep 1 3
diff --git a/chrony/chrony.keys b/chrony/chrony.keys
new file mode 100644 (file)
index 0000000..cee70b3
--- /dev/null
@@ -0,0 +1,10 @@
+# This file is solely used for NTP authentication with symmetric keys
+# as defined by RFC 1305 and RFC 5905.
+#
+# It can contain ID/key pairs which can be generated using the “keygen” option
+# from “chronyc”; for example:
+# chronyc keygen 1 SHA256 256 >> /etc/chrony/chrony.keys
+# would generate a 256-bit SHA-256 key using ID 1.
+#
+# A list of supported hash functions and output encoding can be found in
+# the "keyfile" section from the "/usr/share/doc/chrony/chrony.txt.gz" file.
diff --git a/default/chrony b/default/chrony
new file mode 100644 (file)
index 0000000..b523f60
--- /dev/null
@@ -0,0 +1,10 @@
+# This is a configuration file for /etc/init.d/chrony and
+# /lib/systemd/system/chrony.service; it allows you to pass various options to
+# the chrony daemon without editing the init script or service file.
+
+# Options to pass to chrony.
+DAEMON_OPTS=""
+
+# Sync systecm clock in containers or without CAP_SYS_TIME (likely to fail)
+# See /usr/share/doc/chrony/README.container for details.
+SYNC_IN_CONTAINER="no"
diff --git a/dhcp/dhclient-exit-hooks.d/chrony b/dhcp/dhclient-exit-hooks.d/chrony
new file mode 100644 (file)
index 0000000..690f3ab
--- /dev/null
@@ -0,0 +1,25 @@
+SERVERFILE=/var/lib/dhcp/chrony.servers.$interface
+
+chrony_config() {
+    rm -f $SERVERFILE
+    for server in $new_ntp_servers; do
+        echo "$server iburst" >> $SERVERFILE
+    done
+    /usr/lib/chrony/chrony-helper update-daemon || :
+}
+
+chrony_restore() {
+    if [ -f $SERVERFILE ]; then
+        rm -f $SERVERFILE
+        /usr/lib/chrony/chrony-helper update-daemon || :
+    fi
+}
+
+case $reason in
+    BOUND|RENEW|REBIND|REBOOT)
+        chrony_config
+        ;;
+    EXPIRE|FAIL|RELEASE|STOP)
+        chrony_restore
+        ;;
+esac
diff --git a/group b/group
index fe12092e0384602e45e25c09c7bff07d6c93f1a2..908def00c87e3e2a55b0d410ab577b8c82d4a91a 100644 (file)
--- a/group
+++ b/group
@@ -83,3 +83,4 @@ winbindd_priv:x:141:
 nobody:x:1001:
 sambamachines:x:1002:
 plex:x:963:frank
+_chrony:x:142:
diff --git a/group- b/group-
index 143ab100465dffe0164d5b857dd882940877f6d3..fe12092e0384602e45e25c09c7bff07d6c93f1a2 100644 (file)
--- a/group-
+++ b/group-
@@ -82,4 +82,4 @@ mysql:x:140:
 winbindd_priv:x:141:
 nobody:x:1001:
 sambamachines:x:1002:
-plex:x:963:
+plex:x:963:frank
diff --git a/gshadow b/gshadow
index cc9ca9a62b7a8d6c060ed62e8ced8eb3a5de525e..1859a6a08abe530ffe8931e6847140cd3870534c 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -83,3 +83,4 @@ winbindd_priv:!::
 nobody:!::
 sambamachines:!::
 plex:!::frank
+_chrony:!::
index 40712bde434f645dcf15956a05fb1257a4c87773..cc9ca9a62b7a8d6c060ed62e8ced8eb3a5de525e 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -82,4 +82,4 @@ mysql:!::
 winbindd_priv:!::
 nobody:!::
 sambamachines:!::
-plex:!::
+plex:!::frank
diff --git a/init.d/chrony b/init.d/chrony
new file mode 100755 (executable)
index 0000000..bc376b5
--- /dev/null
@@ -0,0 +1,73 @@
+#! /bin/sh
+#
+# Written by Miquel van Smoorenburg <miquels@drinkel.ow.org>.
+# Modified for Debian GNU/Linux by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+# Modified for Debian by Christoph Lameter <clameter@debian.org>
+# Modified for chrony by John Hasler <jhasler@debian.org> 1998-2012
+# Modified for Debian by Vincent Blut <vincent.debian@free.fr>
+
+### BEGIN INIT INFO
+# Provides:          chrony
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      $syslog $network $named $time
+# Should-Stop:       $syslog $network $named $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Controls chronyd NTP time daemon
+# Description:       Chronyd is the NTP time daemon in the Chrony package
+### END INIT INFO
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/usr/sbin/chronyd
+NAME="chronyd"
+DESC="time daemon"
+PIDFILE=/run/chronyd.pid
+CHRONY_HELPER=/usr/lib/chrony/chrony-helper
+
+[ -x "$DAEMON" ] || exit 0
+
+. /lib/lsb/init-functions
+
+# Override this variable by editing /etc/default/chrony.
+DAEMON_OPTS=""
+if [ -f /etc/default/chrony ]; then
+    . /etc/default/chrony
+fi
+
+case "$1" in
+    start)
+        if $0 status > /dev/null ; then
+            log_success_msg "$NAME is already running"
+        else
+            log_daemon_msg "Starting $DESC" "$NAME"
+            start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+            if [ -x $CHRONY_HELPER ]; then
+                $CHRONY_HELPER update-daemon
+            fi
+            log_end_msg $?
+        fi
+        ;;
+
+    stop)
+        log_daemon_msg "Stopping $DESC" "$NAME"
+        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --remove-pidfile --exec $DAEMON
+        log_end_msg $?
+        ;;
+
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+
+    status)
+        status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
+        ;;
+
+    *)
+        log_action_msg "Usage: /etc/init.d/chrony {start|stop|restart|force-reload|status}"
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/logrotate.d/chrony b/logrotate.d/chrony
new file mode 100644 (file)
index 0000000..2823a1a
--- /dev/null
@@ -0,0 +1,8 @@
+/var/log/chrony/*.log {
+    missingok
+    nocreate
+    sharedscripts
+    postrotate
+        /usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true
+    endscript
+}
diff --git a/network/if-post-down.d/chrony b/network/if-post-down.d/chrony
new file mode 100755 (executable)
index 0000000..1b29577
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+[ -x /usr/sbin/chronyd ] || exit 0
+
+if [ -e /run/chronyd.pid ] && ! ip r 2> /dev/null | grep -q '^default'; then
+    chronyc offline > /dev/null 2>&1
+fi
+
+exit 0
diff --git a/network/if-up.d/chrony b/network/if-up.d/chrony
new file mode 100755 (executable)
index 0000000..90622b8
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+[ -x /usr/sbin/chronyd ] || exit 0
+
+if [ -e /run/chronyd.pid ] &&
+    ip r list dev $IFACE 2> /dev/null | grep -q '^default'; then
+    chronyc online > /dev/null 2>&1
+fi
+
+exit 0
diff --git a/passwd b/passwd
index cf081c3ac66ce087b792c083f3c38ab4f888b880..0658191b2842d0c1be6c75d9afcb50bcf0e9e5a1 100644 (file)
--- a/passwd
+++ b/passwd
@@ -59,3 +59,4 @@ kameu:x:1001:100:Karin Meusel:/home/kameu:/bin/bash
 mysql:x:128:140:MySQL Server:/nonexistent:/bin/false
 smbguest:x:1125:1001:Samba guest account:/dev/null:/dev/null
 plex:x:136:963:Plex Media Server:/var/lib/plexmediaserver:/bin/bash
+_chrony:x:129:142:Chrony daemon,,,:/var/lib/chrony:/usr/sbin/nologin
diff --git a/passwd- b/passwd-
index 0daf925aa27c5e6ffa9208e62d31560a14b8fe0c..3cd22594a0fdc56a8fed9cb837c430f538c84310 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -58,3 +58,5 @@ vivi:x:1006:100:Vivien Musterer:/home/vivi:/bin/bash
 kameu:x:1001:100:Karin Meusel:/home/kameu:/bin/bash
 mysql:x:128:140:MySQL Server:/nonexistent:/bin/false
 smbguest:x:1125:1001:Samba guest account:/dev/null:/dev/null
+plex:x:136:963:Plex Media Server:/var/lib/plexmediaserver:/bin/bash
+_chrony:x:129:142::/var/lib/chrony:/usr/sbin/nologin
diff --git a/ppp/ip-down.d/chrony b/ppp/ip-down.d/chrony
new file mode 100755 (executable)
index 0000000..c8b776b
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh
+# This script tells chronyd that the connection is down
+# so that it won't try to contact the server. 
+# John Hasler <jhasler@debian.org>  1998-2003
+# Any possessor of a copy of this program may treat it as if it
+# were in the public domain.  I waive all rights.
+# Modified by Vincent Blut <vincent.debian@free.fr>
+
+if [ -e /run/chronyd.pid ] && ! ip r 2> /dev/null | grep -q '^default'; then
+    chronyc offline > /dev/null 2>&1
+fi
+
+exit 0
diff --git a/ppp/ip-up.d/chrony b/ppp/ip-up.d/chrony
new file mode 100755 (executable)
index 0000000..d450452
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh
+# This script tells chronyd that the connection is up so that it can
+# contact the server.  John Hasler <jhasler@debian.org> 1998-2003
+# Any possessor of a copy of this program may treat it as if it
+# were in the public domain.  I waive all rights.
+# Modified by Vincent Blut <vincent.debian@free.fr>
+
+if [ -e /run/chronyd.pid ] && ip r 2> /dev/null | grep -q '^default'; then
+    chronyc online > /dev/null 2>&1
+fi
+
+exit 0
diff --git a/rc0.d/K01chrony b/rc0.d/K01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/rc1.d/K01chrony b/rc1.d/K01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/rc2.d/S01chrony b/rc2.d/S01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/rc3.d/S01chrony b/rc3.d/S01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/rc4.d/S01chrony b/rc4.d/S01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/rc5.d/S01chrony b/rc5.d/S01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/rc6.d/K01chrony b/rc6.d/K01chrony
new file mode 120000 (symlink)
index 0000000..53f1361
--- /dev/null
@@ -0,0 +1 @@
+../init.d/chrony
\ No newline at end of file
diff --git a/shadow b/shadow
index f1391f5761a25a1c8c552f75f5549cf2c64a1575..de0f2db19c6f10e034a787d18347e473ee92680a 100644 (file)
--- a/shadow
+++ b/shadow
@@ -59,3 +59,4 @@ kameu:$6$5h/eHwOt$vHYM0Cxc6GsFbNjm5J4cdqjvmok6Ce9tSnP5Ox8MwDBHJ/ldTIId1ZGs4k8pa1
 mysql:!:17722:0:99999:7:::
 smbguest:!:17723:0:99999:7:::
 plex:!:17743:0:99999:7:::
+_chrony:*:17751:0:99999:7:::
diff --git a/shadow- b/shadow-
index 97e56f703c92099f14a7b2228b752ee625174606..de0f2db19c6f10e034a787d18347e473ee92680a 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -50,7 +50,7 @@ doris:$6$aaBD.v4x$kR6SRHU0BmEMnK5SVaU/UcHl.xw.pfq7naPf8Wb6xkA4c1ENK.9XKvc/Tj5iF4
 davis:$6$k0oYWtBJ$tWzq/wKmRSxNN90ibDQ1Psd2MqcA0KgYAFl/N0KNIr.0oz2vpRSG/xUVX4j6ubOwB1MEG8UI9bIgs9D3Y5row.:16972:0:99999:7:::
 gast:$6$YvNBr9hC$KQPyvJrvdrABSFCxXVMc3sGMeq8dToHzjJuKvzmyQFjYAwmSHcXyuqLy3IxaWeAEsJZxvOXFivkISk2hJ0ucS0:17320:0:99999:7:::
 heiko:$6$H4HqXLQP$C8z9qeK1thF1pEN.ABVIghuRwNU4eIVBLbEo3N7RcnEebwNevoulYo.mGH/tXcEfnE2WsVTILMpPH1FHKD5AK/:15590:0:99999:7:::
-patrick:$1$GLbMMbFN$CAnFjqpvABrKPsMgioPbx0:14147:0:99999:7:::
+patrick:$6$KBfaWiff$x3l.ZpC5JokbgmK1cVshDS4dvtIfryJtfT4PJdwORV2nSOKjK774Edp9q1XdIBOtINVIeTZYg7QfzFQ2FL41G1:17747:0:99999:7:::
 robert:$1$3dN7L0X7$wjwYf5TMs4XAzX8yA8iRz0:14147:0:99999:7:::
 steffen:$6$l6EVLY86$j9aCQ8smEOrsH/ccQM1r.qQXZxCBazpcCxQe0e1LKYl5oycf7gcBWB.Bx5kqw5gqS7MkiKik69TEAObmPNXfy0:14772:0:99999:7:::
 thomas:!$1$TnH.ZwKd$6fG79iLoCvVzMC5DGSzmL.:14147:0:99999:7:::
@@ -58,3 +58,5 @@ vivi:$1$E5UMs24X$g/xNaGJFgTK1uB9xVZOGc1:14147:0:99999:7:::
 kameu:$6$5h/eHwOt$vHYM0Cxc6GsFbNjm5J4cdqjvmok6Ce9tSnP5Ox8MwDBHJ/ldTIId1ZGs4k8pa1OPgtMuw1yxvrwkAlvPrkJwQ/:17722:0:99999:7:::
 mysql:!:17722:0:99999:7:::
 smbguest:!:17723:0:99999:7:::
+plex:!:17743:0:99999:7:::
+_chrony:*:17751:0:99999:7:::
diff --git a/systemd/system/chronyd.service b/systemd/system/chronyd.service
new file mode 120000 (symlink)
index 0000000..cf434ea
--- /dev/null
@@ -0,0 +1 @@
+/lib/systemd/system/chrony.service
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/chrony.service b/systemd/system/multi-user.target.wants/chrony.service
new file mode 120000 (symlink)
index 0000000..cf434ea
--- /dev/null
@@ -0,0 +1 @@
+/lib/systemd/system/chrony.service
\ No newline at end of file
diff --git a/systemd/system/ntp-systemd-netif.path b/systemd/system/ntp-systemd-netif.path
new file mode 120000 (symlink)
index 0000000..dc1dc0c
--- /dev/null
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/systemd/system/ntp.service b/systemd/system/ntp.service
new file mode 120000 (symlink)
index 0000000..dc1dc0c
--- /dev/null
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file