source: debian/patches/0001-path-substitution.patch @ 317aade

Last change on this file since 317aade was 317aade, checked in by kytv <kytv@…>, 9 years ago

patch refresh needed because of changes to wrapper.config

  • Property mode set to 100644
File size: 6.8 KB
RevLine 
[b6fab82]1From: Kill Your TV <killyourtv@i2pmail.org>
2Date: Mon, 18 Apr 2011 16:43:40 +0000
[d2d2b1e]3Subject: path substitution
[b6fab82]4
[d2d2b1e]5The purpose of this patch is the change the values handled by
6the Izpack based installer.
7
8Non-applicable sections (e.g., portable & windows) are also removed for the
9Debian wrapper.config to try to prevent confusion.
[b6fab82]10---
11 installer/resources/eepget         |    2 +-
12 installer/resources/i2prouter      |    8 ++++----
13 installer/resources/runplain.sh    |    6 +++---
14 installer/resources/wrapper.config |   17 ++++++++---------
15 4 files changed, 16 insertions(+), 17 deletions(-)
16
17--- a/installer/resources/eepget
18+++ b/installer/resources/eepget
19@@ -1,3 +1,3 @@
20 #!/bin/sh
21-I2P="%INSTALL_PATH"
22+I2P="/usr/share/i2p"
23 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
24--- a/installer/resources/i2prouter
25+++ b/installer/resources/i2prouter
[317aade]26@@ -55,8 +55,8 @@
[8ddc34d]27 #RUN_AS_USER=
[b6fab82]28 
29 # Wrapper
30-WRAPPER_CMD="$I2P/i2psvc"
31-WRAPPER_CONF="$I2P/wrapper.config"
32+WRAPPER_CMD="/usr/sbin/wrapper"
33+WRAPPER_CONF="/etc/i2p/wrapper.config"
34 
[8ddc34d]35 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
36 #  nice is only used if a priority is specified.
[b6fab82]37--- a/installer/resources/runplain.sh
38+++ b/installer/resources/runplain.sh
[4dc9cfb4]39@@ -11,8 +11,8 @@
[b6fab82]40 # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
41 # should have been replaced by the izpack installer.
42 # If you did not run the installer, replace them with the appropriate path.
43-I2P="%INSTALL_PATH"
44-I2PTEMP="%SYSTEM_java_io_tmpdir"
45+I2P="/usr/share/i2p"
46+I2PTEMP="/tmp"
47 
[4dc9cfb4]48 # Having IPv6 enabled can cause problems with certain configurations. Changing the
49 # next value to true may help.
[b6fab82]50--- a/installer/resources/wrapper.config
51+++ b/installer/resources/wrapper.config
[035829f3]52@@ -8,22 +8,13 @@
[d2d2b1e]53 # click "Shutdown", wait 11 minutes, then start i2p.
54 #
55 # WARNING - The wrapper is NOT run (and this file is not used)
56-# if you start I2P with the 'no window' icon on Windows, or
57-# with the runplain.sh script on Linux. Use the 'restartable'
58-# icon on Windows or the i2prouter script on Linux to run the wrapper.
59+# if you start I2P with the i2prouter-nowrapper script in Linux.
[035829f3]60+# Use i2prouter or the initscript to run the wrapper.
[d2d2b1e]61 #
62 # NOTE - Directory organization:
63 # The standard I2P Installation will set up a "split" directory structure
64 # with code in the install directory, data and configuration files in the
65 # user's home directory, and temporary files in the system temporary directory.
66-# To set up a single-directory "portable" installation suitable for
67-# a USB stick, make several changes specified below (search for PORTABLE).
[035829f3]68-#
[d2d2b1e]69-# NOTE - The izpack installer performs variable subsitiution on this
70-# file upon installation. If you did not use izpack, you must
71-# find and replace all instances of (dollar)INSTALL_PATH and
72-# (dollar)SYSTEM_java_io_tmpdir with appropriate values
73-# (perhaps . and /var/tmp, respectively)
74 #
75 #********************************************************************
76 # Java Application
[9e6885d]77@@ -53,13 +44,14 @@
[b6fab82]78 # classes, or all the classes of i2p.jar, are in a different directory).
79 # Be sure there are no other duplicate classes.
80 #
81-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
82+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
[d2d2b1e]83+wrapper.java.classpath.2=/usr/share/java/wrapper.jar
[b6fab82]84 #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
85-# wrapper.java.classpath.2=%CLASSPATH%
[d2d2b1e]86+# wrapper.java.classpath.3=%CLASSPATH%
87 
88-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
[b6fab82]89-wrapper.java.library.path.1=$INSTALL_PATH
90-wrapper.java.library.path.2=$INSTALL_PATH/lib
[d2d2b1e]91+# Java Library Path (location of libjbigi/libjcpuid)
[b6fab82]92+wrapper.java.library.path.1=/usr/lib/jni
93+wrapper.java.library.path.2=/usr/share/java/lib
94 
[035829f3]95 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
96 wrapper.java.additional.auto_bits=TRUE
[9e068b3]97@@ -69,7 +61,7 @@
[b6fab82]98 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
99 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
100 wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
101-wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
[035829f3]102+wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p
[b6fab82]103 wrapper.java.additional.4.stripquotes=TRUE
[4dc9cfb4]104 
105 # On some IPv6 enabled systems, I2P and other network-enabled java applications
[317aade]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:
[b6fab82]110-wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
[d2d2b1e]111-# PORTABLE installation:
112-# Use the following instead. I2P will find the logfile here,
113-# no need for a wrapper.java.additional line too.
114-#wrapper.logfile=$INSTALL_PATH/wrapper.log
[317aade]115+#wrapper.logfile=/tmp/wrapper.log
[d2d2b1e]116 
117 # Format of output for the log file.
118 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
[317aade]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
[d2d2b1e]124-# PORTABLE installation:
125-# Use the following instead.
126-#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
[317aade]127-# pid file for the service monitoring the JVM
128+#wrapper.java.pidfile=/tmp/routerjvm.pid
[d2d2b1e]129 #
130 # From i2prouter:
[b6fab82]131 #
[317aade]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
[d2d2b1e]137-# PORTABLE installation:
138-# Use the following instead.
139-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
[317aade]140+#wrapper.pidfile=/tmp/i2p.pid
[035829f3]141 
142 #********************************************************************
143 # Wrapper General Properties
[317aade]144@@ -249,30 +230,3 @@
[667b6b69]145 wrapper.umask=0022
146 wrapper.java.umask=0022
147 wrapper.logfile.umask=077
[d2d2b1e]148-
149-#********************************************************************
150-# Wrapper NT Service Properties
151-#********************************************************************
152-# WARNING - Do not modify any of these properties when an application
153-#  using this configuration file has been installed as a service.
154-#  Please uninstall the service before modifying this section.  The
155-#  service can then be reinstalled.
156-
157-# Name of the service
158-wrapper.ntservice.name=i2p
159-
160-# Display name of the service
161-wrapper.ntservice.displayname=I2P Service
162-
163-# Description of the service
164-wrapper.ntservice.description=The I2P router service
165-
166-# Service dependencies.  Add dependencies as needed starting from 1
167-wrapper.ntservice.dependency.1=
168-
169-# Mode in which the service is installed.  AUTO_START or DEMAND_START
170-wrapper.ntservice.starttype=AUTO_START
171-
172-# Allow the service to interact with the desktop.
[c1c21e5]173-wrapper.ntservice.interactive=false
[d2d2b1e]174-
Note: See TracBrowser for help on using the repository browser.