SF.net SVN: gar:[22842] csw/mgar/pkg/tor/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 22842
          http://sourceforge.net/p/gar/code/22842
Author:   jake_goerzen
Date:     2014-01-15 21:56:37 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
tor: move OpenCSW options from sample config file to command-line

Modified Paths:
--------------
    csw/mgar/pkg/tor/trunk/Makefile
    csw/mgar/pkg/tor/trunk/files/cswtor

Modified: csw/mgar/pkg/tor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tor/trunk/Makefile	2014-01-15 20:10:51 UTC (rev 22841)
+++ csw/mgar/pkg/tor/trunk/Makefile	2014-01-15 21:56:37 UTC (rev 22842)
@@ -40,12 +40,6 @@
 
 post-install-modulated:
 
-	# add some config options to sample conf
-	echo "# OpenCSW added default options" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-	echo "Log syslog" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-	echo "PidFile /var/run/tor.pid" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-	echo "RunAsDaemon 1" >> $(DESTDIR)$(sysconfdir)/tor/torrc.sample
-
 	# Copy SMF script
 	ginstall -Dm 755 $(FILEDIR)/cswtor \
 		$(DESTDIR)/etc/opt/csw/init.d/cswtor

Modified: csw/mgar/pkg/tor/trunk/files/cswtor
===================================================================
--- csw/mgar/pkg/tor/trunk/files/cswtor	2014-01-15 20:10:51 UTC (rev 22841)
+++ csw/mgar/pkg/tor/trunk/files/cswtor	2014-01-15 21:56:37 UTC (rev 22842)
@@ -4,12 +4,12 @@
 
 DAEMON=/opt/csw/bin/tor
 CONF=/etc/opt/csw/tor/torrc
-pidfile=/var/run/tor.pid
+pidfile=/var/opt/csw/run/tor.pid
 
 case "$1" in
   start)
     echo "Starting Tor"
-    $DAEMON -f $CONF
+    $DAEMON --RunAsDaemon 1 --PidFile /var/opt/csw/run/tor.pid
     ;;
   stop)
     echo "Stopping Tor"
@@ -19,7 +19,7 @@
     echo "Restarting Tor"
     kill `cat $pidfile`
     sleep 1
-    $DAEMON -f $CONF
+    $DAEMON --RunAsDaemon 1 --PidFile /var/opt/csw/run/tor.pid
     ;;
   *)
     echo "Usage: $0 { start | stop | restart }"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.