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
  • 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  
    5555#RUN_AS_USER=
    5656
    5757# Wrapper
    58 WRAPPER_CMD="$I2P/i2psvc"
    59 WRAPPER_CONF="$I2P/wrapper.config"
     58WRAPPER_CMD="/usr/sbin/wrapper"
     59WRAPPER_CONF="/etc/i2p/wrapper.config"
    6060
    6161# Priority at which to run the wrapper.  See "man nice" for valid priorities.
    6262#  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
     
    5344# classes, or all the classes of i2p.jar, are in a different directory).
    5445# Be sure there are no other duplicate classes.
    5546#
    56 wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
     47wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
     48wrapper.java.classpath.2=/usr/share/java/wrapper.jar
    5749#  uncomment this to use the system classpath as well (e.g. to get tools.jar)
    58 # wrapper.java.classpath.2=%CLASSPATH%
     50# wrapper.java.classpath.3=%CLASSPATH%
    5951
    60 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
    61 wrapper.java.library.path.1=$INSTALL_PATH
    62 wrapper.java.library.path.2=$INSTALL_PATH/lib
     52# Java Library Path (location of libjbigi/libjcpuid)
     53wrapper.java.library.path.1=/usr/lib/jni
     54wrapper.java.library.path.2=/usr/share/java/lib
    6355
    6456# Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
    6557wrapper.java.additional.auto_bits=TRUE
     
    6961wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    7062wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    7163wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    72 wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
     64wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p
    7365wrapper.java.additional.4.stripquotes=TRUE
    7466
    7567# On some IPv6 enabled systems, I2P and other network-enabled java applications
     
    137129# NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
    138130# Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
    139131# System temp directory:
    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
     132#wrapper.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,
     
    211199# Linux/Mac users, do not set here, see settings in the i2prouter script.
    212200# Directory must exist or the wrapper will fail to start.
    213201# System temp directory:
    214 #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
    215 # PORTABLE installation:
    216 # Use the following instead.
    217 #wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
    218 # pid file for the service monitoring the JVM
     202#wrapper.java.pidfile=/tmp/routerjvm.pid
    219203#
    220204# From i2prouter:
    221205#
     
    229213# Linux/Mac users, do not set here, see settings in the i2prouter script.
    230214# Directory must exist or the wrapper will fail to start.
    231215# System temp directory:
    232 #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
    233 # PORTABLE installation:
    234 # Use the following instead.
    235 #wrapper.pidfile=$INSTALL_PATH/i2p.pid
     216#wrapper.pidfile=/tmp/i2p.pid
    236217
    237218#********************************************************************
    238219# Wrapper General Properties
     
    249230wrapper.umask=0022
    250231wrapper.java.umask=0022
    251232wrapper.logfile.umask=077
    252 
    253 #********************************************************************
    254 # Wrapper NT Service Properties
    255 #********************************************************************
    256 # WARNING - Do not modify any of these properties when an application
    257 #  using this configuration file has been installed as a service.
    258 #  Please uninstall the service before modifying this section.  The
    259 #  service can then be reinstalled.
    260 
    261 # Name of the service
    262 wrapper.ntservice.name=i2p
    263 
    264 # Display name of the service
    265 wrapper.ntservice.displayname=I2P Service
    266 
    267 # Description of the service
    268 wrapper.ntservice.description=The I2P router service
    269 
    270 # Service dependencies.  Add dependencies as needed starting from 1
    271 wrapper.ntservice.dependency.1=
    272 
    273 # Mode in which the service is installed.  AUTO_START or DEMAND_START
    274 wrapper.ntservice.starttype=AUTO_START
    275 
    276 # Allow the service to interact with the desktop.
    277 wrapper.ntservice.interactive=false
    278 
Note: See TracBrowser for help on using the repository browser.