otrs-paths.patch

   1 --- otrs-3.2.1/bin/Cron.sh      2012-11-22 12:43:09.000000000 +0100
   2 +++ otrs-3.2.1.new/bin/Cron.sh  2013-01-29 12:39:20.521608435 +0100
   3 @@ -45,7 +45,7 @@
   4  OTRS_HOME="`pwd`"
   5  cd -
   6
   7 -#OTRS_ROOT=/opt/OpenTRS
   8 +#OTRS_ROOT=/usr/share/otrs
   9  if test -e $OTRS_HOME/var/cron; then
  10      OTRS_ROOT=$OTRS_HOME
  11  else
  12 --- otrs-3.2.1/bin/otrs.SetPermissions.pl       2013-01-24 11:21:14.000000000 +0100
  13 +++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl   2013-01-29 12:39:39.175799680 +0100
  14 @@ -82,7 +82,7 @@
  15      [--not-root]
  16      <OTRS_HOME>
  17
  18 -Try: otrs.SetPermissions.pl /opt/otrs
  19 +Try: otrs.SetPermissions.pl /usr/share/otrs
  20  EOF
  21
  22      if ( $#ARGV < 0 ) {
  23 --- otrs-3.2.1/Kernel/Config/Defaults.pm        2013-01-17 10:06:52.000000000 +0100
  24 +++ otrs-3.2.1.new/Kernel/Config/Defaults.pm    2013-01-29 12:40:37.118464479 +0100
  25 @@ -297,7 +297,7 @@
  26  #    $Self->{'LogModule::SysLog::Charset'} = 'utf-8';
  27
  28      # param for LogModule Kernel::System::Log::File (required!)
  29 -    $Self->{'LogModule::LogFile'} = '/tmp/otrs.log';
  30 +    $Self->{'LogModule::LogFile'} = '/var/log/otrs.log';
  31
  32      # param if the date (yyyy-mm) should be added as suffix to
  33      # logfile [0|1]
  34 @@ -824,7 +824,7 @@
  35      # directories                                         #
  36      # --------------------------------------------------- #
  37      # root directory
  38 -    $Self->{Home} = '/opt/otrs';
  39 +    $Self->{Home} = '/usr/share/otrs';
  40
  41      # tmp dir
  42      $Self->{TempDir} = '<OTRS_CONFIG_Home>/var/tmp';
  43 @@ -965,7 +965,7 @@
  44      # --------------------------------------------------- #
  45      $Self->{PGP}          = 0;
  46      $Self->{'PGP::Bin'}     = '/usr/bin/gpg';
  47 -    $Self->{'PGP::Options'} = '--homedir /opt/otrs/.gnupg/ --batch --no-tty --yes';
  48 +    $Self->{'PGP::Options'} = '--homedir /usr/share/otrs/.gnupg/ --batch --no-tty --yes';
  49
  50  #    $Self->{'PGP::Options'} = '--batch --no-tty --yes';
  51  #    $Self->{'PGP::Key::Password'}->{'D2DF79FA'} = 1234;
  52 --- otrs-3.2.1/Kernel/Config/Files/Framework.xml        2013-01-03 10:12:36.000000000 +0100
  53 +++ otrs-3.2.1.new/Kernel/Config/Files/Framework.xml    2013-01-29 12:41:09.689962451 +0100
  54 @@ -493,7 +493,7 @@
  55          <Group>Framework</Group>
  56          <SubGroup>Core::Log</SubGroup>
  57          <Setting>
  58 -            <String Regex="">/tmp/otrs.log</String>
  59 +               <String Regex="">/usr/share/otrs.log</String>
  60          </Setting>
  61      </ConfigItem>
  62      <ConfigItem Name="LogModule::LogFile::Date" Required="1" Valid="1">
  63 @@ -2834,7 +2834,7 @@
  64          <Group>Framework</Group>
  65          <SubGroup>Crypt::PGP</SubGroup>
  66          <Setting>
  67 -            <String Regex="">--homedir /opt/otrs/.gnupg/ --batch --no-tty --yes</String>
  68 +               <String Regex="">--homedir /usr/share/otrs/.gnupg/ --batch --no-tty --yes</String>
  69          </Setting>
  70      </ConfigItem>
  71      <ConfigItem Name="PGP::Key::Password" Required="1" Valid="1">
  72 --- otrs-3.2.1/Kernel/Config.pm.dist    2012-11-22 12:43:05.000000000 +0100
  73 +++ otrs-3.2.1.new/Kernel/Config.pm.dist        2013-01-29 12:41:32.054324327 +0100
  74 @@ -63,7 +63,7 @@
  75      # ---------------------------------------------------- #
  76      # fs root directory
  77      # ---------------------------------------------------- #
  78 -    $Self->{Home} = '/opt/otrs';
  79 +    $Self->{Home} = '/usr/share/otrs';
  80
  81      # ---------------------------------------------------- #
  82      # insert your own config settings "here"               #
  83 --- otrs-3.2.1/scripts/apache2-httpd.include.conf       2013-01-17 10:06:55.000000000 +0100
  84 +++ otrs-3.2.1.new/scripts/apache2-httpd.include.conf   2013-01-29 12:42:41.307509300 +0100
  85 @@ -3,8 +3,8 @@
  86  # $Id: apache2-httpd.include.conf,v 1.27 2013/01/04 13:03:06 mg Exp $
  87  # --
  88
  89 -ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/"
  90 -Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
  91 +ScriptAlias /otrs/ "/usr/share/otrs/bin/cgi-bin/"
  92 +Alias /otrs-web/ "/usr/share/otrs/var/httpd/htdocs/"
  93
  94  # activate this if you are using an Oracle database
  95  #SetEnv ORACLE_HOME /path/to/your/oracle/
  96 @@ -15,7 +15,7 @@
  97  <IfModule mod_perl.c>
  98
  99      # Setup environment and preload modules
 100 -    Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
 101 +    Perlrequire /usr/share/otrs/scripts/apache2-perl-startup.pl
 102
 103      # Reload Perl modules when changed on disk
 104      PerlModule Apache2::Reload
 105 @@ -41,7 +41,7 @@
 106
 107  </IfModule>
 108
 109 -<Directory "/opt/otrs/bin/cgi-bin/">
 110 +<Directory "/usr/share/otrs/bin/cgi-bin/">
 111      AllowOverride None
 112      Options +ExecCGI -Includes
 113      Order allow,deny
 114 @@ -52,7 +52,7 @@
 115      </IfModule>
 116  </Directory>
 117
 118 -<Directory "/opt/otrs/var/httpd/htdocs/">
 119 +<Directory "/usr/share/otrs/var/httpd/htdocs/">
 120      AllowOverride None
 121      Order allow,deny
 122      Allow from all
 123 @@ -63,13 +63,13 @@
 124  </Directory>
 125
 126  <IfModule mod_headers.c>
 127 -    <Directory "/opt/otrs/var/httpd/htdocs/skins/*/*/css-cache">
 128 +    <Directory "/usr/share/otrs/var/httpd/htdocs/skins/*/*/css-cache">
 129          <FilesMatch "\.(css|CSS)$">
 130              Header set Cache-Control "max-age=2592000 must-revalidate"
 131          </FilesMatch>
 132      </Directory>
 133
 134 -    <Directory "/opt/otrs/var/httpd/htdocs/js/js-cache">
 135 +    <Directory "/usr/share/otrs/var/httpd/htdocs/js/js-cache">
 136          <FilesMatch "\.(js|JS)$">
 137              Header set Cache-Control "max-age=2592000 must-revalidate"
 138          </FilesMatch>
 139 --- otrs-3.2.1/scripts/apache2-perl-startup.pl  2013-01-24 11:21:14.000000000 +0100
 140 +++ otrs-3.2.1.new/scripts/apache2-perl-startup.pl      2013-01-29 12:43:07.268703262 +0100
 141 @@ -35,15 +35,15 @@
 142      # set $0 to index.pl because this is broken in mod_perl context;
 143      # apart from that, on Fedora, $0 is not a path which would break OTRS.
 144      # see bug # 8533
 145 -    $0 = '/opt/otrs/bin/cgi-bin/index.pl';
 146 +    $0 = '/usr/share/otrs/bin/cgi-bin/index.pl';
 147  }
 148
 149  use Apache2::RequestRec;
 150  use ModPerl::Util;
 151
 152 -use lib "/opt/otrs/";
 153 -use lib "/opt/otrs/Kernel/cpan-lib";
 154 -use lib "/opt/otrs/Custom";
 155 +use lib "/usr/share/otrs/";
 156 +use lib "/usr/share/otrs/Kernel/cpan-lib";
 157 +use lib "/usr/share/otrs/Custom";
 158
 159  # Preload frequently used modules to speed up client spawning.
 160  use CGI ();
 161 --- otrs-3.2.1/scripts/redhat-rcotrs-config     2012-10-11 09:11:09.000000000 +0200
 162 +++ otrs-3.2.1.new/scripts/redhat-rcotrs-config 2013-01-29 12:43:27.239621730 +0100
 163 @@ -12,7 +12,7 @@
 164  #
 165  # OTRS home (root) directory
 166  #
 167 -OTRS_ROOT=/opt/otrs
 168 +OTRS_ROOT=/usr/share/otrs
 169
 170  # if one of this is false, it will not be checked at the startup!
 171  # Note: (may be the database isn't on the same host! --> DB_RUNNING=0)