Merge pull request 'Update Gitea and act_runner, improve recipes' (#547) from chore/upgrade_gitea into master
Reviewed-on: #547
This commit is contained in:
commit
089574d0de
@ -1,7 +1,5 @@
|
|||||||
gitea_version = "1.21.5"
|
node.default["gitea"]["version"] = "1.21.7"
|
||||||
node.default["gitea"]["version"] = gitea_version
|
node.default["gitea"]["checksum"] = "fa88e6404d3d34136bdd50c990a8c390d5e05f4cb2e31641559d14234e022bd6"
|
||||||
node.default["gitea"]["binary_url"] = "https://dl.gitea.io/gitea/#{gitea_version}/gitea-#{gitea_version}-linux-amd64"
|
|
||||||
node.default["gitea"]["binary_checksum"] = "7a521914203b07c7a0613ae30d8ab229111b149a2fa219423e643cd9a039256e"
|
|
||||||
node.default["gitea"]["working_directory"] = "/var/lib/gitea"
|
node.default["gitea"]["working_directory"] = "/var/lib/gitea"
|
||||||
node.default["gitea"]["port"] = 3000
|
node.default["gitea"]["port"] = 3000
|
||||||
node.default["gitea"]["postgresql_host"] = "localhost:5432"
|
node.default["gitea"]["postgresql_host"] = "localhost:5432"
|
||||||
@ -16,5 +14,5 @@ node.default["gitea"]["config"] = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
node.default["gitea"]["act_runner"]["download_url"] = "https://dl.gitea.com/act_runner/main/act_runner-main-linux-amd64"
|
node.default["gitea"]["act_runner"]["version"] = "0.2.6"
|
||||||
node.default["gitea"]["act_runner"]["checksum"] = "577ec7c64e7458b1e97cbe61d02da1ba1f4ddf24281b175f24f65101e72c000c"
|
node.default["gitea"]["act_runner"]["checksum"] = "234c2bdb871e7b0bfb84697f353395bfc7819faf9f0c0443845868b64a041057"
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
# Recipe:: act_runner
|
# Recipe:: act_runner
|
||||||
#
|
#
|
||||||
|
|
||||||
|
version = node["gitea"]["act_runner"]["version"]
|
||||||
|
download_url = "https://dl.gitea.com/act_runner/#{version}/act_runner-#{version}-linux-amd64"
|
||||||
working_directory = node["gitea"]["working_directory"]
|
working_directory = node["gitea"]["working_directory"]
|
||||||
gitea_credentials = data_bag_item("credentials", "gitea")
|
gitea_credentials = data_bag_item("credentials", "gitea")
|
||||||
runners = gitea_credentials["runners"]
|
runners = gitea_credentials["runners"]
|
||||||
@ -24,7 +26,7 @@ end
|
|||||||
end
|
end
|
||||||
|
|
||||||
remote_file "/usr/local/bin/act_runner" do
|
remote_file "/usr/local/bin/act_runner" do
|
||||||
source node["gitea"]["act_runner"]["download_url"]
|
source download_url
|
||||||
checksum node["gitea"]["act_runner"]["checksum"]
|
checksum node["gitea"]["act_runner"]["checksum"]
|
||||||
mode "0750"
|
mode "0750"
|
||||||
end
|
end
|
||||||
@ -66,6 +68,7 @@ act_runner register \
|
|||||||
WorkingDirectory: runner_dir,
|
WorkingDirectory: runner_dir,
|
||||||
Environment: "HOME=/root",
|
Environment: "HOME=/root",
|
||||||
ExecStart: "/usr/local/bin/act_runner daemon",
|
ExecStart: "/usr/local/bin/act_runner daemon",
|
||||||
|
ExecStartPre: "/bin/sleep 3", # Wait for Gitea's API to be up when restarting at the same time
|
||||||
Restart: "always",
|
Restart: "always",
|
||||||
},
|
},
|
||||||
Install: {
|
Install: {
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
# Recipe:: default
|
# Recipe:: default
|
||||||
#
|
#
|
||||||
|
|
||||||
|
version = node["gitea"]["version"]
|
||||||
|
download_url = "https://dl.gitea.io/gitea/#{version}/gitea-#{version}-linux-amd64"
|
||||||
working_directory = node["gitea"]["working_directory"]
|
working_directory = node["gitea"]["working_directory"]
|
||||||
git_home_directory = "/home/git"
|
git_home_directory = "/home/git"
|
||||||
repository_root_directory = "#{git_home_directory}/gitea-repositories"
|
repository_root_directory = "#{git_home_directory}/gitea-repositories"
|
||||||
@ -107,8 +109,8 @@ template "#{config_directory}/app.ini" do
|
|||||||
end
|
end
|
||||||
|
|
||||||
remote_file gitea_binary_path do
|
remote_file gitea_binary_path do
|
||||||
source node['gitea']['binary_url']
|
source download_url
|
||||||
checksum node['gitea']['binary_checksum']
|
checksum node['gitea']['checksum']
|
||||||
mode "0755"
|
mode "0755"
|
||||||
notifies :restart, "service[gitea]", :delayed
|
notifies :restart, "service[gitea]", :delayed
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user