Refresh patch due to wrapper.config additions

This commit is contained in:
kytv
2012-01-08 23:26:39 +00:00
parent 0f62383aec
commit 5fd6698d05

View File

@ -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
@@ -69,7 +61,7 @@ @@ -71,7 +63,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,7 +114,7 @@ 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
@@ -139,11 +131,7 @@ @@ -141,11 +133,7 @@
# tell the router where to find the wrapper log # tell the router where to find the wrapper log
# (change X to the next available number) # (change X to the next available number)
# wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log # wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log
@ -127,7 +127,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,
@@ -205,10 +193,7 @@ @@ -211,10 +199,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 +139,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:
@@ -219,10 +204,7 @@ @@ -225,10 +210,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 +151,7 @@ Debian wrapper.config to try to prevent confusion.
#******************************************************************** #********************************************************************
# Wrapper General Properties # Wrapper General Properties
@@ -239,30 +221,3 @@ @@ -245,30 +227,3 @@
wrapper.umask=0022 wrapper.umask=0022
wrapper.java.umask=0022 wrapper.java.umask=0022
wrapper.logfile.umask=077 wrapper.logfile.umask=077