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

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 2586aaf4a194fe35551afefa0a3b75d51f47041d..da7d39cd81d1ac5366e52a3d3b8c34ab58be68bf 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -28,19 +28,6 @@ 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
-      }
-    }
   }
 )
 
@@ -52,6 +39,7 @@ run_list(
   "role[irc]",
   "role[blogs]",
   "role[switch2osm]",
+  "recipe[foundation::birthday]",
   "recipe[foundation::mastodon]",
   "recipe[foundation::owg]",
   "recipe[foundation::welcome]",
@@ -59,5 +47,5 @@ run_list(
   "recipe[hot]",
   "recipe[ideditor]",
   "recipe[dmca]",
-  "recipe[otrs::debian]"
+  "role[otrs]"
 )