[polipo] take file / dir creation & testing out of initscript (bz #708814)
Bernard Johnson
bjohnson at fedoraproject.org
Tue Sep 27 02:42:42 UTC 2011
commit a19444c809baf7f4e5d6b560966acfff928d7d60
Author: Bernard Johnson <bjohnson at symetrix.com>
Date: Mon Sep 26 19:47:04 2011 -0600
take file / dir creation & testing out of initscript (bz #708814)
polipo.init | 27 ++++++---------------------
polipo.spec | 5 ++++-
2 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/polipo.init b/polipo.init
index f7c6c83..b091826 100644
--- a/polipo.init
+++ b/polipo.init
@@ -42,27 +42,12 @@ start() {
# check if the polipo config is present
[ -f $config ] || exit 6
- [ -e $logfile ] ||touch $logfile
- chmod -f 0640 $logfile
- chown -f polipo:polipo $logfile
- for i in $cachedir $piddir ; do
- if [ ! -d $i ] ; then
- if [ ! -e $i -a ! -h $i ] ; then
- mkdir -p $i || exit 1
- fi
- fi
- done
- chmod -f 0750 $cachedir
- chown -f polipo:polipo $cachedir
- chmod -f 0755 $piddir
- chown -f polipo:polipo $piddir
-
- echo -n $"Starting $prog: "
- daemon --pidfile=${pidfile} --user=polipo $polipo -c $config
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && touch ${lockfile}
- return $RETVAL
+ echo -n $"Starting $prog: "
+ daemon --pidfile=${pidfile} --user=polipo $polipo -c $config
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch ${lockfile}
+ return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
diff --git a/polipo.spec b/polipo.spec
index be47fa8..5ecfb26 100644
--- a/polipo.spec
+++ b/polipo.spec
@@ -1,6 +1,6 @@
Name: polipo
Version: 1.0.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Lightweight caching web proxy
License: MIT
Source0: http://freehaven.net/~chrisd/%{name}/%{name}-%{version}.tar.gz
@@ -110,6 +110,9 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%changelog
+* Mon Sep 26 2011 Bernard Johnson <bjohnson at symetrix.com> - 1.0.4.1-4
+- take file / dir creation & testing out of initscript (bz #708814)
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list