diff --git a/frp/Makefile b/frp/Makefile deleted file mode 100644 index 5a662ebdd..000000000 --- a/frp/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=frp -PKG_VERSION:=0.39.0 -PKG_RELEASE:=$(AUTORELEASE) - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}? -PKG_HASH:=639ad416587b03751569b0d51c097bcc52727643e0656064843efb5d0b08ba72 - -PKG_MAINTAINER:=Richard Yu -PKG_LICENSE:=Apache-2.0 -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=golang/host -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -GO_PKG:=github.com/fatedier/frp -GO_PKG_BUILD_PKG:=github.com/fatedier/frp/cmd/... - -include $(INCLUDE_DIR)/package.mk -include /golang/golang-package.mk - -define Package/frp/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/etc/frp/$(2).d/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/$(2)_full.ini $(1)/etc/frp/$(2).d/ - $(INSTALL_DIR) $(1)/etc/config/ - $(INSTALL_CONF) ./files/$(2).config $(1)/etc/config/$(2) - $(INSTALL_DIR) $(1)/etc/init.d/ - $(INSTALL_BIN) ./files/$(2).init $(1)/etc/init.d/$(2) - - if [ -r ./files/$(2).uci-defaults ]; then \ - $(INSTALL_DIR) $(1)/etc/uci-defaults; \ - $(INSTALL_DATA) ./files/$(2).uci-defaults $(1)/etc/uci-defaults/$(2); \ - fi -endef - -define Package/frp/template - define Package/$(1) - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - TITLE:=$(1) - fast reverse proxy $(2) - URL:=https://github.com/fatedier/frp - DEPENDS:=$(GO_ARCH_DEPENDS) - endef - - define Package/$(1)/description - $(1) is a fast reverse proxy $(2) to help you expose a local server behind - a NAT or firewall to the internet. - endef - - define Package/$(1)/conffiles -/etc/config/$(1) - endef - - define Package/$(1)/install - $(call Package/frp/install,$$(1),$(1)) - endef -endef - -$(eval $(call Package/frp/template,frpc,client)) -$(eval $(call Package/frp/template,frps,server)) -$(eval $(call BuildPackage,frpc)) -$(eval $(call BuildPackage,frps)) diff --git a/frp/files/frpc.config b/frp/files/frpc.config deleted file mode 100644 index 492e224ff..000000000 --- a/frp/files/frpc.config +++ /dev/null @@ -1,23 +0,0 @@ -config init - option stdout 1 - option stderr 1 - option user frpc - option group frpc - option respawn 1 -# OS environments pass to frp for config file template, see -# https://github.com/fatedier/frp#configuration-file-template -# list env 'ENV_NAME=value' -# Config files include in temporary config file. -# list conf_inc '/etc/frp/frpc.d/frpc_full.ini' - -config conf 'common' - option server_addr 127.0.0.1 - option server_port 7000 -# List options with name="_" will be directly appended to config file -# list _ '# Key-A=Value-A' - -config conf 'ssh' - option type tcp - option local_ip 127.0.0.1 - option local_port 22 - option remote_port 6000 diff --git a/frp/files/frpc.init b/frp/files/frpc.init deleted file mode 100644 index e7f06edbd..000000000 --- a/frp/files/frpc.init +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -USE_PROCD=1 - -NAME=frpc -PROG=/usr/bin/$NAME - -_err() { - echo "$*" >&2 - logger -p daemon.err -t "$NAME" "$*" -} - -config_cb() { - [ $# -eq 0 ] && return - - local type="$1" - local name="$2" - if [ "$type" = "conf" ]; then - echo "[$name]" >> "$conf_file" - option_cb() { - local option="$1" - local value="$2" - [ "$option" = "name" ] && \ - sed -i "s/$CONFIG_SECTION/$value/g" "$conf_file" || \ - echo "$option = $value" >> "$conf_file"; - } - list_cb() { - local name="$1" - local value="$2" - [ "$name" = "_" ] && echo "$value" >> "$conf_file" - } - else - [ "$type" = "init" ] && init_cfg="$name" - option_cb() { return 0; } - list_cb() { return 0; } - fi -} - -service_triggers() -{ - procd_add_reload_trigger "$NAME" -} - -start_service() { - local init_cfg=" " - local conf_file="/var/etc/$NAME.ini" - - > "$conf_file" - config_load "$NAME" - - local stdout stderr user group respawn env conf_inc - uci_validate_section "$NAME" init "$init_cfg" \ - 'stdout:bool:1' \ - 'stderr:bool:1' \ - 'user:string' \ - 'group:string' \ - 'respawn:bool:1' \ - 'env:list(string)' \ - 'conf_inc:list(string)' - - local err=$? - [ $err -ne 0 ] && { - _err "uci_validate_section returned $err" - return 1 - } - - [ -n "$conf_inc" ] && config_list_foreach "$init_cfg" conf_inc cat >> "$conf_file" - - procd_open_instance - procd_set_param command "$PROG" -c "$conf_file" - procd_set_param stdout $stdout - procd_set_param stderr $stderr - [ -n "$user" ] && procd_set_param user "$user" - [ -n "$group" ] && procd_set_param group "$group" - [ $respawn -eq 1 ] && procd_set_param respawn - [ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env" - procd_close_instance -} - -reload_service() { - stop - start -} diff --git a/frp/files/frpc.uci-defaults b/frp/files/frpc.uci-defaults deleted file mode 100644 index 4883a2d8c..000000000 --- a/frp/files/frpc.uci-defaults +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh - -upgrade() { - local section=$1 - local name - [ "$section" != "common" ] || return 0 - config_get name $section name - if [ -z "$name" ]; then - uci_set frpc "$section" name "$section" - uci_commit frpc - fi -} - -config_load frpc -config_foreach upgrade conf - -exit 0 diff --git a/frp/files/frps.config b/frp/files/frps.config deleted file mode 100644 index ae0bffc2f..000000000 --- a/frp/files/frps.config +++ /dev/null @@ -1,16 +0,0 @@ -config init - option stdout 1 - option stderr 1 - option user frps - option group frps - option respawn 1 -# OS environments pass to frp for config file template, see -# https://github.com/fatedier/frp#configuration-file-template -# list env 'ENV_NAME=value' -# Config files include in temporary config file. -# list conf_inc '/etc/frp/frps.d/frps_full.ini' - -config conf 'common' - option bind_port 7000 -# List options with name="_" will be directly appended to config file -# list _ '# Key-A=Value-A' diff --git a/frp/files/frps.init b/frp/files/frps.init deleted file mode 100644 index b87525cd2..000000000 --- a/frp/files/frps.init +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -USE_PROCD=1 - -NAME=frps -PROG=/usr/bin/$NAME - -_err() { - echo "$*" >&2 - logger -p daemon.err -t "$NAME" "$*" -} - -config_cb() { - [ $# -eq 0 ] && return - - local type="$1" - local name="$2" - if [ "$type" = "conf" ]; then - echo "[$name]" >> "$conf_file" - option_cb() { - local option="$1" - local value="$2" - echo "$option = $value" >> "$conf_file" - } - list_cb() { - local name="$1" - local value="$2" - [ "$name" = "_" ] && echo "$value" >> "$conf_file" - } - else - [ "$type" = "init" ] && init_cfg="$name" - option_cb() { return 0; } - list_cb() { return 0; } - fi -} - -service_triggers() -{ - procd_add_reload_trigger "$NAME" -} - -start_service() { - local init_cfg=" " - local conf_file="/var/etc/$NAME.ini" - - > "$conf_file" - config_load "$NAME" - - local stdout stderr user group respawn env conf_inc - uci_validate_section "$NAME" init "$init_cfg" \ - 'stdout:bool:1' \ - 'stderr:bool:1' \ - 'user:string' \ - 'group:string' \ - 'respawn:bool:1' \ - 'env:list(string)' \ - 'conf_inc:list(string)' - - local err=$? - [ $err -ne 0 ] && { - _err "uci_validate_section returned $err" - return 1 - } - - [ -n "$conf_inc" ] && config_list_foreach "$init_cfg" conf_inc cat >> "$conf_file" - - procd_open_instance - procd_set_param command "$PROG" -c "$conf_file" - procd_set_param stdout $stdout - procd_set_param stderr $stderr - [ -n "$user" ] && procd_set_param user "$user" - [ -n "$group" ] && procd_set_param group "$group" - [ $respawn -eq 1 ] && procd_set_param respawn - [ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env" - procd_close_instance -} - -reload_service() { - stop - start -}