rapid-tunneling: no more rapid-tunneling "user"

* suders entry runs as root.
* use a sudoers.d file if possible (only thing in Debian).
* Version bumped to 1.12.


git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@10209 283159da-0705-0410-b60c-f2062b4bb6ad

5 files changed, 10 insertions, 76 deletions

diff --git a/debian/changelog b/debian/changelog
index 8b91cb1..be87be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rapid-tunneling (1.12) unstable; urgency=low
+
+  * rapid-tunneling-gui: No user created (just use root).
+  * rapid-tunneling-gui: Use a sudoers file.
+  * Use my @debian.org address.
+
+ -- Tzafrir Cohen <tzafrir@debian.org>  Mon, 19 Dec 2011 17:27:18 +0200
+
 rapid-tunneling (1.11) unstable; urgency=low
 
   * Include upstream ChangeLog.
diff --git a/debian/control b/debian/control
index 1e78cdd..e7d7964 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rapid-tunneling
 Section: net
 Priority: extra
 Maintainer: Alex Landau <alex.landau@xorcom.com>
-Uploaders: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
+Uploaders: Tzafrir Cohen <tzafrir@debian.org>
 Build-Depends: cdbs, debhelper (>= 7), asciidoc
 Standards-Version: 3.9.2
 Homepage: http://www.xorcom.com/
diff --git a/debian/rapid-tunneling-gui.install b/debian/rapid-tunneling-gui.install
index 9b09d37..81851ff 100644
--- a/debian/rapid-tunneling-gui.install
+++ b/debian/rapid-tunneling-gui.install
@@ -1,2 +1,3 @@
 usr/share/rapid-tunneling/www
 etc/rapid-tunneling/gui.htpasswd
+etc/sudoers.d/rapid-tunneling
diff --git a/debian/rapid-tunneling-gui.postinst b/debian/rapid-tunneling-gui.postinst
deleted file mode 100644
index a84148b..0000000
--- a/debian/rapid-tunneling-gui.postinst
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# postinst script for rapid-tunneling
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-SUDOERS=/etc/sudoers
-user="asterisk"
-TEXT="Defaults>$user !lecture
-$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling
-$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling-status"
-
-case "$1" in
-    configure)
-        # add a user with uid=gid=0
-	if ! getent passwd rapid-tunneling >/dev/null ; then
-	    useradd -d /var/lib/rapid-tunneling/home -m -u 0 -g 0 -o rapid-tunneling
-	fi
-	# FIXME: use sudoers.d
-	if ! fgrep -q "$TEXT" $SUDOERS; then echo "$TEXT" >> $SUDOERS; fi
-	# FIXME: reloading httpd
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/rapid-tunneling-gui.prerm b/debian/rapid-tunneling-gui.prerm
deleted file mode 100644
index 5730c27..0000000
--- a/debian/rapid-tunneling-gui.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SUDOERS=/etc/sudoers
-user="asterisk"
-TEXT="Defaults>$user !lecture
-$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling
-$user ALL=(rapid-tunneling) NOPASSWD:/usr/sbin/rapid-tunneling-status"
-
-case "$1" in
-    remove|upgrade|deconfigure)
-	fgrep -v "$TEXT"  $SUDOERS > ${SUDOERS}.tmp && cp ${SUDOERS}.tmp $SUDOERS && rm ${SUDOERS}.tmp
-	# TODO: reload httpd?
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-