X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/68e068818d559ef35bdf2a138a93596337828ef9..5fbc96e38dd8dfcb3eb1ed0a5f4319ccaf244d6d:/roles/otrs.rb?ds=inline

diff --git a/roles/otrs.rb b/roles/otrs.rb
index 7355e664e..4b0bccd0d 100644
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -3,116 +3,106 @@ description "Role applied to all OTRS servers"
 
 default_attributes(
   :exim => {
-    :smarthost_via => "fafnir.openstreetmap.org:26",
     :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.Console.pl Maint::PostMaster::Read",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/otrs"
       },
       :otrs_data => {
         :comment => "data@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["data"],
-        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Data Working Group'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Data Working Group'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/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'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Membership Working Group'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/otrs"
       },
       :otrs_membership_osmf_talk_owner => {
         :comment => "osmf-talk-owner@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["osmf-talk-owner"],
-        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Membership Working Group::osmf-talk'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Membership Working Group::osmf-talk'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/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'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/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'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group::Privacy'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/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'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group::Legal Questions'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/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'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Licensing Working Group::Trademarks'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/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'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'State of the Map:Program'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/otrs"
       },
       :otrs_communications => {
         :comment => "communications@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["communications"],
-        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Communications Working Group'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Communications Working Group'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
-      },
-      :otrs_communications_freebies => {
-        :comment => "freebies@otrs.openstreetmap.org",
-        :domains => ["otrs.openstreetmap.org"],
-        :local_parts => ["freebies"],
-        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Communications Working Group::Freebies'",
-        :user => "otrs",
-        :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/otrs"
       },
       :otrs_support => {
         :comment => "support@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
         :local_parts => ["support"],
-        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Technical Support'",
+        :command => "/usr/share/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'Technical Support'",
         :user => "otrs",
         :group => "www-data",
-        :home_directory => "/opt/otrs"
+        :home_directory => "/usr/share/otrs"
       }
     }
   },