Browse Source

update to 2.0.7, update lsyncd.init

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6135 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 12 years ago
parent
commit
fe16fd88c0
2 changed files with 12 additions and 5 deletions
  1. 9 2
      l/lsyncd/lsyncd-vl.spec
  2. 3 3
      l/lsyncd/lsyncd.init

+ 9 - 2
l/lsyncd/lsyncd-vl.spec

@@ -1,7 +1,7 @@
 Summary: Live syncing (mirroring) daemon
 Summary(ja): リアルタイム同期(ミラーリング)デーモン
 Name: lsyncd
-Version: 2.0.5
+Version: 2.0.7
 Release: 1%{?_dist_release}
 
 License: GPL
@@ -10,6 +10,7 @@ URL: http://code.google.com/p/lsyncd/
 
 Source: lsyncd-%{version}.tar.gz
 Source1: lsyncd.init
+Source2: lsyncd.sysconfig
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: lua-devel
@@ -50,6 +51,8 @@ Lsyncd は rsync を用いて rsyncd が動いているリモートのマシン
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 %{__install} -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/lsyncd
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%{__install} -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lsyncd
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/lsyncd
 
@@ -77,12 +80,16 @@ fi
 %files
 %defattr(-, root, root, 0755)
 %doc COPYING ChangeLog examples/
+%config(noreplace) %{_sysconfdir}/sysconfig/lsyncd
 %{_sysconfdir}/rc.d/init.d/lsyncd
-%{_sysconfdir}/lsyncd/
+%dir %{_sysconfdir}/lsyncd/
 %{_bindir}/lsyncd
 %{_mandir}/man1/lsyncd.1*
       
 %changelog
+* Fri May 04 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.7-1
+- new upstream release 
+
 * Mon Feb 13 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.5-1
 - new upstream release
 

+ 3 - 3
l/lsyncd/lsyncd.init

@@ -20,7 +20,7 @@
 DAEMON=/usr/bin/lsyncd
 prog=`basename $DAEMON`
 CONFIG=/etc/lsyncd/lsyncd.conf.lua
-DAEMON_ARGS="${CONFIG}"
+LSYNCD_ARGS=""
 PIDFILE=/var/run/${prog}.pid
 LOCKFILE=/var/lock/subsys/${prog}
 
@@ -44,8 +44,8 @@ RETVAL=0
 start() {
 	# Check if it is already running
 	if [ ! -f $PIDFILE ]; then
-		echo -n $"Starting $prog: "	
-	    daemon --pidfile=$PIDFILE $DAEMON $CONFIG
+		echo -n $"Starting $prog: "
+	    daemon $DAEMON -pidfile $PIDFILE $DAEMON_ARGS $CONFIG
 	    RETVAL=$?
 	    [ $RETVAL -eq 0 ] && touch $LOCKFILE
 	    echo