X-Git-Url: https://git.toastfreeware.priv.at/debian/iodine.git/blobdiff_plain/2366f4154aa1183b442bd8fb76d32d907ef00aff..21f83151d87857fdf8a14266b502a0a1330d75c2:/debian/postinst

diff --git a/debian/postinst b/debian/postinst
index d04bbdb..61d5fdd 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,8 +3,8 @@
 #
 # see: dh_installdeb(1)
 
+CONFIGFILE=/etc/default/iodine
 set -e
-
 . /usr/share/debconf/confmodule
 
 # summary of how this script can be called:
@@ -22,25 +22,52 @@ set -e
 
 case "$1" in
     configure)
-    	# we need a tun device
-    	if [ ! -e /dev/net/tun ] ; then
-	    	echo "Creating device /dev/net/tun ..."
-	    	cd /dev && WRITE_ON_UDEV=false ./MAKEDEV tun
-	    fi
-      # generate /etc/default/iodine
-      db_get iodine/start_daemon
-      START_IODINED=$RET
-      db_get iodine/daemon_options
-      IODINED_ARGS=$RET
-      db_get iodine/daemon_password
-      IODINED_PASSWORD=$RET
-      cat <<EOF > /etc/default/iodine
+        # we need a tun device
+        if [ ! -c /dev/net/tun ] && [ -x /dev/MAKEDEV ] ; then
+            echo "Creating device /dev/net/tun ..."
+            cd /dev
+            ./MAKEDEV tun || true
+        fi 
+
+        # and we want a special user
+        adduser --quiet --system --home /var/run/iodine iodine
+
+        # generate/update /etc/default/iodine
+        if [ ! -e $CONFIGFILE ]; then
+            cat <<EOF >$CONFIGFILE
 # Default settings for iodine. This file is sourced from
 # /etc/init.d/iodined
-START_IODINED="$START_IODINED"
-IODINED_ARGS="$IODINED_ARGS"
-IODINED_PASSWORD="$IODINED_PASSWORD"
+START_IODINED=
+IODINED_ARGS=
+IODINED_PASSWORD=
 EOF
+        fi
+
+        db_get iodine/start_daemon
+        START_IODINED=$RET
+        db_get iodine/daemon_options
+        IODINED_ARGS=$RET
+        db_get iodine/daemon_password
+        IODINED_PASSWORD=$RET
+
+        cp -a -f $CONFIGFILE $CONFIGFILE.tmp
+
+        # If the admin deleted or commented some variables but then set
+        # them via debconf, (re-)add them to the conffile.
+        test -z "$START_IODINED" || grep -Eq '^ *START_IODINED=' $CONFIGFILE || \
+            echo "START_IODINED=" >> $CONFIGFILE
+        test -z "$IODINED_ARGS" || grep -Eq '^ *IODINED_ARGS=' $CONFIGFILE || \
+            echo "IODINED_ARGS=" >> $CONFIGFILE
+        test -z "$IODINED_PASSWORD" || grep -Eq '^ *IODINED_PASSWORD=' $CONFIGFILE || \
+            echo "IODINED_PASSWORD=" >> $CONFIGFILE
+
+        perl -p -e "s{^ *START_IODINED=.*}{START_IODINED=\"$START_IODINED\"}; \
+                    s{^ *IODINED_ARGS=.*}{IODINED_ARGS=\"$IODINED_ARGS\"}; \
+                    s{^ *IODINED_PASSWORD=.*}{IODINED_PASSWORD=\"$IODINED_PASSWORD\"};" \
+            < $CONFIGFILE > $CONFIGFILE.tmp
+
+        mv -f $CONFIGFILE.tmp $CONFIGFILE
+        [ ! -e $CONFIGFILE ] || chmod 600 $CONFIGFILE
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)