diff --git a/net/shadowsocks/src/etc/inc/plugins.inc.d/shadowsocks.inc b/net/shadowsocks/src/etc/inc/plugins.inc.d/shadowsocks.inc index d4815eea8..f522c4716 100644 --- a/net/shadowsocks/src/etc/inc/plugins.inc.d/shadowsocks.inc +++ b/net/shadowsocks/src/etc/inc/plugins.inc.d/shadowsocks.inc @@ -41,7 +41,7 @@ function shadowsocks_services() 'stop' => array('shadowsocks stop'), ), 'name' => 'shadowsocks', - 'pidfile' => '/var/run/shadowsocks-libev.pid' + 'pidfile' => '/var/run/ssserver_rust.pid' ); } @@ -54,7 +54,7 @@ function shadowsocks_services() 'stop' => array('shadowsockslocal stop'), ), 'name' => 'shadowsockslocal', - 'pidfile' => '/var/run/ss-local.pid' + 'pidfile' => '/var/run/sslocal_rust.pid' ); } diff --git a/net/shadowsocks/src/etc/rc.d/opnsense-ss-local b/net/shadowsocks/src/etc/rc.d/opnsense-ss-local deleted file mode 100755 index f968c7c70..000000000 --- a/net/shadowsocks/src/etc/rc.d/opnsense-ss-local +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# PROVIDE: ss-local -# REQUIRE: LOGIN cleanvar -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable shadowsocks-libev: -# ss_local_enable (bool): Set to "NO" by default. -# Set to "YES" to enable ss-local. -# ss_local_config (path): Shadowsocks config file. -# Defaults to "/usr/local/etc/shadowsocks-libev/local.json" - -. /etc/rc.subr - -name="ss_local" -rcvar=ss_local_enable - -load_rc_config $name - -: ${ss_local_enable:="NO"} -: ${ss_local_config="/usr/local/etc/shadowsocks-libev/local.json"} - -command="/usr/local/bin/ss-local" -pidfile="/var/run/ss-local.pid" -required_files="${ss_local_config}" - -command_args="-f $pidfile -c $ss_local_config" - -run_rc_command "$1" diff --git a/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsocks.conf b/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsocks.conf index 825825bf1..372386770 100644 --- a/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsocks.conf +++ b/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsocks.conf @@ -1,47 +1,24 @@ [start] -command:/usr/local/etc/rc.d/shadowsocks_libev start +command:/usr/local/etc/rc.d/ssserver-rust start parameters: type:script message:starting Shadowsocks [stop] -command:/usr/local/etc/rc.d/shadowsocks_libev stop +command:/usr/local/etc/rc.d/ssserver-rust stop parameters: type:script message:stopping Shadowsocks [restart] -command:/usr/local/etc/rc.d/shadowsocks_libev restart +command:/usr/local/etc/rc.d/ssserver-rust restart parameters: type:script message:restarting Shadowsocks [status] -command:/usr/local/etc/rc.d/shadowsocks_libev status;exit 0 +command:/usr/local/etc/rc.d/ssserver-rust status +errors:no parameters: type:script_output message:request Shadowsocks status - -[start-local] -command:/usr/local/etc/rc.d/opnsense-ss-local start -parameters: -type:script -message:starting Shadowsocks Local - -[stop-local] -command:/usr/local/etc/rc.d/opnsense-ss-local stop -parameters: -type:script -message:stopping Shadowsocks Local - -[restart-local] -command:/usr/local/etc/rc.d/opnsense-ss-local restart -parameters: -type:script -message:restarting Shadowsocks Local - -[status-local] -command:/usr/local/etc/rc.d/opnsense-ss-local status;exit 0 -parameters: -type:script_output -message:request Shadowsocks Local status diff --git a/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsockslocal.conf b/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsockslocal.conf index a1c540495..d472c2a3f 100644 --- a/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsockslocal.conf +++ b/net/shadowsocks/src/opnsense/service/conf/actions.d/actions_shadowsockslocal.conf @@ -1,23 +1,24 @@ [start] -command:/usr/local/etc/rc.d/opnsense-ss-local start +command:/usr/local/etc/rc.d/sslocal-rust start parameters: type:script message:starting Shadowsocks Local [stop] -command:/usr/local/etc/rc.d/opnsense-ss-local stop +command:/usr/local/etc/rc.d/sslocal-rust stop parameters: type:script message:stopping Shadowsocks Local [restart] -command:/usr/local/etc/rc.d/opnsense-ss-local restart +command:/usr/local/etc/rc.d/sslocal-rust restart parameters: type:script message:restarting Shadowsocks Local [status] -command:/usr/local/etc/rc.d/opnsense-ss-local status;exit 0 +command:/usr/local/etc/rc.d/sslocal-rust status +errors:no parameters: type:script_output message:request Shadowsocks Local status diff --git a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/+TARGETS b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/+TARGETS index bb1dc94e9..a79c7369d 100644 --- a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/+TARGETS +++ b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/+TARGETS @@ -1,4 +1,4 @@ -shadowsocks_libev:/etc/rc.conf.d/shadowsocks_libev -shadowsocks.conf:/usr/local/etc/shadowsocks-libev/config.json -ss_local:/etc/rc.conf.d/ss_local -ss_local.conf:/usr/local/etc/shadowsocks-libev/local.json +ssserver:/etc/rc.conf.d/ssserver_rust +shadowsocks.conf:/usr/local/etc/shadowsocks-rust/config.json +sslocal:/etc/rc.conf.d/sslocal_rust +sslocal.conf:/usr/local/etc/shadowsocks-rust/local.json diff --git a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/ss_local b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/sslocal similarity index 68% rename from net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/ss_local rename to net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/sslocal index 258b305d0..d7fe2808a 100644 --- a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/ss_local +++ b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/sslocal @@ -1,6 +1,5 @@ {% if helpers.exists('OPNsense.shadowsocks.local.enabled') and OPNsense.shadowsocks.local.enabled == '1' %} -ss_local_enable="YES" -ss_local_flags="" +sslocal_rust_enable="YES" {% else %} -ss_local_enable="NO" +sslocal_rust_enable="NO" {% endif %} diff --git a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks_libev b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/ssserver similarity index 60% rename from net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks_libev rename to net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/ssserver index 11dd88f35..5a53f2819 100644 --- a/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/shadowsocks_libev +++ b/net/shadowsocks/src/opnsense/service/templates/OPNsense/Shadowsocks/ssserver @@ -1,6 +1,5 @@ {% if helpers.exists('OPNsense.shadowsocks.general.enabled') and OPNsense.shadowsocks.general.enabled == '1' %} -shadowsocks_libev_enable="YES" -shadowsocks_libev_flags="" +ssserver_rust_enable="YES" {% else %} -shadowsocks_libev_enable="NO" +ssserver_rust_enable="NO" {% endif %}