Revert "community: Fix CSRF issue with monkey patch fix"

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 0c1aba1e2532366360c6c49f06ee9edcf8ba50aa..d212b66807c3cdfa0e8d970a3209bc035ec4f982 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -17,25 +17,38 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.104",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::8",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.203",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.226.104"
+          :address => "87.252.214.101",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::8"
+          :address => "2001:4d78:fe03:1c::8",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
         }
       }
     }
-  },
-  :otrs => {
-    :site => "test.otrs.openstreetmap.org",
-    :site_aliases => ["test.otrs.osm.org"],
-    :database_cluster => "16/main"
-  },
-  :postgresql => {
-    :versions => ["16"]
   }
 )
 
@@ -47,6 +60,7 @@ run_list(
   "role[irc]",
   "role[blogs]",
   "role[switch2osm]",
+  "recipe[foundation::birthday]",
   "recipe[foundation::mastodon]",
   "recipe[foundation::owg]",
   "recipe[foundation::welcome]",
@@ -54,5 +68,5 @@ run_list(
   "recipe[hot]",
   "recipe[ideditor]",
   "recipe[dmca]",
-  "recipe[otrs::debian]"
+  "role[otrs]"
 )