git: tweak description for apache keepalive timeout

[chef.git] / roles / otrs.rb

diff --git a/roles/otrs.rb b/roles/otrs.rb
index 0ee56b21ac94757eeec622c192d136aaf6964f4a..ec1264eb3249f33133378262a7d4447a920d455b 100644 (file)
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -2,16 +2,6 @@ name "otrs"
 description "Role applied to all OTRS servers"
 
 default_attributes(
 description "Role applied to all OTRS servers"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :otrs => { :status => :role }
-    },
-    :groups => {
-      :"www-data" => {
-        :members => [:otrs]
-      }
-    }
-  },

   :exim => {
     :local_domains => ["otrs.openstreetmap.org"],
     :routes => {
   :exim => {
     :local_domains => ["otrs.openstreetmap.org"],
     :routes => {


@@ -19,7 +9,7 @@ default_attributes(
         :comment => "otrs@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["otrs"],
         :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"
         :user => "otrs",
         :group => "www-data",
         :home_directory => "/opt/otrs"


@@ -28,7 +18,61 @@ default_attributes(
         :comment => "data@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["data"],
         :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"
+      },
+      :otrs_legal => {
+        :comment => "legal@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["legal"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group'",
+        :user => "otrs",
+        :group => "www-data",
+        :home_directory => "/opt/otrs"
+      },
+      :otrs_legal_privacy => {
+        :comment => "legal-privacy@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["legal-privacy"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group::Privacy'",
+        :user => "otrs",
+        :group => "www-data",
+        :home_directory => "/opt/otrs"
+      },
+      :otrs_legal_questions => {
+        :comment => "legal-questions@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["legal-questions"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group::Legal Questions'",
+        :user => "otrs",
+        :group => "www-data",
+        :home_directory => "/opt/otrs"
+      },
+      :otrs_legal_trademarks => {
+        :comment => "legal-trademarks@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["legal-trademarks"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group::Trademarks'",
+        :user => "otrs",
+        :group => "www-data",
+        :home_directory => "/opt/otrs"
+      },
+      :otrs_sotm_program => {
+        :comment => "sotm-program@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["sotm-program"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'State of the Map:Program'",

         :user => "otrs",
         :group => "www-data",
         :home_directory => "/opt/otrs"
         :user => "otrs",
         :group => "www-data",
         :home_directory => "/opt/otrs"


@@ -37,7 +81,7 @@ default_attributes(
         :comment => "support@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["support"],
         :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"
         :user => "otrs",
         :group => "www-data",
         :home_directory => "/opt/otrs"


@@ -46,13 +90,7 @@ default_attributes(
   },
   :otrs => {
     :site => "otrs.openstreetmap.org",
   },
   :otrs => {
     :site => "otrs.openstreetmap.org",

-    :database_cluster => "9.3/main",
-    :database_name => "otrs",
-    :database_user => "otrs",
-    :database_password => "otrs"
-  },
-  :postgresql => {
-    :versions => ["9.3"]
+    :site_aliases => ["otrs.osm.org"]

   }
 )
 
   }
 )