Merge pull request #606 from atnaguzin/patch-1

Updates in debian part.

debian/changelog

@@ -1,3 +1,16 @@
+i2pd (2.9.0-1) unstable; urgency=low
+
+  ** Changed
+  * Proxy refactoring & speedup
+  * Transmission-I2P support
+  * Graceful shutdown for Windows
+  * Android without QT
+  * Reduced number of timers in SSU
+  * ipv6 peer test support
+  * Reseed from SU3 file
+
+ -- orignal <orignal@i2pmail.org>  Fri, 12 Aug 2016 14:25:40 +0000
+
 i2pd (2.7.0-1) unstable; urgency=low
 
   * updated to version 2.7.0/0.9.25

debian/i2pd.default

@@ -3,10 +3,6 @@
 # installed at /etc/default/i2pd by the maintainer scripts
 I2PD_ENABLED="yes"
 
-# port to listen for incoming connections
-# uncomment following line if you want to specify it here
-# I2PD_PORT="4567"
-
 # Additional options that are passed to the Daemon.
 # see possible switches in /usr/share/doc/i2pd/configuration.md.gz
 DAEMON_OPTS=""

debian/i2pd.init

@@ -41,10 +41,6 @@ do_start()
     return 2
   fi
 
-  if [ -n "$I2PD_PORT" ]; then
-    DAEMON_OPTS="--port $I2PD_PORT $DAEMON_OPTS"
-  fi
-
   touch "$PIDFILE"
   chown -f $USER:adm "$PIDFILE"
 
@@ -103,7 +99,7 @@ case "$1" in
   status)
        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
        ;;
-  reload|force-reload)
+  reload)
       log_daemon_msg "Reloading $DESC" "$NAME"
       do_reload
       log_end_msg $?
@@ -127,7 +123,7 @@ case "$1" in
   esac
   ;;
   *)
-    echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
+    echo "Usage: $0 {start|stop|status|restart|reload}" >&2
     exit 3
   ;;
 esac

debian/i2pd.install

@@ -1,5 +1,5 @@
 i2pd usr/sbin/
 docs/i2pd.conf      etc/i2pd/
-debian/tunnels.conf etc/i2pd/
-debian/subscriptions.txt etc/i2pd/
+docs/tunnels.conf etc/i2pd/
+docs/subscriptions.txt etc/i2pd/
 contrib/certificates/ usr/share/i2pd/

debian/i2pd.upstart

@@ -4,8 +4,6 @@ start on runlevel [2345]
 stop on runlevel [016] or unmounting-filesystem
 
 # these can be overridden in /etc/init/i2pd.override
-env I2PD_HOST="1.2.3.4"
-env I2PD_PORT="4567"
 env LOGFILE="/var/log/i2pd.log"
 
-exec /usr/sbin/i2pd --daemon --log=file --logfile=$LOGFILE --service --host=$I2PD_HOST --port=$I2PD_PORT
+exec /usr/sbin/i2pd --daemon --service --log=file --logfile=$LOGFILE

debian/logrotate

@@ -1,13 +1,9 @@
 /var/log/i2pd.log {
-	rotate 4
-	weekly
+        rotate 6
+        daily
         missingok
         notifempty
         compress
         delaycompress
         copytruncate
-	create 640 i2pd adm
-	postrotate
-		/etc/init.d/i2pd restart >/dev/null
-	endscript
 }