Merge remote-tracking branch 'github/pull/670'

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 1fba0b69da9e2c0f4afb4ec1b236fa8e3c604cc1..2586aaf4a194fe35551afefa0a3b75d51f47041d 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -3,7 +3,6 @@ description "Master role applied to naga"
 
 default_attributes(
   :networking => {
-    :engine => "systemd-networkd",
     :interfaces => {
       :internal => {
         :interface => "bond0",
@@ -29,6 +28,19 @@ default_attributes(
         }
       }
     }
+  },
+  :otrs => {
+    :site => "test.otrs.openstreetmap.org",
+    :site_aliases => ["test.otrs.osm.org"],
+    :database_cluster => "16/main"
+  },
+  :postgresql => {
+    :versions => ["16"],
+    :settings => {
+      "16" => {
+        :port => 5433
+      }
+    }
   }
 )
 
@@ -39,9 +51,13 @@ run_list(
   "role[trac]",
   "role[irc]",
   "role[blogs]",
-  "role[munin]",
   "role[switch2osm]",
+  "recipe[foundation::mastodon]",
   "recipe[foundation::owg]",
   "recipe[foundation::welcome]",
-  "recipe[stateofthemap::container]"
+  "recipe[stateofthemap::container]",
+  "recipe[hot]",
+  "recipe[ideditor]",
+  "recipe[dmca]",
+  "recipe[otrs::debian]"
 )