Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kandra: Drop support for 20.04 hosts.

This commit is contained in:
Alex Vandiver 2024-08-16 17:20:01 +00:00 committed by Tim Abbott
parent 50712bfa81
commit fe0a7b3b77
4 changed files with 23 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
puppet/kandra/files/chrony-20.04.conf
View File

@ -1,31 +0,0 @@
# Welcome to the chrony configuration file. See chrony.conf(5) for more
# information about usable directives.
# This will use the AWS local atomic clocks as a datasource; see
# https://aws.amazon.com/blogs/aws/keeping-time-with-amazon-time-sync-service/
server 169.254.169.123 prefer iburst minpoll 4 maxpoll 4
# 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

49
puppet/kandra/files/chrony-22.04.conf
View File

@ -1,49 +0,0 @@
# Welcome to the chrony configuration file. See chrony.conf(5) for more
# information about usable directives.
# Include configuration files found in /etc/chrony/conf.d.
confdir /etc/chrony/conf.d
# This will use the AWS local atomic clocks as a datasource; see
# https://aws.amazon.com/blogs/aws/keeping-time-with-amazon-time-sync-service/
server 169.254.169.123 prefer iburst minpoll 4 maxpoll 4
# Use time sources from DHCP.
sourcedir /run/chrony-dhcp
# Use NTP sources found in /etc/chrony/sources.d.
sourcedir /etc/chrony/sources.d
# 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
# Save NTS keys and cookies.
ntsdumpdir /var/lib/chrony
# 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
# Get TAI-UTC offset and leap seconds from the system tz database.
# This directive is commented out because AWS time servers do smear
# leap seconds.
#
#leapsectz right/UTC

18
puppet/kandra/files/chrony.conf
View File

@ -1,10 +1,19 @@
# Welcome to the chrony configuration file. See chrony.conf(5) for more # Welcome to the chrony configuration file. See chrony.conf(5) for more
# information about usable directives. # information about usable directives.
# Include configuration files found in /etc/chrony/conf.d.
confdir /etc/chrony/conf.d
# This will use the AWS local atomic clocks as a datasource; see # This will use the AWS local atomic clocks as a datasource; see
# https://aws.amazon.com/blogs/aws/keeping-time-with-amazon-time-sync-service/ # https://aws.amazon.com/blogs/aws/keeping-time-with-amazon-time-sync-service/
server 169.254.169.123 prefer iburst minpoll 4 maxpoll 4 server 169.254.169.123 prefer iburst minpoll 4 maxpoll 4
# Use time sources from DHCP.
sourcedir /run/chrony-dhcp
# Use NTP sources found in /etc/chrony/sources.d.
sourcedir /etc/chrony/sources.d
# This directive specify the location of the file containing ID/key pairs for # This directive specify the location of the file containing ID/key pairs for
# NTP authentication. # NTP authentication.
keyfile /etc/chrony/chrony.keys keyfile /etc/chrony/chrony.keys
@ -13,6 +22,9 @@ keyfile /etc/chrony/chrony.keys
# information. # information.
driftfile /var/lib/chrony/chrony.drift driftfile /var/lib/chrony/chrony.drift
# Save NTS keys and cookies.
ntsdumpdir /var/lib/chrony
# Uncomment the following line to turn logging on. # Uncomment the following line to turn logging on.
#log tracking measurements statistics #log tracking measurements statistics
@ -29,3 +41,9 @@ rtcsync
# Step the system clock instead of slewing it if the adjustment is larger than # Step the system clock instead of slewing it if the adjustment is larger than
# one second, but only in the first three clock updates. # one second, but only in the first three clock updates.
makestep 1 3 makestep 1 3
# Get TAI-UTC offset and leap seconds from the system tz database.
# This directive is commented out because AWS time servers do smear
# leap seconds.
#
#leapsectz right/UTC

12
puppet/kandra/manifests/profile/base.pp
View File

@ -50,12 +50,10 @@ class kandra::profile::base {
mode => '0644', mode => '0644',
source => 'puppet:///modules/kandra/apt/apt.conf.d/50unattended-upgrades', source => 'puppet:///modules/kandra/apt/apt.conf.d/50unattended-upgrades',
} }
if $facts['os']['distro']['release']['major'] == '22.04' { file { '/etc/needrestart/conf.d/zulip.conf':
file { '/etc/needrestart/conf.d/zulip.conf': ensure => file,
ensure => file, mode => '0644',
mode => '0644', source => 'puppet:///modules/kandra/needrestart/zulip.conf',
source => 'puppet:///modules/kandra/needrestart/zulip.conf',
}
} }
user { 'root': } user { 'root': }
@ -83,7 +81,7 @@ class kandra::profile::base {
file { '/etc/chrony/chrony.conf': file { '/etc/chrony/chrony.conf':
ensure => file, ensure => file,
mode => '0644', mode => '0644',
source => "puppet:///modules/kandra/chrony-${facts['os']['distro']['release']['major']}.conf", source => 'puppet:///modules/kandra/chrony.conf',
require => Package['chrony'], require => Package['chrony'],
notify => Service['chrony'], notify => Service['chrony'],
} }