Enable netplan for all Bytemark machines

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 90f36397e85a981f9e2b6bd8d755d3a407751388..a404011c34223f5b53941747a5fa71f7c2eef22a 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -310,9 +310,9 @@ action :create do
     "totp_key",
     "csp_enforce",
     "csp_report_url"
-  ).merge(
+  ).reject { |_k, v| v.nil? }.merge(
     "server_protocol" => "https",
-    "server" => new_resource.site,
+    "server_url" => new_resource.site,
     "publisher_url" => "https://plus.google.com/111953119785824514010",
     "support_email" => "support@openstreetmap.org",
     "email_return_path" => "bounces@openstreetmap.org",