Migrate akkounts proxy to openresty

environments/production.json

@@ -34,15 +34,6 @@
         }
       }
     },
-    "kosmos_kvm": {
-      "backup": {
-        "nodes_excluded": [
-          "garage-2", "garage-3", "garage-4",
-          "postgres-5",
-          "rsk-mainnet-2", "rsk-testnet-3"
-        ]
-      }
-    },
     "kosmos-mastodon": {
       "domain": "kosmos.social",
       "s3_endpoint": "http://localhost:3900",

nodes/draco.kosmos.org.json

@@ -39,7 +39,6 @@
       "kosmos_openresty::firewall",
       "kosmos_assets::nginx_site",
       "kosmos-akkounts::nginx",
-      "kosmos_discourse::nginx",
       "kosmos_encfs",
       "kosmos_encfs::default",
       "kosmos-ejabberd::firewall",
@@ -94,10 +93,12 @@
     "role[kvm_host]",
     "role[openresty_proxy]",
     "recipe[kosmos_encfs]",
+    "recipe[kosmos_kvm::host]",
+    "recipe[kosmos_kvm::backup]",
     "recipe[kosmos-ejabberd::firewall]",
     "recipe[kosmos-ipfs::firewall_swarm]",
     "recipe[kosmos-bitcoin::firewall]",
     "recipe[kosmos_zerotier::firewall]",
     "recipe[sockethub::firewall]"
   ]
-}
+}

nodes/fornax.kosmos.org.json

@@ -99,9 +99,10 @@
     }
   },
   "run_list": [
-    "role[base]",
-    "role[kvm_host]",
+    "recipe[kosmos-base]",
+    "recipe[kosmos_kvm::host]",
+    "recipe[kosmos_kvm::backup]",
     "role[nginx_proxy]",
     "role[zerotier_controller]"
   ]
-}
+}

roles/kvm_host.rb

@@ -1,6 +0,0 @@
-name "kvm_host"
-
-run_list %w(
-  kosmos_kvm::host
-  kosmos_kvm::backup
-)

roles/openresty_proxy.rb

@@ -21,6 +21,8 @@ development_run_list = %w(
 default_run_list = %w(
   role[openresty]
   tor-full
+  kosmos_assets::nginx_site
+  kosmos_discourse::nginx
   kosmos_drone::nginx
   kosmos_garage::default
   kosmos_garage::firewall_rpc
@@ -44,7 +46,6 @@ production_run_list = %w(
   role[openresty]
   kosmos_assets::nginx_site
   kosmos-akkounts::nginx
-  kosmos_discourse::nginx
 )
 
 env_run_lists(

site-cookbooks/discourse/metadata.rb

@@ -7,4 +7,5 @@ long_description 'Installs/Configures discourse'
 version '0.1.0'
 chef_version '>= 14.0'
 
+depends 'kosmos-nginx'
 depends 'firewall'

site-cookbooks/discourse/recipes/nginx.rb

@@ -0,0 +1,39 @@
+#
+# Cookbook:: discourse
+# Recipe:: nginx
+#
+
+include_recipe "kosmos-nginx"
+
+domain = node['discourse']['domain']
+discourse_role = node['discourse']['role']
+
+upstream_ip_addresses = []
+search(:node, "role:#{discourse_role}").each do |n|
+  upstream_ip_addresses << n["knife_zero"]["host"]
+end
+# No Discourse host, stop here
+if upstream_ip_addresses.empty?
+  Chef::Log.warn("No server with '#{discourse_role}' role. Stopping here.")
+  return
+end
+
+nginx_certbot_site domain
+
+template "#{node['nginx']['dir']}/sites-available/#{domain}" do
+  source "nginx_conf.erb"
+  owner 'www-data'
+  mode 0640
+  variables server_name:           domain,
+            ssl_cert:              "/etc/letsencrypt/live/#{domain}/fullchain.pem",
+            ssl_key:               "/etc/letsencrypt/live/#{domain}/privkey.pem",
+            upstream_port:         node['discourse']['port'],
+            upstream_name:         discourse_role,
+            upstream_ip_addresses: upstream_ip_addresses
+
+  notifies :reload, 'service[nginx]', :delayed
+end
+
+nginx_site domain do
+  action :enable
+end

site-cookbooks/kosmos_discourse/metadata.rb

@@ -2,11 +2,10 @@ name 'kosmos_discourse'
 maintainer 'Kosmos Developers'
 maintainer_email 'mail@kosmos.org'
 license 'MIT'
-description 'Installs/configures Discourse'
-long_description 'Installs/configures Discourse'
-version '0.2.0'
+description 'Installs/Configures discourse'
+long_description 'Installs/Configures discourse'
+version '0.1.0'
 chef_version '>= 14.0'
 
 depends 'discourse'
 depends 'firewall'
-depends 'kosmos_openresty'

site-cookbooks/kosmos_discourse/recipes/nginx.rb

@@ -3,30 +3,4 @@
 # Recipe:: nginx
 #
 
-domain = node['discourse']['domain']
-discourse_role = node['discourse']['role']
-
-upstream_ip_addresses = []
-search(:node, "role:#{discourse_role}").each do |n|
-  upstream_ip_addresses << n["knife_zero"]["host"]
-end
-# No Discourse host, stop here
-if upstream_ip_addresses.empty?
-  Chef::Log.warn("No server with '#{discourse_role}' role. Stopping here.")
-  return
-end
-
-tls_cert_for domain do
-  auth "gandi_dns"
-  action :create
-end
-
-openresty_site domain do
-  template "nginx_conf.erb"
-  variables server_name:           domain,
-            ssl_cert:              "/etc/letsencrypt/live/#{domain}/fullchain.pem",
-            ssl_key:               "/etc/letsencrypt/live/#{domain}/privkey.pem",
-            upstream_port:         node['discourse']['port'],
-            upstream_name:         discourse_role,
-            upstream_ip_addresses: upstream_ip_addresses
-end
+include_recipe "discourse::nginx"

site-cookbooks/kosmos_discourse/templates/nginx_conf.erb

@@ -8,7 +8,7 @@ upstream _discourse {
 <% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
 server {
   server_name <%= @server_name %>;
-  listen <%= "#{node['openresty']['listen_ip']}:" if node['openresty']['listen_ip'] %>443 ssl http2;
+  listen 443 ssl http2;
   listen [::]:443 ssl http2;
 
   ssl_certificate     <%= @ssl_cert %>;

site-cookbooks/kosmos_kvm/attributes/default.rb

@@ -8,5 +8,3 @@ node.default["kosmos_kvm"]["host"]["qemu_base_image"] = {
 
 # A systemd.timer OnCalendar config value
 node.default["kosmos_kvm"]["backup"]["schedule"] = "daily"
-# Node/VM names excluded from backups
-node.default["kosmos_kvm"]["backup"]["nodes_excluded"] = []

site-cookbooks/kosmos_kvm/recipes/backup.rb

@@ -54,8 +54,6 @@ end
 vm_domains = search(:node, "role:kvm_guest").map{|n| n["hostname"] } \
              & `virsh list --name`.strip.chomp.split("\n")
 
-vm_domains.reject! { |d| node["kosmos_kvm"]["backup"]["nodes_excluded"].include?(d) }
-
 template "/root/backups/backup_all_vms.sh" do
   source "backup_all_vms.sh.erb"
   mode '0750'