echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh patch due to wrapper.config changes

Browse Source
This commit is contained in:
kytv
2012-01-14 21:29:00 +00:00
parent 7df881442a
commit 9e068b3926
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/0001-path-substitution.patch vendored
View File

@ -34,7 +34,7 @@ Debian wrapper.config to try to prevent confusion.
# PORTABLE installation: # PORTABLE installation:
# Use the following instead. # Use the following instead.
#I2PTEMP="%INSTALL_PATH" #I2PTEMP="%INSTALL_PATH"
@@ -49,8 +49,8 @@ @@ -53,8 +53,8 @@
#RUN_AS_USER= #RUN_AS_USER=
# Wrapper # Wrapper
@ -105,7 +105,7 @@ Debian wrapper.config to try to prevent confusion.
# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
wrapper.java.additional.auto_bits=TRUE wrapper.java.additional.auto_bits=TRUE
@@ -71,7 +63,7 @@ @@ -69,7 +61,7 @@
wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
@ -114,10 +114,12 @@ Debian wrapper.config to try to prevent confusion.
wrapper.java.additional.4.stripquotes=TRUE wrapper.java.additional.4.stripquotes=TRUE
# On some IPv6 enabled systems, I2P and other network-enabled java applications # On some IPv6 enabled systems, I2P and other network-enabled java applications
@@ -141,11 +133,7 @@ @@ -133,13 +125,7 @@
# tell the router where to find the wrapper log wrapper.console.loglevel=INFO
# (change X to the next available number)
# wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log # Log file to use for wrapper output logging.
-# You may wish to change this on linux so the log is
-# preserved across OS restarts.
-wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log -wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
-# PORTABLE installation: -# PORTABLE installation:
-# Use the following instead. I2P will find the logfile here, -# Use the following instead. I2P will find the logfile here,
@ -127,7 +129,7 @@ Debian wrapper.config to try to prevent confusion.
# Format of output for the log file. # Format of output for the log file.
# The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
@@ -211,10 +199,7 @@ @@ -205,10 +191,7 @@
# you should copy this file, change the location or file name, # you should copy this file, change the location or file name,
# and edit the i2prouter script to change the WRAPPER_CONF setting # and edit the i2prouter script to change the WRAPPER_CONF setting
# to point to the new wrapper.config location. # to point to the new wrapper.config location.
@ -139,7 +141,7 @@ Debian wrapper.config to try to prevent confusion.
# pid file for the service monitoring the JVM # pid file for the service monitoring the JVM
# #
# From i2prouter: # From i2prouter:
@@ -225,10 +210,7 @@ @@ -219,10 +202,7 @@
# #
# This means i2prouter looks for './i2p.pid'. # This means i2prouter looks for './i2p.pid'.
# See comments above for wrapper.java.pidfile # See comments above for wrapper.java.pidfile
@ -151,7 +153,7 @@ Debian wrapper.config to try to prevent confusion.
#******************************************************************** #********************************************************************
# Wrapper General Properties # Wrapper General Properties
@@ -245,30 +227,3 @@ @@ -239,30 +219,3 @@
wrapper.umask=0022 wrapper.umask=0022
wrapper.java.umask=0022 wrapper.java.umask=0022
wrapper.logfile.umask=077 wrapper.logfile.umask=077