Make unit name optional for path units

[chef.git] / roles / otrs.rb

diff --git a/roles/otrs.rb b/roles/otrs.rb
index 34d52ee04ecb45e56bb556a6a20ce5e4f84effaf..6139dd1d1394929c9b8cced071a1068227fa85d6 100644 (file)
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -19,7 +19,7 @@ default_attributes(
         :comment => "otrs@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["otrs"],
-        :command => "/opt/otrs/bin/otrs.PostMaster.pl",
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read",
         :user => "otrs",
         :group => "www-data",
         :home_directory => "/opt/otrs"
@@ -28,7 +28,16 @@ default_attributes(
         :comment => "data@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["data"],
-        :command => "/opt/otrs/bin/otrs.PostMaster.pl -q 'Data Working Group'",
+        :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"
@@ -37,7 +46,7 @@ default_attributes(
         :comment => "support@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["support"],
-        :command => "/opt/otrs/bin/otrs.PostMaster.pl -q 'Technical Support'",
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Technical Support'",
         :user => "otrs",
         :group => "www-data",
         :home_directory => "/opt/otrs"
@@ -46,10 +55,14 @@ default_attributes(
   },
   :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"]
   }
 )