Changeset 30194


Ignore:
Timestamp:
2012-02-05T16:02:01+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] autossh: merge r28018, r29072, r29199

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

Legend:

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

    r16985 r30194  
    11# 
    2 # Copyright (C) 2006-2008 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=autossh 
    1111PKG_VERSION:=1.4b 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=5 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
     
    4444endef 
    4545 
     46define Package/autossh/conffiles 
     47/etc/config/autossh 
     48endef 
     49 
    4650$(eval $(call BuildPackage,autossh)) 
  • branches/packages_10.03.2/net/autossh/files/autossh.config

    r10807 r30194  
    11config autossh 
    22        option ssh      '-i /etc/dropbear/id_rsa -N -T -R 2222:localhost:22 user@host' 
     3        option gatetime '0' 
    34        option monitorport      '20000' 
    45        option poll     '600' 
  • branches/packages_10.03.2/net/autossh/files/autossh.init

    r16985 r30194  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2011 OpenWrt.org 
     3 
    34START=80 
    45 
    5 start_service () { 
     6start_instance() { 
    67        local section="$1" 
    7         config_get ssh "$section" ssh 
    8         config_get monitorport "$section" monitorport 
    9         config_get poll "$section" poll 
    108 
    11         AUTOSSH_POLL=${poll:-"600"} autossh -M ${monitorport:-"20000"} -f ${ssh} 
     9        config_get ssh "$section" 'ssh' 
     10        config_get gatetime "$section" 'gatetime' 
     11        config_get monitorport "$section" 'monitorport' 
     12        config_get poll "$section" 'poll' 
     13 
     14        AUTOSSH_GATETIME="${gatetime:-30}" \ 
     15        AUTOSSH_POLL="${poll:-600"}" \ 
     16        service_start /usr/sbin/autossh -M ${monitorport:-20000} -f ${ssh} 
    1217} 
    1318 
     
    1722 
    1823start() { 
    19         config_load "autossh" 
    20         config_foreach start_service autossh 
     24        config_load 'autossh' 
     25        config_foreach start_instance 'autossh' 
    2126} 
    2227 
    2328stop() { 
    24         killall autossh 
     29        service_stop /usr/sbin/autossh 
    2530} 
Note: See TracChangeset for help on using the changeset viewer.