Make Debian scripts respect configure

New configure parameters: --with-debian-stable --with-debian-unstable Fixed debian install scripts trashing the eprints user (blocking upgrades). Use --prefix, --with-user and --with-group to set debian locations.
eprints · Apr 17, 2013 · 42cbf4f · 42cbf4f
1 parent 76718e7
commit 42cbf4f
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 30 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -33,6 +33,7 @@ clean-local:
 
 distclean-local:
 	-rm -f eprints.spec perl_lib/EPrints/SystemSettings.pm bin/epindexer
+	-rm -f debian/changelog debian/ debian/postinst debian/postrm debian/preinst debian/prerm
 
 realclean: distclean
 	-rm -f configure Makefile.in aclocal.m4 install-sh missing

diff --git a/configure.in b/configure.in
@@ -179,6 +179,13 @@ AC_SUBST(PLATFORM)
 AC_SUBST(DEBIAN_DATE)
 AC_SUBST(DEBIAN_TYPE)
 
+
+
 AC_CONFIG_FILES([debian/rules], [chmod +x debian/rules])
+AC_CONFIG_FILES([debian/postinst], [chmod +x debian/postinst])
+AC_CONFIG_FILES([debian/postrm], [chmod +x debian/postrm])
+AC_CONFIG_FILES([debian/preinst], [chmod +x debian/preinst])
+AC_CONFIG_FILES([debian/prerm], [chmod +x debian/prerm])
 AC_CONFIG_FILES([bin/epindexer], [chmod +x bin/epindexer])
+
 AC_OUTPUT(Makefile perl_lib/EPrints/SystemSettings.pm install.pl eprints.spec debian/changelog)
diff --git a/debian/postinst → debian/postinst.in b/debian/postinst → debian/postinst.in
@@ -20,18 +20,18 @@ set -e
 
 case "$1" in
     configure)
-	adduser --system --home /usr/share/eprints3 --shell /bin/bash --group eprints > /dev/null
-	adduser www-data eprints > /dev/null
-	rm -f /etc/apache2/sites-available/eprints3
-	rm -f /etc/apache2/sites-enabled/eprints3
-	`echo "Include /usr/share/eprints3/cfg/apache.conf" > /etc/apache2/sites-available/eprints3`
-	`ln -fs /usr/share/eprints3/bin/epindexer /etc/init.d/epindexer`
-	`update-rc.d epindexer defaults 99 99 > /dev/null`
-	`chown eprints:www-data /usr/share/eprints3/ > /dev/null`
-	`chown eprints:www-data /usr/share/eprints3/* -R > /dev/null`
-	`chmod g+w /usr/share/eprints3/lib > /dev/null`
-	`chmod g+w /usr/share/eprints3/lib/* -R > /dev/null`
-	`chmod g+w /usr/share/eprints3/var > /dev/null`
+	# Why is this adding a user here (in config?)
+	#adduser --system --home @PREFIX@ --shell /bin/bash --group @INSTALL_GROUP@ > /dev/null
+	#adduser www-data @INSTALL_USER@ > /dev/null
+	# Why disable the site in configure?!
+	#rm -f /etc/apache2/sites-available/@PACKAGE@
+	#rm -f /etc/apache2/sites-enabled/@PACKAGE@
+	echo "Include @PREFIX@/cfg/apache.conf" > /etc/apache2/sites-available/@PACKAGE@
+	ln -fs @PREFIX@/bin/epindexer /etc/init.d/epindexer
+	update-rc.d epindexer defaults 99 99 > /dev/null
+	chown @INSTALL_USER@:www-data @PREFIX@ -R > /dev/null
+	chmod g+w @PREFIX@/lib -R > /dev/null
+	chmod g+w @PREFIX@/var > /dev/null
 	echo "###################################################################";
 	echo "##                                                               ##";
 	echo "##                    Welcome to EPrints 3                       ##";

diff --git a/debian/postrm → debian/postrm.in b/debian/postrm → debian/postrm.in
@@ -18,21 +18,35 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+reload_apache()
+{
+	if apache2ctl configtest 2>/dev/null; then
+		invoke-rc.d apache2 $1 || true
+	else
+		echo "Your apache2 configuration is broken, so we're not restarting it for you."
+	fi
+}
 
 case "$1" in
-    purge|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
-	rm -f /etc/apache2/sites-enabled/eprints3
+    purge|remove|abort-install|disappear)
+	rm -f /etc/apache2/sites-enabled/@PACKAGE@
+	rm -f /etc/apache2/sites-available/@PACKAGE@
 	update-rc.d -f epindexer remove
 	rm -f /etc/init.d/epindexer
-	deluser eprints
-	if [ `grep "eprints" /etc/group` ]; then
-		delgroup eprints
+	if getent passwd @INSTALL_USER@ >/dev/null; then
+		deluser @INSTALL_USER@
+	fi
+	if getent group @INSTALL_GROUP@ >/dev/null; then
+		delgroup @INSTALL_GROUP@
 	fi
-	apache2ctl restart
+	reload_apache restart
     ;;
 
+	abort-upgrade|failed-upgrade)
+	;;
+
     upgrade)
-	apache2ctl restart
+	reload_apache restart
 	echo "###################################################################";
 	echo "##                                                               ##";
 	echo "##                 EPrints 3 Upgrade Complete                    ##";

diff --git a/debian/preinst → debian/preinst.in b/debian/preinst → debian/preinst.in
@@ -15,14 +15,15 @@ set -e
 
 
 case "$1" in
-    install|upgrade)
-#    export EP3_INSTALL=`grep eprints: /etc/passwd`;
-#    if [ "$EP3_INSTALL" == "" ]
-#    then
-    	adduser --system --home /usr/share/eprints3 --shell /bin/bash --group eprints > /dev/null
-	adduser www-data eprints > /dev/null
-	adduser eprints www-data > /dev/null
-#    fi
+	install|upgrade)
+	if ! getent passwd @INSTALL_USER@ >/dev/null; then
+		adduser --system --home @PREFIX@ --shell /bin/bash --group @INSTALL_GROUP@ > /dev/null
+	fi
+	if ! getent group @INSTALL_GROUP@ >/dev/null; then
+		addgroup @INSTALL_GROUP@
+	fi
+	adduser www-data @INSTALL_GROUP@ > /dev/null
+	adduser @INSTALL_USER@ www-data > /dev/null
     ;;
 
     abort-upgrade)

diff --git a/debian/prerm → debian/prerm.in b/debian/prerm → debian/prerm.in
diff --git a/install.pl.in b/install.pl.in
@@ -60,7 +60,7 @@ unless( $gid )
 	warn("Warning! Group $INSTALL_GROUP doesn't exist. You probably need to do: groupadd $INSTALL_GROUP\n");
 }
 
-unless( $< == 0 or (defined $uid and $uid == $<) )
+unless( $opts{dist} or $< == 0 or (defined $uid and $uid == $<) )
 {
 	warn("Warning! It looks like you're trying to install as user $INSTALL_USER without root. You probably need to do: sudo $0\n");
 }
@@ -269,8 +269,11 @@ sub ensure_dir
 	my( $dir, $uid, $gid, $mode ) = @_;
 
 	File::Path::make_path($dir, {
-		user => $uid,
-		group => $gid,
+		# we're not installing into the dist
+		($opts{dist} ? () : (
+			user => $uid,
+			group => $gid,
+		)),
 		mode => $mode,
 	});