Changeset 29177


Ignore:
Timestamp:
2011-11-16T10:44:20+01:00 (6 years ago)
Author:
nico
Message:

packages/tor{,-alpha}: use a fixed predictable pid-file location (patch from Peter Wagner), remove PidFile config entry

Location:
packages/net
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • packages/net/tor-alpha/Makefile

    r28902 r29177  
    1010PKG_NAME:=tor-alpha 
    1111PKG_VERSION:=0.2.3.5-alpha 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=tor-$(PKG_VERSION).tar.gz 
  • packages/net/tor-alpha/files/tor.init

    r28902 r29177  
    33 
    44START=50 
     5STOP=50 
    56 
    6 SERVICE_PID_FILE=/var/run/tor/tor.pid 
     7SERVICE_USE_PID=1 
    78 
    89start() { 
    9         user_exists tor 52 || user_add tor 52 
     10        user_exists tor 52 || user_add tor 52 52 /var/lib/tor 
    1011        group_exists tor 52 || group_add tor 52 
    11         [ -d /var/run/tor ] || { 
    12                 mkdir -m 0755 -p /var/run/tor 
    13                 chown tor:tor /var/run/tor 
     12        [ -f /var/run/tor.pid ] || { 
     13                touch /var/run/tor.pid 
     14                chown tor:tor /var/run/tor.pid 
    1415        } 
    1516        [ -d /var/lib/tor ] || { 
     
    2223                chown tor:tor /var/log/tor 
    2324        } 
    24         service_start /usr/sbin/tor 
     25        service_start /usr/sbin/tor --PidFile /var/run/tor.pid 
    2526} 
    2627 
  • packages/net/tor-alpha/patches/001-torrc.patch

    r28902 r29177  
    1515 ## The port on which Tor will listen for local connections from Tor 
    1616 ## controller applications, as documented in control-spec.txt. 
    17 @@ -168,3 +168,5 @@ SocksListenAddress 127.0.0.1 # accept co 
     17@@ -168,3 +168,4 @@ SocksListenAddress 127.0.0.1 # accept co 
    1818 #BridgeRelay 1 
    1919 #ExitPolicy reject *:* 
    2020  
    2121+User tor 
    22 +PidFile @LOCALSTATEDIR@/run/tor/tor.pid 
  • packages/net/tor/Makefile

    r28902 r29177  
    1010PKG_NAME:=tor 
    1111PKG_VERSION:=0.2.2.34 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • packages/net/tor/files/tor.init

    r28902 r29177  
    33 
    44START=50 
     5STOP=50 
    56 
    6 SERVICE_PID_FILE=/var/run/tor/tor.pid 
     7SERVICE_USE_PID=1 
    78 
    89start() { 
    9         user_exists tor 52 || user_add tor 52 
     10        user_exists tor 52 || user_add tor 52 52 /var/lib/tor 
    1011        group_exists tor 52 || group_add tor 52 
    11         [ -d /var/run/tor ] || { 
    12                 mkdir -m 0755 -p /var/run/tor 
    13                 chown tor:tor /var/run/tor 
     12        [ -f /var/run/tor.pid ] || { 
     13                touch /var/run/tor.pid 
     14                chown tor:tor /var/run/tor.pid 
    1415        } 
    1516        [ -d /var/lib/tor ] || { 
     
    2223                chown tor:tor /var/log/tor 
    2324        } 
    24         service_start /usr/sbin/tor 
     25        service_start /usr/sbin/tor --PidFile /var/run/tor.pid 
    2526} 
    2627 
  • packages/net/tor/patches/001-torrc.patch

    r28902 r29177  
    1515 ## The port on which Tor will listen for local connections from Tor 
    1616 ## controller applications, as documented in control-spec.txt. 
    17 @@ -168,3 +168,5 @@ SocksListenAddress 127.0.0.1 # accept co 
     17@@ -168,3 +168,4 @@ SocksListenAddress 127.0.0.1 # accept co 
    1818 #BridgeRelay 1 
    1919 #ExitPolicy reject *:* 
    2020  
    2121+User tor 
    22 +PidFile @LOCALSTATEDIR@/run/tor/tor.pid 
Note: See TracChangeset for help on using the changeset viewer.