From 8aa158c1e0b61ee5156e61a01c1e0755ae8b80b5 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Wed, 20 Jan 2016 00:00:00 +0000
Subject: [PATCH] * update debian/

---
 debian/i2pd.conf    | 23 +++++++++++++----------
 debian/i2pd.init    |  2 +-
 debian/i2pd.upstart |  6 +++---
 debian/postinst     |  6 ++++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/i2pd.conf b/debian/i2pd.conf
index a6e9c23f..4a518916 100644
--- a/debian/i2pd.conf
+++ b/debian/i2pd.conf
@@ -1,16 +1,19 @@
-floodfill=0
-v6=0
+ipv6
 
-httpproxyaddress=127.0.0.1
-httpproxyport=4444
+[httpproxy]
+address = 127.0.0.1
+port    = 4444
 
 # other services (disabled by default)
 #
-# samaddress=127.0.0.1
-# samport=7656
+#[sam]
+#address = 127.0.0.1
+#port    = 7656
 #
-# bobaddress=127.0.0.1
-# bobport=2827
+#[bob]
+#address = 127.0.0.1
+#port    = 2827
 #
-# i2pcontroladdress=127.0.0.1
-# i2pcontrolport=7650
+#[i2pcontrol]
+#address = 127.0.0.1
+#port    = 7650
diff --git a/debian/i2pd.init b/debian/i2pd.init
index 609a3407..d87aa000 100644
--- a/debian/i2pd.init
+++ b/debian/i2pd.init
@@ -46,7 +46,7 @@ do_start()
   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" --test > /dev/null \
     || return 1
   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" -- \
-    --service=1 --daemon=1 --log=1 --conf=$I2PCONF --tunnelscfg=$TUNCONF \
+    --service --daemon --log --conf=$I2PCONF --tunconf=$TUNCONF \
     --port=$I2PD_PORT $DAEMON_OPTS > /dev/null 2>&1 \
     || return 2
   return $?
diff --git a/debian/i2pd.upstart b/debian/i2pd.upstart
index 0527935d..d1536ea3 100644
--- a/debian/i2pd.upstart
+++ b/debian/i2pd.upstart
@@ -4,7 +4,7 @@ start on runlevel [2345]
 stop on runlevel [016] or unmounting-filesystem
 
 # these can be overridden in /etc/init/i2pd.override
-env I2P_HOST="1.2.3.4"
-env I2P_PORT="4567"
+env I2PD_HOST="1.2.3.4"
+env I2PD_PORT="4567"
 
-exec /usr/sbin/i2pd --daemon=0 --log=1 --host=$I2P_HOST --port=$I2P_PORT
+exec /usr/sbin/i2pd --daemon --log --host=$I2PD_HOST --port=$I2PD_PORT
diff --git a/debian/postinst b/debian/postinst
index 4be6bf3f..1de58c1e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 
+LOGFILE='/var/log/i2pd.log'
 I2PDHOME='/var/lib/i2pd'
 I2PDUSER='i2pd'
 
@@ -16,8 +17,9 @@ case "$1" in
       adduser --system --quiet --group --home $I2PDHOME $I2PDUSER
     fi
 
-    touch /var/log/i2pd.log
-    chown -f ${I2PDUSER}:adm /var/log/i2pd.log
+    touch $LOGFILE
+    chmod 640 $LOGFILE
+    chown -f ${I2PDUSER}:adm $LOGFILE
     mkdir -p -m0750 $I2PDHOME
     chown -f -R -P ${I2PDUSER}:${I2PDUSER} ${I2PDHOME}
   ;;