Changeset 317aade


Ignore:
Timestamp:
Feb 4, 2012 8:45:43 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
0932f77
Parents:
d93805e
Message:

patch refresh needed because of changes to wrapper.config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    rd93805e r317aade  
    2424--- a/installer/resources/i2prouter
    2525+++ b/installer/resources/i2prouter
    26 @@ -28,8 +28,8 @@
    27  # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
    28  # should have been replaced by the izpack installer.
    29  # If you did not run the installer, replace them with the appropriate path.
    30 -I2P="%INSTALL_PATH"
    31 -I2PTEMP="%SYSTEM_java_io_tmpdir"
    32 +I2P="/usr/share/i2p"
    33 +I2PTEMP="/tmp"
    34  # PORTABLE installation:
    35  # Use the following instead.
    36  #I2PTEMP="%INSTALL_PATH"
    37 @@ -53,8 +53,8 @@
     26@@ -55,8 +55,8 @@
    3827 #RUN_AS_USER=
    3928 
     
    115104 
    116105 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    117 @@ -133,13 +125,7 @@
    118  wrapper.console.loglevel=INFO
    119  
    120  # Log file to use for wrapper output logging.
    121 -# You may wish to change this on linux so the log is
    122 -# preserved across OS restarts.
     106@@ -137,11 +129,7 @@
     107 # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
     108 # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
     109 # System temp directory:
    123110-wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
    124111-# PORTABLE installation:
     
    126113-# no need for a wrapper.java.additional line too.
    127114-#wrapper.logfile=$INSTALL_PATH/wrapper.log
    128 +wrapper.logfile=/tmp/wrapper.log
     115+#wrapper.logfile=/tmp/wrapper.log
    129116 
    130117 # Format of output for the log file.
    131118 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    132 @@ -205,10 +191,7 @@
    133  # you should copy this file, change the location or file name,
    134  # and edit the i2prouter script to change the WRAPPER_CONF setting
    135  # to point to the new wrapper.config location.
    136 -wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
     119@@ -211,11 +199,7 @@
     120 # Linux/Mac users, do not set here, see settings in the i2prouter script.
     121 # Directory must exist or the wrapper will fail to start.
     122 # System temp directory:
     123-#wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
    137124-# PORTABLE installation:
    138125-# Use the following instead.
    139126-#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
    140 +wrapper.java.pidfile=/tmp/routerjvm.pid
    141  # pid file for the service monitoring the JVM
     127-# pid file for the service monitoring the JVM
     128+#wrapper.java.pidfile=/tmp/routerjvm.pid
    142129 #
    143130 # From i2prouter:
    144 @@ -219,10 +202,7 @@
    145131 #
    146  # This means i2prouter looks for './i2p.pid'.
    147  # See comments above for wrapper.java.pidfile
    148 -wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
     132@@ -229,10 +213,7 @@
     133 # Linux/Mac users, do not set here, see settings in the i2prouter script.
     134 # Directory must exist or the wrapper will fail to start.
     135 # System temp directory:
     136-#wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
    149137-# PORTABLE installation:
    150138-# Use the following instead.
    151139-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
    152 +wrapper.pidfile=/tmp/i2p.pid
     140+#wrapper.pidfile=/tmp/i2p.pid
    153141 
    154142 #********************************************************************
    155143 # Wrapper General Properties
    156 @@ -239,30 +219,3 @@
     144@@ -249,30 +230,3 @@
    157145 wrapper.umask=0022
    158146 wrapper.java.umask=0022
Note: See TracChangeset for help on using the changeset viewer.