diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 38 | ||||
| -rw-r--r-- | client.env | 7 | ||||
| -rw-r--r-- | master.env | 12 | ||||
| -rw-r--r-- | server.env | 7 |
5 files changed, 34 insertions, 42 deletions
@@ -1,6 +1,6 @@ pkgbase = frp-panel pkgdesc = A multi node frp webui and for frp server and client management - pkgver = 0.0.10 + pkgver = 0.0.11 pkgrel = 1 url = https://github.com/VaalaCat/frp-panel install = frp-panel.install @@ -13,17 +13,11 @@ pkgbase = frp-panel backup = etc/frp-panel/client.env backup = etc/frp-panel/master.env backup = etc/frp-panel/server.env - source = frp-panel-0.0.10.tar.gz::https://github.com/VaalaCat/frp-panel/archive/refs/tags/v0.0.10.tar.gz + source = frp-panel-0.0.11.tar.gz::https://github.com/VaalaCat/frp-panel/archive/refs/tags/v0.0.11.tar.gz source = frp-panel.tmpfiles source = frp-panel@.service - source = client.env - source = master.env - source = server.env - sha256sums = 2aa83c1d3236cb891d10aa551e223568b116924a8102e3c17946bd2b6daeaaa6 + sha256sums = 33bca8c3134299c59863f9a8901e7fffdad9abe89f10e3d394f1f716d79879b3 sha256sums = d909eac5b51218404824363ce35886fcd2a8065773ffecde8f64855a107369a0 sha256sums = a82a0d6fb9498a283137a90862a4bf65486368cfe88c25f7b901d4d914da7ca4 - sha256sums = f2fc53b07bf23f1f4a75c6df2c4823129ed25540f9bee6984241bfa682613667 - sha256sums = 2badfc944453e83520f4f65a74dd013127c50fcf9b47d32dd924fc0924604551 - sha256sums = 51d40f4cf57cddea09fd888790dc16682057fc5583235e55134673bcc60915f8 pkgname = frp-panel @@ -1,7 +1,7 @@ # Maintainer: Evine Deng <evinedeng@hotmail.com> pkgname="frp-panel" -pkgver=0.0.10 +pkgver=0.0.11 pkgrel=1 pkgdesc="A multi node frp webui and for frp server and client management" arch=("any") @@ -17,16 +17,32 @@ makedepends=("npm" "go") install="${pkgname}.install" source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.tmpfiles" - "${pkgname}@.service" - "client.env" - "master.env" - "server.env") -sha256sums=('2aa83c1d3236cb891d10aa551e223568b116924a8102e3c17946bd2b6daeaaa6' + "${pkgname}@.service") +sha256sums=('33bca8c3134299c59863f9a8901e7fffdad9abe89f10e3d394f1f716d79879b3' 'd909eac5b51218404824363ce35886fcd2a8065773ffecde8f64855a107369a0' - 'a82a0d6fb9498a283137a90862a4bf65486368cfe88c25f7b901d4d914da7ca4' - 'f2fc53b07bf23f1f4a75c6df2c4823129ed25540f9bee6984241bfa682613667' - '2badfc944453e83520f4f65a74dd013127c50fcf9b47d32dd924fc0924604551' - '51d40f4cf57cddea09fd888790dc16682057fc5583235e55134673bcc60915f8') + 'a82a0d6fb9498a283137a90862a4bf65486368cfe88c25f7b901d4d914da7ca4') + +prepare() { + cd "${pkgname}-${pkgver}" + + local file_setting="conf/settings.go" + local n1 n2 + for element in App Master Server DB; do + n1=$(grep -nP "^\s${element} struct \{" "$file_setting" | awk -F: '{print $1}') + n2=$(grep -nP "env-prefix:\"${element^^}_\"" "$file_setting" | awk -F: '{print $1}') + awk -v n1="${n1}" -v n2="${n2}" -F '"' '{if(NR>n1 && NR<n2){print "##"$3" "$4","$5" "$6"\n#""'${element^^}_'"$2"=\"\"\n"}}' "$file_setting" >> master.env + done + + grep -A1 -B1 -P "#APP_SECRET=|#MASTER_RPC_HOST=|#MASTER_RPC_PORT=|#MASTER_API_PORT=" master.env > client.env + echo "## For client nodes, need append clientSecret and clientID after start command, such as: " >> server.env + echo "START_PARAMS=\"-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i 'node.c.1'\"" >> client.env + echo "START_PARAMS=\"\"" >> client.env + + grep -A1 -B1 -P "#APP_SECRET=|#MASTER_RPC_HOST=|#MASTER_RPC_PORT=|#MASTER_API_PORT=" master.env > server.env + echo "## For server nodes, need append clientSecret and clientID after start command, such as: " >> server.env + echo "#START_PARAMS=\"-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i default\"" >> server.env + echo "START_PARAMS=\"\"" >> server.env +} build() { cd "${pkgname}-${pkgver}" @@ -59,5 +75,5 @@ package() { install -Dm644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" install -Dm644 "../${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service" - install -Dm644 -t "${pkgdir}/etc/${pkgname}" ../*.env + install -Dm644 -t "${pkgdir}/etc/${pkgname}" {master,server,client}.env } diff --git a/client.env b/client.env index 068fdf82215f..ac1bd7d970e5 100644 --- a/client.env +++ b/client.env @@ -1,8 +1,5 @@ -## For client nodes, '-s' and '-i' are mandatory settings, please set others as needed, such as: -## START_PARAMS="-s abcdefghijklmn -i 1234567890" - -## 对client节点，-s和-i是必须设置的，其他请根据需要设置，形如: -## START_PARAMS="-s abcdefghijklmn -i 1234567890" +## For client nodes, such as: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i 'node.c.1'" +## 对client节点，形如: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i 'node.c.1'" # Usage: # frp-panel client [-s client_secret] [-i client_id] [-a app_secret] [-r rpc_host] [-c rpc_port] [-p api_port] [flags] diff --git a/master.env b/master.env deleted file mode 100644 index 57f5c6ab3ce3..000000000000 --- a/master.env +++ /dev/null @@ -1,12 +0,0 @@ -## GIN debug or release mod -GIN_MODE=release - -## Master Secret -APP_GLOBAL_SECRET="" - -## Bind address -MASTER_RPC_HOST="0.0.0.0" - -## for master, currently no parameters to set -## 对master节点，暂时没有可以设置的参数 -START_PARAMS="" diff --git a/server.env b/server.env index d4ef07bfcd0b..0d4d70e5a9e1 100644 --- a/server.env +++ b/server.env @@ -1,8 +1,5 @@ -## For server nodes, '-s' and '-i' are mandatory settings, please set others as needed, such as: -## START_PARAMS="-s 'abcdefghijklmn' -i '1234567890'" - -## 对server节点，-s和-i是必须设置的，其他请根据需要设置，形如: -## START_PARAMS="-s 'abcdefghijklmn' -i '1234567890'" +## For client nodes, such as: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i default" +## 对client节点，形如: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i default" # Usage: # frp-panel server [-s client_secret] [-i client_id] [-a app_secret] [-r rpc_host] [-c rpc_port] [-p api_port] [flags] |