Changeset 035829f3 for debian


Ignore:
Timestamp:
Aug 27, 2011 11:28:07 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
5b114182
Parents:
115f3e1
Message:

reworking because of additions to wrapper.config

File:
1 edited

Legend:

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

    r115f3e1 r035829f3  
    6161--- a/installer/resources/wrapper.config
    6262+++ b/installer/resources/wrapper.config
    63 @@ -7,22 +7,16 @@
     63@@ -8,22 +8,13 @@
    6464 # click "Shutdown", wait 11 minutes, then start i2p.
    6565 #
     
    6969-# icon on Windows or the i2prouter script on Linux to run the wrapper.
    7070+# if you start I2P with the i2prouter-nowrapper script in Linux.
    71 +# Use i2prouter or the initscript run the wrapper.
     71+# Use i2prouter or the initscript to run the wrapper.
    7272 #
    7373 # NOTE - Directory organization:
     
    7777-# To set up a single-directory "portable" installation suitable for
    7878-# a USB stick, make several changes specified below (search for PORTABLE).
    79  #
     79-#
    8080-# NOTE - The izpack installer performs variable subsitiution on this
    8181-# file upon installation. If you did not use izpack, you must
     
    8383-# (dollar)SYSTEM_java_io_tmpdir with appropriate values
    8484-# (perhaps . and /var/tmp, respectively)
    85 +# Unless changed by an admin, the daemon user "i2psvc" has its home directory
    86 +# at /var/lib/i2p.
    8785 #
    8886 #********************************************************************
    8987 # Java Application
    90 @@ -45,20 +39,21 @@
     88@@ -51,13 +42,14 @@
    9189 # classes, or all the classes of i2p.jar, are in a different directory).
    9290 # Be sure there are no other duplicate classes.
     
    106104+wrapper.java.library.path.2=/usr/share/java/lib
    107105 
    108  # Java Additional Parameters
    109  # Numbers must be consecutive (except for stripquotes)
     106 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
     107 wrapper.java.additional.auto_bits=TRUE
     108@@ -67,7 +59,7 @@
    110109 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    111110 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    112111 wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    113112-wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
    114 +wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
     113+wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p
    115114 wrapper.java.additional.4.stripquotes=TRUE
    116115 
    117116 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    118 @@ -126,11 +121,7 @@
     117@@ -137,11 +129,7 @@
    119118 # tell the router where to find the wrapper log
    120119 # (change X to the next available number)
     
    129128 # Format of output for the log file.
    130129 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    131 @@ -192,10 +183,7 @@
     130@@ -203,10 +191,7 @@
    132131 # you should copy this file, change the location or file name,
    133132 # and edit the i2prouter script to change the WRAPPER_CONF setting
     
    141140 #
    142141 # From i2prouter:
    143 @@ -206,34 +194,4 @@
     142@@ -217,10 +202,7 @@
    144143 #
    145144 # This means i2prouter looks for './i2p.pid'.
     
    149148-# Use the following instead.
    150149-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
     150+wrapper.pidfile=/tmp/i2p.pid
     151 
     152 #********************************************************************
     153 # Wrapper General Properties
     154@@ -230,30 +212,3 @@
     155 
     156 # Title to use when running as a console
     157 wrapper.console.title=I2P Service
    151158-
    152159-#********************************************************************
     
    176183-wrapper.ntservice.interactive=false
    177184-
    178 +wrapper.pidfile=/tmp/i2p.pid
Note: See TracChangeset for help on using the changeset viewer.