Merge pull request 'Upgrading centaurus to Ubuntu 20.04' (#196) from feature/195-centaurus_20.04 into master

This commit is contained in:
Râu Cao 2020-07-30 10:03:01 +00:00
commit c68bf472d4
2 changed files with 5 additions and 3 deletions

View File

@ -8,11 +8,12 @@
"automatic": { "automatic": {
"fqdn": "centaurus.kosmos.org", "fqdn": "centaurus.kosmos.org",
"os": "linux", "os": "linux",
"os_version": "4.15.0-101-generic", "os_version": "5.4.0-42-generic",
"hostname": "centaurus", "hostname": "centaurus",
"ipaddress": "78.46.59.98", "ipaddress": "78.46.59.98",
"roles": [ "roles": [
"gitea", "gitea",
"postgresql_client",
"postgresql_replica" "postgresql_replica"
], ],
"recipes": [ "recipes": [
@ -30,6 +31,7 @@
"ntp::default", "ntp::default",
"ntp::apparmor", "ntp::apparmor",
"kosmos-base::systemd_emails", "kosmos-base::systemd_emails",
"apt::unattended-upgrades",
"kosmos-base::firewall", "kosmos-base::firewall",
"kosmos-postfix::default", "kosmos-postfix::default",
"postfix::default", "postfix::default",
@ -54,7 +56,7 @@
"build-essential::default" "build-essential::default"
], ],
"platform": "ubuntu", "platform": "ubuntu",
"platform_version": "18.04", "platform_version": "20.04",
"cloud": null, "cloud": null,
"chef_packages": { "chef_packages": {
"ohai": { "ohai": {

View File

@ -47,7 +47,7 @@ include_recipe 'nginx'
# Override the nginx package resource to set a specific version, allowing # Override the nginx package resource to set a specific version, allowing
# to upgrade it # to upgrade it
edit_resource!(:package, 'nginx') do edit_resource!(:package, 'nginx') do
version "1.17.3-1~#{node['lsb']['codename']}" version "1.19.1-1~#{node['lsb']['codename']}"
notifies :reload, 'ohai[reload_nginx]', :immediately notifies :reload, 'ohai[reload_nginx]', :immediately
end end