Changeset 2a00272 for debian


Ignore:
Timestamp:
May 24, 2013 9:30:46 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
370d9dfe
Parents:
1bd4937
Message:

debian: read /etc/default/i2p in /usr/bin/i2prouter

This will allow overrides to be set without editing /usr/bin/i2prouter.

i2prouter may be replaced during upgrades. /etc/default/i2p will only be
changed by debconf (e.g. "dpkg-reconfigure i2p").

Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/changelog

    r1bd4937 r2a00272  
    22
    33  * New upstream release
     4  * i2prouter: allow overrides to be set in /etc/default/i2p
    45
    56 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000
  • debian/patches/0001-path-substitution.patch

    r1bd4937 r2a00272  
    3333 # This software is the proprietary information of Tanuki Software.
    3434 # You shall use it only in accordance with the terms of the
    35 @@ -24,16 +24,9 @@
     35@@ -24,16 +24,12 @@
    3636 # These settings can be modified to fit the needs of your application
    3737 # Optimized for use with version 3.5.17 of the Wrapper.
     
    4747-# Use the following instead.
    4848-#I2PTEMP="%INSTALL_PATH"
     49+# Read config file if found
     50+[ -f /etc/default/i2p ] && . /etc/default/i2p
     51+
    4952+I2P="/usr/share/i2p"
    5053+I2P_CONFIG_DIR="$HOME/.i2p"
     
    5356 # Application
    5457 APP_NAME="i2p"
    55 @@ -61,8 +54,8 @@
     58@@ -61,8 +57,8 @@
    5659 #RUN_AS_USER=
    5760 
     
    6467 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    6568 #  nice is only used if a priority is specified.
    66 @@ -167,48 +160,6 @@
     69@@ -167,48 +163,6 @@
    6770 # Workaround for Gentoo
    6871 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     
    113116 then
    114117     COMMAND="$FIXED_COMMAND"
    115 @@ -920,9 +871,6 @@
     118@@ -920,9 +874,6 @@
    116119         # The string passed to eval must handles spaces in paths correctly.
    117120         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
     
    123126         eval echo `gettext '$APP_LONG_NAME is already running.'`
    124127         exit 1
    125 @@ -1046,9 +994,6 @@
     128@@ -1046,9 +997,6 @@
    126129         # The string passed to eval must handles spaces in paths correctly.
    127130         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
     
    133136         eval echo `gettext '$APP_LONG_NAME is already running.'`
    134137         exit 1
    135 @@ -1858,24 +1803,9 @@
     138@@ -1785,7 +1733,7 @@
     139 }
     140 
     141 showsetusermesg()  {
     142-    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
     143+    echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`."
     144 }
     145 
     146 checkifstartingasroot() {
     147@@ -1793,7 +1741,7 @@
     148         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
     149         showsetusermesg
     150         echo
     151-        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
     152+        echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`"
     153         exit 1
     154     fi
     155 }
     156@@ -1858,24 +1806,9 @@
    136157             status
    137158             ;;
     
    299320-wrapper.ntservice.interactive=false
    300321-
     322--- a/installer/resources/locale/po/messages_de.po
     323+++ b/installer/resources/locale/po/messages_de.po
     324@@ -192,14 +192,14 @@
     325 msgstr "Falls gestartet, fordere einen Java Thread dump an"
     326 
     327 #: ../i2prouter:1788
     328-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     329-msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
     330+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     331+msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
     332 
     333 #: ../i2prouter:1793
     334 msgid "Running I2P as the root user is *not* recommended."
     335 msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
     336 
     337 #: ../i2prouter:1796
     338-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     339+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     340 msgstr ""
     341-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
     342+"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
     343--- a/installer/resources/locale/po/messages_en.po
     344+++ b/installer/resources/locale/po/messages_en.po
     345@@ -185,7 +185,7 @@
     346 msgstr ""
     347 
     348 #: ../i2prouter:1788
     349-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     350+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     351 msgstr ""
     352 
     353 #: ../i2prouter:1793
     354@@ -193,5 +193,5 @@
     355 msgstr ""
     356 
     357 #: ../i2prouter:1796
     358-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     359+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     360 msgstr ""
     361--- a/installer/resources/locale/po/messages_fr.po
     362+++ b/installer/resources/locale/po/messages_fr.po
     363@@ -187,7 +187,7 @@
     364 msgstr ""
     365 
     366 #: ../i2prouter:1780
     367-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     368+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     369 msgstr ""
     370 
     371 #: ../i2prouter:1785
     372@@ -196,5 +196,5 @@
     373 "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
     374 
     375 #: ../i2prouter:1788
     376-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     377+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     378 msgstr ""
     379--- a/installer/resources/locale/po/messages_it.po
     380+++ b/installer/resources/locale/po/messages_it.po
     381@@ -187,7 +187,7 @@
     382 msgstr ""
     383 
     384 #: ../i2prouter:1780
     385-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     386+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     387 msgstr ""
     388 
     389 #: ../i2prouter:1785
     390@@ -195,5 +195,5 @@
     391 msgstr ""
     392 
     393 #: ../i2prouter:1788
     394-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     395+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     396 msgstr ""
     397--- a/installer/resources/locale/po/messages_ru.po
     398+++ b/installer/resources/locale/po/messages_ru.po
     399@@ -188,7 +188,7 @@
     400 msgstr ""
     401 
     402 #: ../i2prouter:1780
     403-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     404+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     405 msgstr ""
     406 
     407 #: ../i2prouter:1785
     408@@ -196,5 +196,5 @@
     409 msgstr ""
     410 
     411 #: ../i2prouter:1788
     412-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     413+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     414 msgstr ""
     415--- a/installer/resources/locale/po/messages_sv.po
     416+++ b/installer/resources/locale/po/messages_sv.po
     417@@ -187,13 +187,13 @@
     418 msgstr "Fråga efter en Java thread dump vid drift."
     419 
     420 #: ../i2prouter:1780
     421-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     422-msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
     423+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     424+msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER"
     425 
     426 #: ../i2prouter:1785
     427 msgid "Running I2P as the root user is *not* recommended."
     428 msgstr "Att köra I2P som användare root är *inte* rekommenderat."
     429 
     430 #: ../i2prouter:1788
     431-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     432-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
     433+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     434+msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"
Note: See TracChangeset for help on using the changeset viewer.