Merge pull request 'Upgrade Gitea to 1.18.0' (#460) from chore/upgrade_gitea into master

Reviewed-on: #460
This commit is contained in:
Râu Cao 2022-12-30 16:08:18 +00:00
commit 2d50c7dfd6
3 changed files with 10 additions and 5 deletions

View File

@ -1,7 +1,7 @@
gitea_version = "1.17.3"
gitea_version = "1.18.0"
node.default["gitea"]["version"] = gitea_version
node.default["gitea"]["binary_url"] = "https://dl.gitea.io/gitea/#{gitea_version}/gitea-#{gitea_version}-linux-amd64"
node.default["gitea"]["binary_checksum"] = "38c4e1228cd051b785c556bcadc378280d76c285b70e8761cd3f5051aed61b5e"
node.default["gitea"]["binary_checksum"] = "b45b715d519a97086208c6b42528d291dd1c4dfdf40321dc940030e1cf3de6e6"
node.default["gitea"]["working_directory"] = "/var/lib/gitea"
node.default["gitea"]["port"] = 3000
node.default["gitea"]["postgresql_host"] = "localhost:5432"

View File

@ -10,6 +10,8 @@ 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")
smtp_addr = smtp_credentials["relayhost"].split(":")[0]
smtp_port = smtp_credentials["relayhost"].split(":")[1]
jwt_secret = gitea_data_bag_item["jwt_secret"]
internal_token = gitea_data_bag_item["internal_token"]
secret_key = gitea_data_bag_item["secret_key"]
@ -84,7 +86,8 @@ config_variables = {
secret_key: secret_key,
postgresql_host: node["gitea"]["postgresql_host"],
postgresql_password: gitea_data_bag_item["postgresql_password"],
smtp_host: smtp_credentials["relayhost"],
smtp_addr: smtp_addr,
smtp_port: smtp_port,
smtp_user: smtp_credentials["user_name"],
smtp_password: smtp_credentials["password"],
config: node["gitea"]["config"],

View File

@ -39,10 +39,12 @@ COOKIE_SECURE = true
[mailer]
ENABLED = true
HOST = <%= @smtp_host %>
FROM = gitea@kosmos.org
PROTOCOL = smtp+startls
SMTP_ADDR = <%= @smtp_addr %>
SMTP_PORT = <%= @smtp_port %>
USER = <%= @smtp_user %>
PASSWD = <%= @smtp_password %>
FROM = gitea@kosmos.org
[security]
INTERNAL_TOKEN = <%= @internal_token %>