webmin configurations are installed in src_install. Closes bug #75895.

4 files changed, 36 insertions, 28 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index a9ff265c24e7..dffd291479e6 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.67 2004/12/28 17:12:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.68 2004/12/31 22:14:12 eradicator Exp $
+
+*webmin-1.170-r2 (31 Dec 2004)
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -webmin-1.170-r1.ebuild, +webmin-1.170-r2.ebuild:
+  webmin configurations are installed in src_install.  Closes bug #75895.
 
   28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   webmin-1.170-r1.ebuild:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 00ae4ac27c5f..542b7decd8c3 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,16 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3839d0a2d8f0766ec8768b3b8b020168 ChangeLog 9837
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 14973a6b696c3410874c04a2210b20ba webmin-1.170.ebuild 2697
-MD5 cdc1550d2c88752af9f7047fa573d306 webmin-1.170-r1.ebuild 3455
 MD5 a21a0a8a415d1e5a1764199b0b4eeed2 webmin-1.160.ebuild 2685
+MD5 ec9b4c71fdbf3925efe062e50d0a11f7 webmin-1.170-r2.ebuild 3710
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 58f9530c780e652271313555858ad909 files/digest-webmin-1.170 138
 MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r1 209
 MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
+MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r2 209
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227
@@ -20,10 +18,3 @@ MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 10
 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579
 MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB0ZQKArHZZzCEUG0RAlzqAJ42khi3dalgTuHvC0rbAC9f7TNUJwCdGD3U
-zvWH580XmUb9pA0girEEuxM=
-=a0Sz
------END PGP SIGNATURE-----
diff --git a/app-admin/webmin/files/digest-webmin-1.170-r1 b/app-admin/webmin/files/digest-webmin-1.170-r2
index c4fddb6774a1..c4fddb6774a1 100644
--- a/app-admin/webmin/files/digest-webmin-1.170-r1
+++ b/app-admin/webmin/files/digest-webmin-1.170-r2
diff --git a/app-admin/webmin/webmin-1.170-r1.ebuild b/app-admin/webmin/webmin-1.170-r2.ebuild
index 402713ac675f..1865946a9919 100644
--- a/app-admin/webmin/webmin-1.170-r1.ebuild
+++ b/app-admin/webmin/webmin-1.170-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r1.ebuild,v 1.4 2004/12/28 17:12:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r2.ebuild,v 1.1 2004/12/31 22:14:12 eradicator Exp $
 
 IUSE="ssl apache2 webmin-minimal"
 
@@ -80,16 +80,14 @@ src_install() {
 	newins ${FILESDIR}/webmin-pam webmin
 	echo gentoo > ${D}/usr/libexec/webmin/install-type
 
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
-}
+	# Fix ownership
+	chown -R root:root ${D}
 
-pkg_postinst() {
-	${ROOT}/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd ${ROOT}/usr/libexec/webmin
-	config_dir=${ROOT}/etc/webmin
-	var_dir=${ROOT}/var/log/webmin
+	dodir /etc/webmin
+	dodir /var/log/webmin
+
+	config_dir=${D}/etc/webmin
+	var_dir=${D}/var/log/webmin
 	perl=${ROOT}/usr/bin/perl
 	autoos=1
 	port=10000
@@ -103,18 +101,31 @@ pkg_postinst() {
 	autothird=1
 	nouninstall=1
 	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl ${ROOT}/usr/libexec/webmin/maketemp.pl
-	./setup.sh > ${ROOT}/tmp/.webmin/webmin-setup.out 2>&1
+	tempdir="${T}"
+	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath tempdir
+	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
+
+	# Fixup the config files to use their real locations
+	sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf
+	find ${D}/etc/webmin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
+
+	# Cleanup from the config script
+	rm -rf ${D}/var/log/webmin
+	keepdir /var/log/webmin/
 
+	exeinto /etc/webmin
+	doexe ${FILESDIR}/uninstall.sh
+}
+
+pkg_postinst() {
+	${ROOT}/etc/init.d/webmin stop >/dev/null 2>&1
+	stopstatus=$?
 	if [ "$stopstatus" = "0" ]; then
 		# Start if it was running before
 		${ROOT}/etc/init.d/webmin start
 	fi
 
-	sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${ROOT}/etc/webmin/miniserv.conf
-
-	einfo "Add webmin to your boot-time services with 'rc-update add webmin'."
+	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
 	einfo "Point your web browser to http://localhost:10000 to use webmin."
 }