From c6bfa2c09bd7283407d62f2905a17b74fd1e79e0 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 28 Aug 2022 11:59:03 +0900 Subject: [PATCH] Delete the recipes for `Ubuntu 16.04`. --- cookbooks/base/default.rb | 9 ----- cookbooks/base/files/etc/ntp.conf | 66 ------------------------------- cookbooks/base/ntp.rb | 13 ------ cookbooks/base/unnecessary.rb | 5 --- 4 files changed, 93 deletions(-) delete mode 100644 cookbooks/base/files/etc/ntp.conf delete mode 100644 cookbooks/base/ntp.rb delete mode 100644 cookbooks/base/unnecessary.rb diff --git a/cookbooks/base/default.rb b/cookbooks/base/default.rb index a20739c..8e776ee 100644 --- a/cookbooks/base/default.rb +++ b/cookbooks/base/default.rb @@ -66,15 +66,6 @@ include_recipe './lsyncd.rb' # Install starship command: include_recipe './starship.rb' -# recipes for Ubuntu 16.04 -if node['platform_version'].to_f == 16.04 - # ntp configurations - include_recipe './ntp.rb' - - # misc recipe - include_recipe './unnecessary.rb' -end - # recipes for Ubuntu 20.04 if node['platform_version'].to_f == 20.04 remote_file '/etc/multipath.conf' do diff --git a/cookbooks/base/files/etc/ntp.conf b/cookbooks/base/files/etc/ntp.conf deleted file mode 100644 index cd75b19..0000000 --- a/cookbooks/base/files/etc/ntp.conf +++ /dev/null @@ -1,66 +0,0 @@ -# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help - -driftfile /var/lib/ntp/ntp.drift - -# Enable this if you want statistics to be logged. -#statsdir /var/log/ntpstats/ - -statistics loopstats peerstats clockstats -filegen loopstats file loopstats type day enable -filegen peerstats file peerstats type day enable -filegen clockstats file clockstats type day enable - -# Specify one or more NTP servers. - -# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board -# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for -# more information. -pool 0.ubuntu.pool.ntp.org iburst -pool 1.ubuntu.pool.ntp.org iburst -pool 2.ubuntu.pool.ntp.org iburst -pool 3.ubuntu.pool.ntp.org iburst - -# Use Ubuntu's ntp server as a fallback. -pool ntp.ubuntu.com - -# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for -# details. The web page -# might also be helpful. -# -# Note that "restrict" applies to both servers and clients, so a configuration -# that might be intended to block requests from certain clients could also end -# up blocking replies from your own upstream servers. - -# By default, exchange time with everybody, but don't allow configuration. -restrict -4 default kod notrap nomodify nopeer noquery limited -restrict -6 default kod notrap nomodify nopeer noquery limited - -# Local users may interrogate the ntp server more closely. -restrict 127.0.0.1 -restrict ::1 - -# Needed for adding pool entries -restrict source notrap nomodify noquery - -# Clients from this (example!) subnet have unlimited access, but only if -# cryptographically authenticated. -#restrict 192.168.123.0 mask 255.255.255.0 notrust - - -# If you want to provide time to your local subnet, change the next line. -# (Again, the address is an example only.) -#broadcast 192.168.123.255 - -# If you want to listen to time broadcasts on your local subnet, de-comment the -# next lines. Please do this only if you trust everybody on the network! -#disable auth -#broadcastclient - -#Changes recquired to use pps synchonisation as explained in documentation: -#http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#AEN3918 - -#server 127.127.8.1 mode 135 prefer # Meinberg GPS167 with PPS -#fudge 127.127.8.1 time1 0.0042 # relative to PPS for my hardware - -#server 127.127.22.1 # ATOM(PPS) -#fudge 127.127.22.1 flag3 1 # enable PPS API diff --git a/cookbooks/base/ntp.rb b/cookbooks/base/ntp.rb deleted file mode 100644 index be36310..0000000 --- a/cookbooks/base/ntp.rb +++ /dev/null @@ -1,13 +0,0 @@ -package 'ntp' - -remote_file '/etc/ntp.conf' do - owner 'root' - group 'root' - mode '644' - - notifies :restart, 'service[ntp]' -end - -service 'ntp' do - action :nothing -end diff --git a/cookbooks/base/unnecessary.rb b/cookbooks/base/unnecessary.rb deleted file mode 100644 index 2132304..0000000 --- a/cookbooks/base/unnecessary.rb +++ /dev/null @@ -1,5 +0,0 @@ -%w( apparmor iscsid lxc lxcfs lxd-containers lxd open-iscsi ).each do |s| - service s do - action :disable - end -end