source: debian/patches/0001-path-substitution.patch @ 667b6b69

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

refreshing patch due to wrapper.config changes

  • Property mode set to 100644
File size: 7.1 KB
  • installer/resources/eepget

    From: Kill Your TV <killyourtv@i2pmail.org>
    Date: Mon, 18 Apr 2011 16:43:40 +0000
    Subject: path substitution
    
    The purpose of this patch is the change the values handled by
    the Izpack based installer.
    
    Non-applicable sections (e.g., portable & windows) are also removed for the
    Debian wrapper.config to try to prevent confusion.
    ---
     installer/resources/eepget         |    2 +-
     installer/resources/i2prouter      |    8 ++++----
     installer/resources/runplain.sh    |    6 +++---
     installer/resources/wrapper.config |   17 ++++++++---------
     4 files changed, 16 insertions(+), 17 deletions(-)
    
    a b  
    11#!/bin/sh
    2 I2P="%INSTALL_PATH"
     2I2P="/usr/share/i2p"
    33java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
  • installer/resources/i2prouter

    a b  
    2828# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
    2929# should have been replaced by the izpack installer.
    3030# If you did not run the installer, replace them with the appropriate path.
    31 I2P="%INSTALL_PATH"
    32 I2PTEMP="%SYSTEM_java_io_tmpdir"
     31I2P="/usr/share/i2p"
     32I2PTEMP="/tmp"
    3333# PORTABLE installation:
    3434# Use the following instead.
    3535#I2PTEMP="%INSTALL_PATH"
     
    4949#RUN_AS_USER=
    5050
    5151# Wrapper
    52 WRAPPER_CMD="$I2P/i2psvc"
    53 WRAPPER_CONF="$I2P/wrapper.config"
     52WRAPPER_CMD="/usr/sbin/wrapper"
     53WRAPPER_CONF="/etc/i2p/wrapper.config"
    5454
    5555# Priority at which to run the wrapper.  See "man nice" for valid priorities.
    5656#  nice is only used if a priority is specified.
  • installer/resources/runplain.sh

    a b  
    1111# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
    1212# should have been replaced by the izpack installer.
    1313# If you did not run the installer, replace them with the appropriate path.
    14 I2P="%INSTALL_PATH"
    15 I2PTEMP="%SYSTEM_java_io_tmpdir"
     14I2P="/usr/share/i2p"
     15I2PTEMP="/tmp"
    1616
    1717# Having IPv6 enabled can cause problems with certain configurations. Changing the
    1818# next value to true may help.
  • installer/resources/wrapper.config

    a b  
    88# click "Shutdown", wait 11 minutes, then start i2p.
    99#
    1010# WARNING - The wrapper is NOT run (and this file is not used)
    11 # if you start I2P with the 'no window' icon on Windows, or
    12 # with the runplain.sh script on Linux. Use the 'restartable'
    13 # icon on Windows or the i2prouter script on Linux to run the wrapper.
     11# if you start I2P with the i2prouter-nowrapper script in Linux.
     12# Use i2prouter or the initscript to run the wrapper.
    1413#
    1514# NOTE - Directory organization:
    1615# The standard I2P Installation will set up a "split" directory structure
    1716# with code in the install directory, data and configuration files in the
    1817# user's home directory, and temporary files in the system temporary directory.
    19 # To set up a single-directory "portable" installation suitable for
    20 # a USB stick, make several changes specified below (search for PORTABLE).
    21 #
    22 # NOTE - The izpack installer performs variable subsitiution on this
    23 # file upon installation. If you did not use izpack, you must
    24 # find and replace all instances of (dollar)INSTALL_PATH and
    25 # (dollar)SYSTEM_java_io_tmpdir with appropriate values
    26 # (perhaps . and /var/tmp, respectively)
    2718#
    2819#********************************************************************
    2920# Java Application
     
    5142# classes, or all the classes of i2p.jar, are in a different directory).
    5243# Be sure there are no other duplicate classes.
    5344#
    54 wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
     45wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
     46wrapper.java.classpath.2=/usr/share/java/wrapper.jar
    5547#  uncomment this to use the system classpath as well (e.g. to get tools.jar)
    56 # wrapper.java.classpath.2=%CLASSPATH%
     48# wrapper.java.classpath.3=%CLASSPATH%
    5749
    58 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
    59 wrapper.java.library.path.1=$INSTALL_PATH
    60 wrapper.java.library.path.2=$INSTALL_PATH/lib
     50# Java Library Path (location of libjbigi/libjcpuid)
     51wrapper.java.library.path.1=/usr/lib/jni
     52wrapper.java.library.path.2=/usr/share/java/lib
    6153
    6254# Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
    6355wrapper.java.additional.auto_bits=TRUE
     
    6759wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    6860wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    6961wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    70 wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
     62wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p
    7163wrapper.java.additional.4.stripquotes=TRUE
    7264
    7365# On some IPv6 enabled systems, I2P and other network-enabled java applications
     
    137129# tell the router where to find the wrapper log
    138130# (change X to the next available number)
    139131# wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log
    140 wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
    141 # PORTABLE installation:
    142 # Use the following instead. I2P will find the logfile here,
    143 # no need for a wrapper.java.additional line too.
    144 #wrapper.logfile=$INSTALL_PATH/wrapper.log
     132wrapper.logfile=/tmp/wrapper.log
    145133
    146134# Format of output for the log file.
    147135# The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
     
    203191# you should copy this file, change the location or file name,
    204192# and edit the i2prouter script to change the WRAPPER_CONF setting
    205193# to point to the new wrapper.config location.
    206 wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
    207 # PORTABLE installation:
    208 # Use the following instead.
    209 #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
     194wrapper.java.pidfile=/tmp/routerjvm.pid
    210195# pid file for the service monitoring the JVM
    211196#
    212197# From i2prouter:
     
    217202#
    218203# This means i2prouter looks for './i2p.pid'.
    219204# See comments above for wrapper.java.pidfile
    220 wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
    221 # PORTABLE installation:
    222 # Use the following instead.
    223 #wrapper.pidfile=$INSTALL_PATH/i2p.pid
     205wrapper.pidfile=/tmp/i2p.pid
    224206
    225207#********************************************************************
    226208# Wrapper General Properties
     
    237219wrapper.umask=0022
    238220wrapper.java.umask=0022
    239221wrapper.logfile.umask=077
    240 
    241 #********************************************************************
    242 # Wrapper NT Service Properties
    243 #********************************************************************
    244 # WARNING - Do not modify any of these properties when an application
    245 #  using this configuration file has been installed as a service.
    246 #  Please uninstall the service before modifying this section.  The
    247 #  service can then be reinstalled.
    248 
    249 # Name of the service
    250 wrapper.ntservice.name=i2p
    251 
    252 # Display name of the service
    253 wrapper.ntservice.displayname=I2P Service
    254 
    255 # Description of the service
    256 wrapper.ntservice.description=The I2P router service
    257 
    258 # Service dependencies.  Add dependencies as needed starting from 1
    259 wrapper.ntservice.dependency.1=
    260 
    261 # Mode in which the service is installed.  AUTO_START or DEMAND_START
    262 wrapper.ntservice.starttype=AUTO_START
    263 
    264 # Allow the service to interact with the desktop.
    265 wrapper.ntservice.interactive=false
    266 
Note: See TracBrowser for help on using the repository browser.