Merge pull request 'Upgrade Gitea to 1.14.3' (#327) from chore/322-update_gitea into master

Reviewed-on: #327

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"

site-cookbooks/kosmos_gitea/recipes/default.rb

@@ -2,41 +2,20 @@
 # Cookbook:: kosmos_gitea
 # Recipe:: default
 #
-# The MIT License (MIT)
-#
-# Copyright:: 2020, Kosmos Developers
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
 include_recipe "kosmos-nginx"
 
-domain = node["kosmos_gitea"]["nginx"]["domain"]
-
-working_directory = node["kosmos_gitea"]["working_directory"]
-git_home_directory = "/home/git"
-config_directory = "/etc/gitea"
-gitea_binary_path = "/usr/local/bin/gitea"
-gitea_data_bag_item = data_bag_item("credentials", "gitea")
-smtp_credentials = data_bag_item("credentials", "smtp")
-jwt_secret = gitea_data_bag_item["jwt_secret"]
-internal_token = gitea_data_bag_item["internal_token"]
-secret_key = gitea_data_bag_item["secret_key"]
+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")
+smtp_credentials          = data_bag_item("credentials", "smtp")
+jwt_secret                = gitea_data_bag_item["jwt_secret"]
+internal_token            = gitea_data_bag_item["internal_token"]
+secret_key                = gitea_data_bag_item["secret_key"]
 
 # Dependency
 package "git"
@@ -101,6 +80,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,

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