openvpn: autostart openvpn instances for each .conf file in /etc/openvpn

[openwrt.git] / package / network / services / openvpn / files / openvpn.init

diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index eaf46c4..294e3ed 100644 (file)
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -13,6 +13,9 @@ PROG=/usr/sbin/openvpn
 LIST_SEP="
 "
 
+UCI_STARTED=
+UCI_DISABLED=
+
 append_param() {
        local s="$1"
        local v="$2"
@@ -29,7 +32,7 @@ append_bools() {
        local p; local v; local s="$1"; shift
        for p in $*; do
                config_get_bool v "$s" "$p"
-               [ "$v" == 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf"
+               [ "$v" = 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf"
        done
 }
 
@@ -51,24 +54,38 @@ section_enabled() {
        [ $enable -gt 0 ] || [ $enabled -gt 0 ]
 }
 
+openvpn_add_instance() {
+       local name="$1"
+       local dir="$2"
+       local conf="$3"
+
+       procd_open_instance
+       procd_set_param command "$PROG" \
+               --syslog "openvpn($name)" \
+               --status "/var/run/openvpn.$name.status" \
+               --cd "$dir" \
+               --config "$conf"
+       procd_set_param file "$dir/$conf"
+       procd_set_param respawn
+       procd_close_instance
+}
+
 start_instance() {
        local s="$1"
 
-       section_enabled "$s" || return 1
-
        config_get config "$s" config
+       config="${config:+$(readlink -f "$config")}"
+
+       section_enabled "$s" || {
+               append UCI_DISABLED "$config" "$LIST_SEP"
+               return 1
+       }
 
        [ ! -d "/var/run" ] && mkdir -p "/var/run"
 
        if [ ! -z "$config" ]; then
-               procd_open_instance
-               procd_set_param command "$PROG" \
-                       --config "$config" \
-                       --cd "$(dirname $config)" \
-                       --syslog "openvpn($s)" \
-                       --writepid "/var/run/openvpn-$s.pid"
-               procd_set_param file "/etc/config/openvpn"
-               procd_close_instance
+               append UCI_STARTED "$config" "$LIST_SEP"
+               openvpn_add_instance "$s" "${config%/*}" "$config"
                return
        fi
 
@@ -78,7 +95,7 @@ start_instance() {
        # append flags
        append_bools "$s" \
                auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
-               client_to_client comp_lzo comp_noadapt disable \
+               client_to_client comp_noadapt disable \
                disable_occ down_pre duplicate_cn fast_io float http_proxy_retry \
                ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear management_forget_disconnect management_hold \
                management_query_passwords management_signal mktun mlock mtu_test multihome mute_replay_warnings \
@@ -91,7 +108,7 @@ start_instance() {
        # append params
        append_params "$s" \
                cd askpass auth auth_user_pass auth_user_pass_verify bcast_buffers ca cert \
-               chroot cipher client_config_dir client_connect client_disconnect connect_freq \
+               chroot cipher client_config_dir client_connect client_disconnect comp_lzo connect_freq \
                connect_retry connect_timeout connect_retry_max crl_verify dev dev_node dev_type dh \
                echo engine explicit_exit_notify fragment group hand_window hash_size \
                http_proxy http_proxy_option http_proxy_timeout ifconfig ifconfig_pool \
@@ -106,20 +123,32 @@ start_instance() {
                route_metric route_up rport script_security secret server server_bridge setenv shaper sndbuf \
                socks_proxy status status_version syslog tcp_queue_limit tls_auth \
                tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \
-               tun_mtu tun_mtu_extra txqueuelen user verb down push up
+               tun_mtu tun_mtu_extra txqueuelen user verb down push up \
+               ifconfig_ipv6 route_ipv6 server_ipv6 ifconfig_ipv6_pool ifconfig_ipv6_push iroute_ipv6
 
-
-       procd_open_instance
-       procd_set_param command "$PROG" \
-               --config "/var/etc/openvpn-$s.conf" \
-               --cd "/var/etc" \
-               --syslog "openvpn($s)" \
-               --writepid "/var/run/openvpn-$s.pid"
-       procd_set_param file "/etc/config/openvpn"
-       procd_close_instance
+       openvpn_add_instance "$s" "/var/etc" "openvpn-$s.conf"
 }
 
 start_service() {
        config_load 'openvpn'
        config_foreach start_instance 'openvpn'
+
+       local path name
+       for path in /etc/openvpn/*.conf; do
+               if [ -f "$path" ]; then
+                       name="${path##*/}"; name="${name%.conf}"
+
+                       # don't start configs again that are already started by uci
+                       if echo "$UCI_STARTED" | grep -qxF "$path"; then
+                               continue
+
+                       # don't start configs which are set to disabled in uci
+                       elif echo "$UCI_DISABLED" | grep -qxF "$path"; then
+                               logger -t openvpn "$name.conf is disabled in /etc/config/openvpn"
+                               continue
+                       fi
+
+                       openvpn_add_instance "$name" "${path%/*}" "$path"
+               fi
+       done
 }