From: Alin Năstac <mrness@gentoo.org>
Date: Mon, 12 Feb 2007 11:13:22 +0000 (+0000)
Subject: Check configuration at service startup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aba06212499eb52ff262e80c11b1c4bbc353c14a;p=gentoo.git

Check configuration at service startup.
Package-Manager: portage-2.1.1-r2
---

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index 49912a2624c6..e2ff3f01520d 100644
--- a/net-proxy/polipo/ChangeLog
+++ b/net-proxy/polipo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/polipo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.12 2007/02/08 09:40:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.13 2007/02/12 11:13:22 mrness Exp $
+
+  12 Feb 2007; Alin Nastac <mrness@gentoo.org> files/polipo.initd:
+  Check configuration at service startup.
 
 *polipo-0.9.12 (08 Feb 2007)
 
diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 6c2237983596..71c0d69f634a 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -21,10 +21,10 @@ AUX polipo.crond 183 RMD160 aab536081352e9a16ddae9e2fba3e6c25ce687d0 SHA1 3fba7a
 MD5 44118bc5871d8a061e1ab1907b1c0065 files/polipo.crond 183
 RMD160 aab536081352e9a16ddae9e2fba3e6c25ce687d0 files/polipo.crond 183
 SHA256 2eb703bd3f4cdc7a616675ed3c924437e5ba594ac2037b3ae6292a410fac4b20 files/polipo.crond 183
-AUX polipo.initd 710 RMD160 52f26bd7dee52746ce54c61cfd920604ee717ab6 SHA1 18506a9fe90844d54a05e788db82c99551e6dfb7 SHA256 67044373f38406581f9626020f8d8840bf4bed3b858f242c7657cadd4ef437ae
-MD5 7f715d2fc10b4603a789e2683a0758f3 files/polipo.initd 710
-RMD160 52f26bd7dee52746ce54c61cfd920604ee717ab6 files/polipo.initd 710
-SHA256 67044373f38406581f9626020f8d8840bf4bed3b858f242c7657cadd4ef437ae files/polipo.initd 710
+AUX polipo.initd 1355 RMD160 879ec0f69c0f2b749b711d474d60e8ce78bbd5a2 SHA1 9ad17ff42f9bed692ca0b8d90ff77a669b6add7c SHA256 6218b0ddcc91e4986f87425d97cd0fc86e2011609b4ea60716d434d1758fac8d
+MD5 cba925181945a6b2fd1289800e7081d8 files/polipo.initd 1355
+RMD160 879ec0f69c0f2b749b711d474d60e8ce78bbd5a2 files/polipo.initd 1355
+SHA256 6218b0ddcc91e4986f87425d97cd0fc86e2011609b4ea60716d434d1758fac8d files/polipo.initd 1355
 DIST polipo-0.9.10.tar.gz 149303 RMD160 f1905444490ef8775dc8894addcd07087f5c9c07 SHA1 53efc84764535ff7ffe7ce457daa95aa182a6c7d SHA256 fe25ba6e39186c96278b8cb6803a04438ad2dc838bea704f163bbae86ecabd9d
 DIST polipo-0.9.11.tar.gz 149330 RMD160 c2e5d2fe591d026e96b32a7b4b2693c6ca2e9b1a SHA1 fd1f77d3bdc5a5636f566b04f86a286ee802685d SHA256 6f7c9ca5b61aeaa926a8ea2f307ed98b35d2fc6249be20b4092d9c97124d8abc
 DIST polipo-0.9.12.tar.gz 149370 RMD160 09b52dc68e0a1100e697199ff3cda1ba482a650f SHA1 f56d25584e6d84e219238df75aab0f3a6bfd8e4a SHA256 6b42de207937d3b13184aab3de2c3a6b9ab0ede92c340b19305f668e191cf205
@@ -40,10 +40,10 @@ EBUILD polipo-0.9.12.ebuild 1293 RMD160 0c3a5d03c1f9e8068c6e9d69682a4b22f9b50829
 MD5 fa9b9775edf623b437ea7ae5c33494e6 polipo-0.9.12.ebuild 1293
 RMD160 0c3a5d03c1f9e8068c6e9d69682a4b22f9b50829 polipo-0.9.12.ebuild 1293
 SHA256 1f867f0573d6d15b8ee947da3735c6d4202b41f6e654cb4aa36cf0b9b1171fed polipo-0.9.12.ebuild 1293
-MISC ChangeLog 2239 RMD160 f772cdbd0d18b1c382ae93b14984f3c51fe6fa08 SHA1 27cf500da63e9460b0bc7656b42ed3d00c1609ce SHA256 b45de59a3854d3e4fc2bcda2a1a92d67c507bb5f1d796dafefb0bbba7547891c
-MD5 d25b1d7251780fceaa1441dc75c1769c ChangeLog 2239
-RMD160 f772cdbd0d18b1c382ae93b14984f3c51fe6fa08 ChangeLog 2239
-SHA256 b45de59a3854d3e4fc2bcda2a1a92d67c507bb5f1d796dafefb0bbba7547891c ChangeLog 2239
+MISC ChangeLog 2349 RMD160 65e3e6563f41e3ee1699cbae97c7b818d377c3cf SHA1 7cb531bf3b60373c81d94bfe7a272fb1388bd044 SHA256 dad84ee29f2397faef10b6dcdd85e24ca4e263cd5af71257d0ee8559cec62217
+MD5 d375e4572b510771389c18903fad16c7 ChangeLog 2349
+RMD160 65e3e6563f41e3ee1699cbae97c7b818d377c3cf ChangeLog 2349
+SHA256 dad84ee29f2397faef10b6dcdd85e24ca4e263cd5af71257d0ee8559cec62217 ChangeLog 2349
 MISC metadata.xml 294 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 SHA1 05e93a9bb94da1af1f7ac486d280d82dc68664fc SHA256 86f147ccac4c6a157b8e94ac26c69c07db91b435bb0ec703a332c17c1f3d1c1a
 MD5 c3de0bbc117c44cd0aad81e19a01094c metadata.xml 294
 RMD160 9030115eb77480c879cc1b05acf92e90c9825330 metadata.xml 294
@@ -58,9 +58,9 @@ MD5 426a97e1a5550638d42556c0a3e7b4a6 files/digest-polipo-0.9.12 241
 RMD160 3f0f8a533bf11f4b607d1d569c589f1fed03def3 files/digest-polipo-0.9.12 241
 SHA256 691e07e562193f2e16566c092e4ea07d4cfe99f0173add29634a292df1a52777 files/digest-polipo-0.9.12 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFyvAGJnxX6mF440QRAnCvAJ9Xjpq1xaqG1DEegUQOmK4DCHyEDwCff2lg
-epH55dziIjBNb/ypBJ8HPBI=
-=Ny12
+iD8DBQFF0EvgJnxX6mF440QRAuhZAKDdTv3mR+uevZ5NnmRyS+jhJi//tQCfcapi
+0vyACs/a5algDj27/Bd5UIo=
+=D47o
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/polipo/files/polipo.initd b/net-proxy/polipo/files/polipo.initd
index d950dd1f1c29..8f2435677e37 100644
--- a/net-proxy/polipo/files/polipo.initd
+++ b/net-proxy/polipo/files/polipo.initd
@@ -1,21 +1,49 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.2 2006/09/06 20:29:15 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/files/polipo.initd,v 1.3 2007/02/12 11:13:22 mrness Exp $
 
 depend() {
 	need net
 }
 
-start() {
-	ebegin "Starting Polipo HTTP proxy"
+checkconfig() {
+	polipo -v | (
+    		local retvalue=0
+    		local name value desc
+		while read name value desc ; do
+			case ${name} in
+				configFile)
+					if [[ "${value}" == "(none)" ]]; then
+						eerror "Unable to read configuration file /etc/polipo/config"
+						retvalue=1
+					fi
+					;;
+				daemonise)
+					if [[ "${value}" != "false" ]]; then
+						eerror "Configuration option not supported by this init script: ${name}=${value}"
+						retvalue=1
+					fi
+					;;
+				pidFile)
+					if [[ "${value}" != "(none)" ]]; then
+						eerror "Configuration option not supported by this init script: ${name}=${value}"
+						retvalue=1
+					fi
+					;;
+			esac
+		done
+		return ${retvalue}
+	)
+	[[ ${PIPESTATUS[0]} == 0 && ${PIPESTATUS[1]} == 0 ]]
+	return $?
+}
 
-	if [ ! -f "/etc/polipo/config" ]; then
-		eerror "Unable to read configuration file: /etc/polipo/config"
-		return 1
-	fi
+start() {
+	checkconfig || return 1
 
-	start-stop-daemon --start --quiet --chuid polipo \
+	ebegin "Starting Polipo HTTP proxy"
+	start-stop-daemon --start --chuid polipo \
 		--background --pidfile /var/run/polipo.pid --make-pidfile \
 			--exec /usr/bin/polipo
 	eend $?
@@ -23,6 +51,6 @@ start() {
 
 stop() {
 	ebegin "Stopping Polipo HTTP proxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/polipo.pid
+	start-stop-daemon --stop --pidfile /var/run/polipo.pid
 	eend $?
 }