OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 47... Line 47...
47 done 47 done
48 unset IFS 48 unset IFS
49 done 49 done
50 } 50 }
Line 51... Line -...
51   -  
52 append_list() { -  
53 local p; local v; local s="$1"; shift -  
54   -  
55 list_cb_append() { -  
56 v="$1:${v}" -  
57 } -  
58   -  
59 for p in $*; do -  
60 config_list_foreach "$s" "$p" list_cb_append -  
61 done -  
62 [ -n "$v" ] && append_param "$s" "$p" && echo " ${v%*:}" >> "/var/etc/openvpn-$s.conf" -  
63 } -  
64   51  
65 section_enabled() { 52 section_enabled() {
66 config_get_bool enable "$1" 'enable' 0 53 config_get_bool enable "$1" 'enable' 0
67 config_get_bool enabled "$1" 'enabled' 0 54 config_get_bool enabled "$1" 'enabled' 0
68 [ $enable -gt 0 ] || [ $enabled -gt 0 ] 55 [ $enable -gt 0 ] || [ $enabled -gt 0 ]
Line 78... Line 65...
78 --syslog "openvpn($name)" \ 65 --syslog "openvpn($name)" \
79 --status "/var/run/openvpn.$name.status" \ 66 --status "/var/run/openvpn.$name.status" \
80 --cd "$dir" \ 67 --cd "$dir" \
81 --config "$conf" 68 --config "$conf"
82 procd_set_param file "$dir/$conf" 69 procd_set_param file "$dir/$conf"
83 procd_set_param term_timeout 15 -  
84 procd_set_param respawn 70 procd_set_param respawn
85 procd_append_param respawn 3600 71 procd_append_param respawn 3600
86 procd_append_param respawn 5 72 procd_append_param respawn 5
87 procd_append_param respawn -1 73 procd_append_param respawn -1
88 procd_close_instance 74 procd_close_instance
Line 110... Line 96...
110 [ ! -d "/var/etc" ] && mkdir -p "/var/etc" 96 [ ! -d "/var/etc" ] && mkdir -p "/var/etc"
111 [ -f "/var/etc/openvpn-$s.conf" ] && rm "/var/etc/openvpn-$s.conf" 97 [ -f "/var/etc/openvpn-$s.conf" ] && rm "/var/etc/openvpn-$s.conf"
Line 112... Line 98...
112   98  
113 append_bools "$s" $OPENVPN_BOOLS 99 append_bools "$s" $OPENVPN_BOOLS
114 append_params "$s" $OPENVPN_PARAMS -  
Line 115... Line 100...
115 append_list "$s" $OPENVPN_LIST 100 append_params "$s" $OPENVPN_PARAMS
116   101  
Line 117... Line 102...
117 openvpn_add_instance "$s" "/var/etc" "openvpn-$s.conf" 102 openvpn_add_instance "$s" "/var/etc" "openvpn-$s.conf"