X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/c9fce901431dec601230f540efe067d82166e25e..112f8e78a79f4f38d20a7b0a6cda8c078f3fa3f2:/roles/otrs.rb

diff --git a/roles/otrs.rb b/roles/otrs.rb
index 769a12667..6139dd1d1 100644
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -5,43 +5,64 @@ default_attributes(
   :accounts => {
     :users => {
       :otrs => { :status => :role }
+    },
+    :groups => {
+      :"www-data" => {
+        :members => [:otrs]
+      }
     }
   },
   :exim => {
-    :local_domains => [ "otrs.openstreetmap.org" ],
+    :local_domains => ["otrs.openstreetmap.org"],
     :routes => {
       :otrs_otrs => {
         :comment => "otrs@otrs.openstreetmap.org",
-        :domains => [ "otrs.openstreetmap.org" ],
-        :local_parts => [ "otrs" ],
-        :command => "/opt/otrs/bin/otrs.PostMaster.pl",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["otrs"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read",
         :user => "otrs",
+        :group => "www-data",
         :home_directory => "/opt/otrs"
       },
       :otrs_data => {
         :comment => "data@otrs.openstreetmap.org",
-        :domains => [ "otrs.openstreetmap.org" ],
-        :local_parts => [ "data" ],
-        :command => "/opt/otrs/bin/otrs.PostMaster.pl -q 'Data Working Group'",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["data"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Data Working Group'",
         :user => "otrs",
+        :group => "www-data",
+        :home_directory => "/opt/otrs"
+      },
+      :otrs_membership => {
+        :comment => "membership@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["membership"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Membership Working Group'",
+        :user => "otrs",
+        :group => "www-data",
         :home_directory => "/opt/otrs"
       },
       :otrs_support => {
         :comment => "support@otrs.openstreetmap.org",
-        :domains => [ "otrs.openstreetmap.org" ],
-        :local_parts => [ "support" ],
-        :command => "/opt/otrs/bin/otrs.PostMaster.pl -q 'Technical Support'",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["support"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Technical Support'",
         :user => "otrs",
+        :group => "www-data",
         :home_directory => "/opt/otrs"
       }
     }
   },
   :otrs => {
     :site => "otrs.openstreetmap.org",
-    :database_cluster => "8.4/main",
+    :site_aliases => ["otrs.osm.org"],
+    :database_cluster => "10/main",
     :database_name => "otrs",
     :database_user => "otrs",
     :database_password => "otrs"
+  },
+  :postgresql => {
+    :versions => ["10"]
   }
 )