From 4cd0149f7616259dc29bbfd628a9c6c48902cbff Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Thu, 17 Mar 2022 14:27:50 -0600
Subject: [PATCH] Move static sites from centaurus to fornax/LB

---
 nodes/centaurus.kosmos.org.json                  |  4 ----
 nodes/fornax.kosmos.org.json                     | 11 ++++++++---
 roles/nginx_proxy.rb                             |  4 +++-
 site-cookbooks/kosmos_website/metadata.rb        |  1 +
 site-cookbooks/kosmos_website/recipes/default.rb |  1 +
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nodes/centaurus.kosmos.org.json b/nodes/centaurus.kosmos.org.json
index fcc9c55..580a566 100644
--- a/nodes/centaurus.kosmos.org.json
+++ b/nodes/centaurus.kosmos.org.json
@@ -77,11 +77,7 @@
   },
   "run_list": [
     "recipe[kosmos-base]",
-    "recipe[kosmos_encfs]",
-    "recipe[kosmos_assets::nginx_site]",
     "recipe[kosmos_kvm::host]",
-    "recipe[kosmos-ejabberd::firewall]",
-    "recipe[kosmos_website::default]",
     "recipe[kosmos_zerotier::firewall]"
   ]
 }
diff --git a/nodes/fornax.kosmos.org.json b/nodes/fornax.kosmos.org.json
index 4068c68..e4965b7 100644
--- a/nodes/fornax.kosmos.org.json
+++ b/nodes/fornax.kosmos.org.json
@@ -12,15 +12,18 @@
     "hostname": "fornax",
     "ipaddress": "148.251.83.201",
     "roles": [
-
+      "nginx_proxy"
     ],
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
       "kosmos_kvm::host",
+      "kosmos_assets::nginx_site",
       "kosmos_discourse::nginx",
-      "kosmos_gitea::nginx",
       "kosmos_drone::nginx",
+      "kosmos_gitea::nginx",
+      "kosmos_website",
+      "kosmos_website::default",
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
@@ -45,6 +48,8 @@
       "nginx::commons_script",
       "nginx::commons_conf",
       "kosmos-nginx::firewall",
+      "git::default",
+      "git::package",
       "kosmos-base::letsencrypt"
     ],
     "platform": "ubuntu",
@@ -67,4 +72,4 @@
     "recipe[kosmos_kvm::host]",
     "role[nginx_proxy]"
   ]
-}
+}
\ No newline at end of file
diff --git a/roles/nginx_proxy.rb b/roles/nginx_proxy.rb
index 0c94bc8..8b428e2 100644
--- a/roles/nginx_proxy.rb
+++ b/roles/nginx_proxy.rb
@@ -1,9 +1,11 @@
 name "nginx_proxy"
 
 default_run_list = %w(
+  kosmos_assets::nginx_site
   kosmos_discourse::nginx
-  kosmos_gitea::nginx
   kosmos_drone::nginx
+  kosmos_gitea::nginx
+  kosmos_website::default
 )
 
 env_run_lists(
diff --git a/site-cookbooks/kosmos_website/metadata.rb b/site-cookbooks/kosmos_website/metadata.rb
index a828211..bf45804 100644
--- a/site-cookbooks/kosmos_website/metadata.rb
+++ b/site-cookbooks/kosmos_website/metadata.rb
@@ -8,3 +8,4 @@ version '1.0.0'
 chef_version '>= 15.10' if respond_to?(:chef_version)
 
 depends "kosmos-nginx"
+depends 'git'
diff --git a/site-cookbooks/kosmos_website/recipes/default.rb b/site-cookbooks/kosmos_website/recipes/default.rb
index 903809a..d90cd94 100644
--- a/site-cookbooks/kosmos_website/recipes/default.rb
+++ b/site-cookbooks/kosmos_website/recipes/default.rb
@@ -4,6 +4,7 @@
 #
 
 include_recipe "kosmos-nginx"
+include_recipe "git"
 
 domain = node["kosmos_website"]["domain"]