Merge pull request 'Make create_vm work on all OS versions in use' (#653) from bugfix/create_vm into master

Reviewed-on: #653
Reviewed-by: Greg <greg@kosmos.org>

environments/production.json

@@ -81,7 +81,7 @@
           "garage-",
           "lq-",
           "rsk-",
-          "postgres-11"
+          "postgres-6"
         ]
       }
     },

site-cookbooks/kosmos_gitea/attributes/default.rb

@@ -1,5 +1,5 @@
-node.default["gitea"]["version"] = "1.27.1"
-node.default["gitea"]["checksum"] = "86a7ac26e7f9c9cca0f56c4fac07fff205d5fc3bca0e54af23a204f07b833bc9"
+node.default["gitea"]["version"] = "1.26.4"
+node.default["gitea"]["checksum"] = "0faa36d151918f8f7d6e0f3ae67597d1c338583d695add146ac393109d0fc44a"
 node.default["gitea"]["repo"] = nil
 node.default["gitea"]["revision"] = nil
 node.default["gitea"]["working_directory"] = "/var/lib/gitea"

site-cookbooks/kosmos_gitea/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'ops@kosmos.org'
 license 'MIT'
 description 'Installs/configures Gitea'
 long_description 'Installs/configures Gitea'
-version '0.2.1'
+version '0.2.0'
 chef_version '>= 14.0'
 
 depends "firewall"

site-cookbooks/kosmos_gitea/templates/default/app.ini.erb

@@ -62,9 +62,6 @@ FROM = <%= @email %>
 INTERNAL_TOKEN = <%= @internal_token %>
 INSTALL_LOCK   = true
 SECRET_KEY     = <%= @secret_key %>
-<% if c = @config["webhook"] %>
-<% if c["allowed_host_list"] %>ALLOWED_HOST_LIST = <%= c["allowed_host_list"] %><% end %>
-<% end %>
 
 [service]
 REGISTER_EMAIL_CONFIRM            = false
@@ -104,6 +101,11 @@ RUN_AT_START = false
 NOTICE_ON_SUCCESS = false
 SCHEDULE = @every 15m
 
+<% if c = @config["webhook"] %>
+[webhook]
+<% if c["allowed_host_list"] %>ALLOWED_HOST_LIST = <%= c["allowed_host_list"] %><% end %>
+<% end %>
+
 <% if c = @config["storage"] %>
 [storage]
 <% if c["type"] == "minio" %>