cookbooks/base/timezone.rb

@@ -1,5 +1,5 @@
 case node['platform_version']
-when "18.04", "20.04", "22.04", "24.04"
+when "18.04", "20.04", "22.04"
   execute 'timedatectl set-timezone Asia/Tokyo' do
     not_if 'timedatectl | grep Tokyo'
   end

cookbooks/base/unattended-upgrade.rb

@@ -45,7 +45,7 @@ when "18.04"
     not_if 'test -e /var/log/cron-apt/log'
   end
 
-when '20.04', '22.04', '24.04'
+when '20.04', '22.04'
   %w(20auto-upgrades 50unattended-upgrades).each do |conf|
     remote_file "/etc/apt/apt.conf.d/#{conf}" do
       owner 'root'

cookbooks/nginx/attributes.rb

@@ -3,9 +3,8 @@
 # -------------------------------------------
 node.reverse_merge!({
   'nginx' => {
-    'version' => '1.26.0',
-    'skip_lego' => true,
-    'skip_webadm' => false,
-    'skip_deploy_conf' => true
+    'version' => '1.25.0',
+    'skip_lego' => 'true',
+    'skip_webadm' => 'true'
   }
 })

cookbooks/nginx/build.rb

@@ -78,7 +78,7 @@ directory MODULEDIR do
 end
 
 # Build starts here:
-execute "#{NGINXBUILD} -d working -v #{version} -c configure.sh -zlib -pcre -libressl -libresslversion 3.9.1" do
+execute "#{NGINXBUILD} -d working -v #{version} -c configure.sh -zlib -pcre -libressl -libresslversion 3.8.0" do
   cwd WORKDIR
   user USER
 

cookbooks/nginx/default.rb

@@ -35,13 +35,6 @@ end
 # Prerequisites for Building nginx:
 if !node['nginx']['skip_webadm']
   include_recipe './webadm.rb'
-end
-
-# Build nginx:
-include_recipe './build.rb'
-
-# Check whether to deploy the nginx confings:
-if !node['nginx']['skip_deploy_conf']
   include_recipe '../blog/default.rb'
   include_recipe '../everun/default.rb'
 end
@@ -51,5 +44,9 @@ if !node['nginx']['skip_lego']
   include_recipe './lego.rb'
 end
 
+# Build nginx:
+include_recipe './build.rb'
+
 # Setup nginx:
 include_recipe './setup.rb'
+

cookbooks/nginx/webadm.rb

@@ -47,18 +47,17 @@ end
 end
 
 # Create `repo` directory:
-if !node['nginx']['skip_deploy_conf']
-  git '/home/webadm/repo/nginx-config' do
-    user 'webadm'
-    repository 'https://github.com/kazu634/nginx-config.git'
-  end
-
-  execute '/home/webadm/repo/nginx-config/deploy.sh' do
-    user 'root'
-    cwd '/home/webadm/repo/nginx-config/'
-  end
-
-  service 'consul-template' do
-    action :restart
-  end
+git '/home/webadm/repo/nginx-config' do
+  user 'webadm'
+  repository 'https://github.com/kazu634/nginx-config.git'
 end
+
+execute '/home/webadm/repo/nginx-config/deploy.sh' do
+  user 'root'
+  cwd '/home/webadm/repo/nginx-config/'
+end
+
+service 'consul-template' do
+  action :restart
+end
+

cookbooks/vault/attributes.rb

@@ -3,7 +3,7 @@
 # -------------------------------------------
 
 case run_command('grep VERSION_ID /etc/os-release | awk -F\" \'{print $2}\'').stdout.chomp
-when "20.04", "22.04", "24.04"
+when "20.04", "22.04"
   cmd = 'LANG=C ip a | grep "inet " | grep -v -E "(127|172)" | cut -d" " -f6 | perl -pe "s/\/.+//g"'
 
 when "18.04"

cookbooks/vector/attributes.rb

@@ -2,7 +2,7 @@
 # Specifying the default settings:
 # -------------------------------------------
 case run_command('grep VERSION_ID /etc/os-release | awk -F\" \'{print $2}\'').stdout.chomp
-when "20.04", "22.04", "24.04"
+when "20.04", "22.04"
   cmd = 'LANG=C ip a | grep "inet " | grep -v -E "(127|172)" | cut -d" " -f6 | perl -pe "s/\/.+//g"'
 
 when "18.04"