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