From: Tom Hughes Date: Fri, 30 Aug 2024 18:27:06 +0000 (+0100) Subject: Merge remote-tracking branch 'github/pull/688' X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/d996203ad3b0a08b61513d94f3f88e594bfe7351?hp=24310af1d5ff79742861dcd8543a2cfdcf334a91 Merge remote-tracking branch 'github/pull/688' --- diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml index 9102aaf9f..3152db471 100644 --- a/.github/workflows/test-kitchen.yml +++ b/.github/workflows/test-kitchen.yml @@ -140,6 +140,12 @@ jobs: suite: serverinfo - os: debian-12 suite: supybot + - os: debian-12 + suite: web-cgimap + - os: debian-12 + suite: web-frontend + - os: debian-12 + suite: web-rails exclude: - suite: apt-repository os: ubuntu-2204 @@ -161,6 +167,12 @@ jobs: os: ubuntu-2204 - suite: supybot os: ubuntu-2204 + - suite: web-cgimap + os: ubuntu-2204 + - suite: web-frontend + os: ubuntu-2204 + - suite: web-rails + os: ubuntu-2204 fail-fast: false steps: - name: Login to GitHub Container Registry diff --git a/Gemfile.lock b/Gemfile.lock index dc2ef88c4..59200808f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (7.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -287,7 +287,7 @@ GEM chef-utils (18.5.0) concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cookstyle (7.32.8) rubocop (= 1.25.1) @@ -391,18 +391,18 @@ GEM rexml (~> 3.0) hashdiff (1.0.1) hashie (5.0.0) - highline (3.1.0) + highline (3.1.1) reline - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.14.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) inifile (3.0.0) - inspec (5.22.50) + inspec (5.22.55) faraday_middleware (>= 0.12.2, < 1.3) - inspec-core (= 5.22.50) + inspec-core (= 5.22.55) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -411,7 +411,7 @@ GEM train-habitat (~> 0.1) train-kubernetes (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.22.50) + inspec-core (5.22.55) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) cookstyle @@ -472,7 +472,7 @@ GEM multi_json (~> 1.14) method_source (1.1.0) mini_mime (1.1.5) - minitest (5.24.1) + minitest (5.25.1) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.30) @@ -506,8 +506,8 @@ GEM bigdecimal options (2.3.2) os (1.1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc parslet (2.0.0) @@ -532,7 +532,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.3) + rexml (3.3.6) strscan rspec (3.12.0) rspec-core (~> 3.12.0) @@ -559,7 +559,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) @@ -579,7 +579,7 @@ GEM unicode_utils (~> 1.4) strings-ansi (0.2.0) strscan (3.1.0) - test-kitchen (3.6.0) + test-kitchen (3.7.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -597,8 +597,8 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.12.6) - activesupport (>= 6.0.3.1) + train (3.12.7) + activesupport (>= 6.0.3.1, < 7.2.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) @@ -614,7 +614,7 @@ GEM google-apis-storage_v1 (~> 0.30.0) googleauth (>= 0.16.2, < 1.9.0) inifile (~> 3.0) - train-core (= 3.12.6) + train-core (= 3.12.7) train-winrm (~> 0.2) train-aws (0.2.41) aws-partitions (~> 1.863.0) @@ -697,7 +697,7 @@ GEM aws-sdk-transfer (~> 1.86.0) aws-sdk-waf (~> 1.58.0) aws-sdk-wafv2 (~> 1.74.0) - train-core (3.12.6) + train-core (3.12.7) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -735,14 +735,14 @@ GEM uber (0.1.0) unicode-display_width (2.5.0) unicode_utils (1.4.0) - winrm (2.3.8) + winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) - nori (~> 2.0) + nori (~> 2.0, >= 2.7.1) rexml (~> 3.0) rubyntlm (~> 0.6.0, >= 0.6.3) winrm-elevated (1.2.3) diff --git a/cookbooks/apt/recipes/management-component-pack.rb b/cookbooks/apt/recipes/management-component-pack.rb index 700ac02bd..92d81f989 100644 --- a/cookbooks/apt/recipes/management-component-pack.rb +++ b/cookbooks/apt/recipes/management-component-pack.rb @@ -30,6 +30,15 @@ if platform?("debian") components ["non-free"] key "C208ADDE26C2B797" end + + if node[:dmi][:system][:product_name].end_with?("Gen9") + apt_repository "mcp-gen9" do + uri "https://downloads.linux.hpe.com/SDR/repo/mcp" + distribution "stretch/current-gen9" + components ["non-free"] + key "C208ADDE26C2B797" + end + end elsif platform?("ubuntu") if node[:dmi][:system][:product_name].end_with?("Gen10") apt_repository "mcp-jammy" do diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index cba5239ae..d03b8b204 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -93,6 +93,7 @@ package %w[ nano netcat osm2pgsql + osmium-tool osmosis pandoc pandoc @@ -117,6 +118,7 @@ package %w[ pngcrush pngquant proj-bin + pyosmium python-is-python3 python3 python3-brotli diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 2fbf30141..5492134dc 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -465,6 +465,12 @@ end disks = disks.compact.uniq if disks.count.positive? + apt_preference "smartmontools" do + pin "release o=Debian Backports" + pin_priority "600" + only_if { platform?("debian") } + end + package "smartmontools" template "/etc/cron.daily/update-smart-drivedb" do diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 7f302b6ec..72e41b3e2 100644 --- a/cookbooks/web/recipes/cgimap.rb +++ b/cookbooks/web/recipes/cgimap.rb @@ -24,6 +24,10 @@ include_recipe "web::base" db_passwords = data_bag_item("db", "passwords") package "openstreetmap-cgimap-bin" do + action :purge +end + +package "openstreetmap-cgimap" do action :install end @@ -37,7 +41,6 @@ cgimap_options = { "CGIMAP_DBNAME" => "openstreetmap", "CGIMAP_USERNAME" => "cgimap", "CGIMAP_PASSWORD" => db_passwords["cgimap"], - "CGIMAP_OAUTH_HOST" => node[:web][:database_host], "CGIMAP_UPDATE_HOST" => node[:web][:database_host], "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid", "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log", @@ -65,7 +68,7 @@ systemd_service "cgimap" do user "rails" group "www-data" umask "0002" - exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30 --basic_auth_support false --oauth_10_support false" + exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30" exec_reload "/bin/kill -HUP $MAINPID" runtime_directory "cgimap" private_tmp true diff --git a/cookbooks/web/templates/default/logrotate.web.erb b/cookbooks/web/templates/default/logrotate.web.erb index 608fd4d38..03c3cb08a 100644 --- a/cookbooks/web/templates/default/logrotate.web.erb +++ b/cookbooks/web/templates/default/logrotate.web.erb @@ -7,6 +7,7 @@ compress delaycompress notifempty + su rails rails create 0660 rails rails sharedscripts postrotate diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb index 29f43dca4..1664f872c 100644 --- a/roles/nidhogg.rb +++ b/roles/nidhogg.rb @@ -21,7 +21,7 @@ default_attributes( :mode => "802.3ad", :lacprate => "fast", :xmithashpolicy => "layer3+4", - :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3] + :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3] } } }