Changeset 30268


Ignore:
Timestamp:
2012-02-05T17:16:52+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] tinyproxy: merge r29173

Location:
branches/packages_10.03.2/net/tinyproxy
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/tinyproxy/Makefile

    r27135 r30268  
    1010PKG_NAME:=tinyproxy 
    1111PKG_VERSION:=1.8.2 
    12 PKG_RELEASE:=4 
     12PKG_RELEASE:=5 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • branches/packages_10.03.2/net/tinyproxy/files/tinyproxy.config

    r24048 r30268  
    44# Enable the proxy 
    55# 
    6 option enable 0 
     6option enabled 0 
    77 
    88# 
  • branches/packages_10.03.2/net/tinyproxy/files/tinyproxy.init

    r24050 r30268  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2008 OpenWrt.org 
     2# Copyright (C) 2008-2011 OpenWrt.org 
     3 
    34START=50 
    45 
    5 DAEMON=/usr/sbin/tinyproxy 
    66CFGFILE=/var/etc/tinyproxy.conf 
    77 
     8section_enabled() { 
     9        config_get_bool enabled "$1" 'enabled' 0 
     10        [ $enabled -gt 0 ] 
     11} 
     12 
    813start() { 
    9         config_load tinyproxy 
    10         config_foreach start_proxy tinyproxy 
     14        config_load 'tinyproxy' 
     15        config_foreach start_proxy 'tinyproxy' 
    1116} 
    1217 
    1318stop() { 
    14         start-stop-daemon -q -x "$DAEMON" -K 
    15         rm -f $CFGFILE 
     19        service_stop /usr/sbin/tinyproxy 
    1620} 
    1721 
    1822start_proxy() { 
    19         config_get_bool enable "$1" enable 
    20         [ "$enable" -eq "1" ] || return 0 
     23        section_enabled "$1" || return 1 
    2124 
    22         mkdir -p /var/etc 
     25        mkdir -m0755 -p /var/etc 
    2326        echo '### AUTOGENERATED CONFIGURATION' > $CFGFILE 
    2427        echo '### DO NOT EDIT' >> $CFGFILE 
     
    7073        config_foreach write_upstream upstream 
    7174 
    72         start-stop-daemon -q -x "$DAEMON" -S -- -c "$CFGFILE" 
     75        service_start /usr/sbin/tinyproxy -c "$CFGFILE" 
    7376} 
    7477 
Note: See TracChangeset for help on using the changeset viewer.