diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json index 036472b..cddfdd9 100644 --- a/nodes/gitea-2.json +++ b/nodes/gitea-2.json @@ -33,7 +33,7 @@ "kosmos_gitea", "kosmos_gitea::default", "kosmos_gitea::backup", - "kosmos_gitea::act_runner", + "kosmos_gitea::runner", "apt::default", "timezone_iii::default", "timezone_iii::debian", diff --git a/roles/gitea_actions_runner.rb b/roles/gitea_actions_runner.rb index 5a1f73f..736c6ff 100644 --- a/roles/gitea_actions_runner.rb +++ b/roles/gitea_actions_runner.rb @@ -1,5 +1,5 @@ name "gitea_actions_runner" run_list %w( - kosmos_gitea::act_runner + kosmos_gitea::runner ) diff --git a/site-cookbooks/kosmos_gitea/attributes/default.rb b/site-cookbooks/kosmos_gitea/attributes/default.rb index 8d19c26..8e632db 100644 --- a/site-cookbooks/kosmos_gitea/attributes/default.rb +++ b/site-cookbooks/kosmos_gitea/attributes/default.rb @@ -1,5 +1,5 @@ -node.default["gitea"]["version"] = "1.25.4" -node.default["gitea"]["checksum"] = "a3031853e67c53714728ef705642c9046a11fb0ea356aff592e23efe6114607d" +node.default["gitea"]["version"] = "1.26.4" +node.default["gitea"]["checksum"] = "0faa36d151918f8f7d6e0f3ae67597d1c338583d695add146ac393109d0fc44a" node.default["gitea"]["repo"] = nil node.default["gitea"]["revision"] = nil node.default["gitea"]["working_directory"] = "/var/lib/gitea" @@ -23,5 +23,5 @@ node.default["gitea"]["config"] = { } } -node.default["gitea"]["act_runner"]["version"] = "0.2.13" -node.default["gitea"]["act_runner"]["checksum"] = "3acac8b506ac8cadc88a55155b5d6378f0fab0b8f62d1e0c0450f4ccd69733e2" +node.default["gitea"]["runner"]["version"] = "2.0.0" +node.default["gitea"]["runner"]["checksum"] = "447156b33407ee045409f5552bd4a188a315cdd4085b4b498d8d4a9ad26c9f73" diff --git a/site-cookbooks/kosmos_gitea/recipes/act_runner.rb b/site-cookbooks/kosmos_gitea/recipes/runner.rb similarity index 80% rename from site-cookbooks/kosmos_gitea/recipes/act_runner.rb rename to site-cookbooks/kosmos_gitea/recipes/runner.rb index 0d8725c..c864356 100644 --- a/site-cookbooks/kosmos_gitea/recipes/act_runner.rb +++ b/site-cookbooks/kosmos_gitea/recipes/runner.rb @@ -1,10 +1,10 @@ # # Cookbook:: kosmos_gitea -# Recipe:: act_runner +# Recipe:: runner # -version = node["gitea"]["act_runner"]["version"] -download_url = "https://dl.gitea.com/act_runner/#{version}/act_runner-#{version}-linux-amd64" +version = node["gitea"]["runner"]["version"] +download_url = "https://dl.gitea.com/gitea-runner/#{version}/gitea-runner-#{version}-linux-amd64" working_directory = node["gitea"]["working_directory"] gitea_credentials = data_bag_item("credentials", "gitea") runners = gitea_credentials["runners"] @@ -25,9 +25,9 @@ end package apt_pkg end -remote_file "/usr/local/bin/act_runner" do +remote_file "/usr/local/bin/gitea_runner" do source download_url - checksum node["gitea"]["act_runner"]["checksum"] + checksum node["gitea"]["runner"]["checksum"] mode "0750" end @@ -46,7 +46,7 @@ runners.each do |runner| bash "register_#{runner["org"]}_runner" do cwd runner_dir code <<-EOF -act_runner register \ +gitea_runner register \ --no-interactive \ --instance #{gitea_host} \ --name #{runner_name} \ @@ -59,7 +59,7 @@ act_runner register \ content({ Unit: { Description: "Gitea Actions Runner for '#{runner["org"]}' org", - Documentation: ["https://gitea.com/gitea/act_runner"], + Documentation: ["https://gitea.com/gitea/runner"], Requires: "gitea.service", After: "syslog.target network.target" }, @@ -67,7 +67,7 @@ act_runner register \ Type: "simple", WorkingDirectory: runner_dir, Environment: "HOME=/root", - ExecStart: "/usr/local/bin/act_runner daemon", + ExecStart: "/usr/local/bin/gitea_runner daemon", ExecStartPre: "/bin/sleep 3", # Wait for Gitea's API to be up when restarting at the same time Restart: "always", }, diff --git a/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb b/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb index a3ef14f..9d0fb7b 100644 --- a/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb +++ b/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb @@ -75,10 +75,6 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = false DEFAULT_ENABLE_TIMETRACKING = false NO_REPLY_ADDRESS = noreply.kosmos.org -[picture] -DISABLE_GRAVATAR = false -ENABLE_FEDERATED_AVATAR = true - [openid] ENABLE_OPENID_SIGNIN = false ENABLE_OPENID_SIGNUP = false