From bbaeeb509951df6584baf777a8c49eb9b217fdb9 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Mon, 21 Jun 2021 17:47:30 +0200 Subject: [PATCH] Upgrade Gitea to 1.14.3 Adds a new config for the repository root directory. closes #322 --- site-cookbooks/kosmos_gitea/attributes/default.rb | 4 ++-- site-cookbooks/kosmos_gitea/recipes/default.rb | 2 ++ site-cookbooks/kosmos_gitea/templates/default/app.ini.erb | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos_gitea/attributes/default.rb b/site-cookbooks/kosmos_gitea/attributes/default.rb index fff9277..88706d9 100644 --- a/site-cookbooks/kosmos_gitea/attributes/default.rb +++ b/site-cookbooks/kosmos_gitea/attributes/default.rb @@ -1,6 +1,6 @@ -gitea_version = "1.13.7" +gitea_version = "1.14.3" node.default["kosmos_gitea"]["version"] = gitea_version node.default["kosmos_gitea"]["binary_url"] = "https://dl.gitea.io/gitea/#{gitea_version}/gitea-#{gitea_version}-linux-amd64" -node.default["kosmos_gitea"]["binary_checksum"] = "f1c0d3368d49f544183ec799005e7149fa566e3fd6eca1091d67d75b3f89f716" +node.default["kosmos_gitea"]["binary_checksum"] = "50c25c094ae109f49e276cd00ddc48a0a240b7670e487ae1286cc116d4cdbcf2" node.default["kosmos_gitea"]["nginx"]["domain"] = "gitea.kosmos.org" node.default["kosmos_gitea"]["working_directory"] = "/var/lib/gitea" diff --git a/site-cookbooks/kosmos_gitea/recipes/default.rb b/site-cookbooks/kosmos_gitea/recipes/default.rb index ba39c3c..7700eef 100644 --- a/site-cookbooks/kosmos_gitea/recipes/default.rb +++ b/site-cookbooks/kosmos_gitea/recipes/default.rb @@ -30,6 +30,7 @@ domain = node["kosmos_gitea"]["nginx"]["domain"] working_directory = node["kosmos_gitea"]["working_directory"] git_home_directory = "/home/git" +repository_root_directory = "#{git_home_directory}/gitea-repositories" config_directory = "/etc/gitea" gitea_binary_path = "/usr/local/bin/gitea" gitea_data_bag_item = data_bag_item("credentials", "gitea") @@ -101,6 +102,7 @@ template "#{config_directory}/app.ini" do sensitive true variables working_directory: working_directory, git_home_directory: git_home_directory, + repository_root_directory: repository_root_directory, config_directory: config_directory, gitea_binary_path: gitea_binary_path, jwt_secret: jwt_secret, diff --git a/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb b/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb index 3b80419..04eab6e 100644 --- a/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb +++ b/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb @@ -25,6 +25,9 @@ USER = gitea PASSWD = <%= @postgresql_password %> SSL_MODE = disable +[repository] +ROOT = <%= @repository_root_directory %> + # [indexer] # ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve