diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json index f386f88..de5e0c7 100644 --- a/nodes/gitea-2.json +++ b/nodes/gitea-2.json @@ -13,7 +13,9 @@ "hostname": "gitea-2", "ipaddress": "192.168.122.189", "roles": [ + "base", "kvm_guest", + "ldap_client", "garage_gateway", "gitea", "postgresql_client" @@ -22,12 +24,13 @@ "kosmos-base", "kosmos-base::default", "kosmos_kvm::guest", + "kosmos-dirsrv::hostsfile", "kosmos_garage", "kosmos_garage::default", + "kosmos_garage::firewall_rpc", "kosmos_postgresql::hostsfile", "kosmos_gitea", "kosmos_gitea::default", - "kosmos_gitea::backup", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -42,9 +45,8 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", - "kosmos-dirsrv::hostsfile", - "backup::default", - "logrotate::default" + "firewall::default", + "chef-sugar::default" ], "platform": "ubuntu", "platform_version": "20.04", @@ -68,4 +70,4 @@ "role[garage_gateway]", "role[gitea]" ] -} +} \ No newline at end of file diff --git a/roles/gitea.rb b/roles/gitea.rb index 5f7fd2a..a9f7208 100644 --- a/roles/gitea.rb +++ b/roles/gitea.rb @@ -3,5 +3,4 @@ name "gitea" run_list %w( role[postgresql_client] kosmos_gitea::default - kosmos_gitea::backup ) diff --git a/site-cookbooks/kosmos_gitea/attributes/default.rb b/site-cookbooks/kosmos_gitea/attributes/default.rb index bcede60..32f5918 100644 --- a/site-cookbooks/kosmos_gitea/attributes/default.rb +++ b/site-cookbooks/kosmos_gitea/attributes/default.rb @@ -1,13 +1,16 @@ -gitea_version = "1.18.0" +gitea_version = "1.19.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"] = "b45b715d519a97086208c6b42528d291dd1c4dfdf40321dc940030e1cf3de6e6" +node.default["gitea"]["binary_checksum"] = "51e8d46a2634e5b5f4266eee8ca4689b5932caf692f23d06cbe5d2eaffe56079" node.default["gitea"]["working_directory"] = "/var/lib/gitea" node.default["gitea"]["port"] = 3000 node.default["gitea"]["postgresql_host"] = "localhost:5432" node.default["gitea"]["nginx"]["domain"] = "gitea.kosmos.org" node.default["gitea"]["config"] = { + "actions": { + "enabled": true + }, "webhook": { "allowed_host_list" => "external,127.0.1.1" } diff --git a/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb b/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb index 5740f57..e676409 100644 --- a/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb +++ b/site-cookbooks/kosmos_gitea/templates/default/app.ini.erb @@ -107,3 +107,8 @@ MINIO_LOCATION=<%= c["location"] %> MINIO_USE_SSL=<%= c["use_ssl"] %> <% end %> <% end %> + +<% if @config["actions"]["enabled"] %> +[actions] +ENABLED = true +<% end %>