From 605d99f67ad361a244d3ea699181aa14aca5d9ec Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Mar 2020 00:02:52 +0000
Subject: [PATCH] Switch naga to be the new milkywan cache node

---
 roles/fullsave.rb | 49 -----------------------------------------------
 roles/naga.rb     | 20 +++++++++++++------
 2 files changed, 14 insertions(+), 55 deletions(-)
 delete mode 100644 roles/fullsave.rb

diff --git a/roles/fullsave.rb b/roles/fullsave.rb
deleted file mode 100644
index 657f9274d..000000000
--- a/roles/fullsave.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-name "fullsave"
-description "Role applied to all servers at FullSave"
-
-default_attributes(
-  :hosted_by => "FullSave",
-  :location => "Toulouse, France",
-  :networking => {
-    :firewall => {
-      :inet => [
-        {
-          :action => "ACCEPT",
-          :source => "net:185.116.130.12",
-          :dest => "fw",
-          :proto => "udp",
-          :dest_ports => "snmp",
-          :source_ports => "1024:",
-          :rate_limit => "-",
-          :connection_limit => "-"
-        },
-        {
-          :action => "ACCEPT",
-          :source => "net:100.80.8.0/24",
-          :dest => "fw",
-          :proto => "udp",
-          :dest_ports => "snmp",
-          :source_ports => "1024:",
-          :rate_limit => "-",
-          :connection_limit => "-"
-        }
-      ]
-    },
-    :nameservers => ["141.0.202.202", "141.0.202.203"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
-)
-
-override_attributes(
-  :ntp => {
-    :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
-  }
-)
-
-run_list(
-  "role[fr]"
-)
diff --git a/roles/naga.rb b/roles/naga.rb
index 664510b1f..1cecde636 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -3,17 +3,25 @@ description "Master role applied to naga"
 
 default_attributes(
   :hardware => {
-    :shm_size => "38g"
+    :shm_size => "14g"
   },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eno1",
+        :interface => "ens18",
         :role => :external,
         :family => :inet,
-        :address => "185.116.130.151",
-        :prefix => "24",
-        :gateway => "185.116.130.151"
+        :address => "45.13.104.40",
+        :prefix => "32",
+        :gateway => "10.0.4.1"
+      },
+      :external_ipv6 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a0b:cbc0:1101:1::41",
+        :prefix => "64",
+        :gateway => "2a0b:cbc0:1101:1::1"
       }
     }
   },
@@ -33,6 +41,6 @@ default_attributes(
 )
 
 run_list(
-  "role[fullsave]",
+  "role[milkywan]",
   "role[tilecache]"
 )
-- 
2.39.5