rebrand: frp -> kanhole (kanhole server, kanholec client)
golangci-lint / lint (push) Failing after 1m5s
golangci-lint / lint (push) Failing after 1m5s
This commit is contained in:
+15
-15
@@ -15,12 +15,12 @@ import (
|
||||
"github.com/gorilla/mux"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
|
||||
"github.com/fatedier/frp/pkg/db"
|
||||
"github.com/fatedier/frp/pkg/db/ent"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db"
|
||||
"kanhole/pkg/db/ent"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
type sessionInfo struct {
|
||||
@@ -536,7 +536,7 @@ serverPort = %d
|
||||
auth.token = %q
|
||||
`, serverAddr, serverPort, authToken)
|
||||
|
||||
oneLiner := fmt.Sprintf(`curl -sL https://github.com/fatedier/frp/releases/latest/download/frp_linux_amd64.tar.gz | tar xz && cat > frpc.toml << 'EOF'
|
||||
oneLiner := fmt.Sprintf(`curl -sL https://kanhole/releases/latest/download/frp_linux_amd64.tar.gz | tar xz && cat > frpc.toml << 'EOF'
|
||||
%s
|
||||
EOF
|
||||
./frp_*/frpc -c frpc.toml`, frpcConfig)
|
||||
@@ -578,8 +578,8 @@ func (h *Handler) handleClientConfigDownload(w http.ResponseWriter, r *http.Requ
|
||||
|
||||
proxies, _ := db.Client().Proxy.Query().Where(proxy.ClientIDEQ(c.ID)).All(ctx)
|
||||
|
||||
content := fmt.Sprintf(`# frpc config for %s
|
||||
# Auto-generated by frp admin dashboard
|
||||
content := fmt.Sprintf(`# kanholec config for %s
|
||||
# Auto-generated by kanhole admin dashboard
|
||||
|
||||
serverAddr = %q
|
||||
serverPort = %d
|
||||
@@ -624,11 +624,11 @@ func (h *Handler) handleClientProvisionScript(w http.ResponseWriter, r *http.Req
|
||||
serverHost := r.Host
|
||||
|
||||
script := fmt.Sprintf(`#!/bin/bash
|
||||
# frp auto-provisioning for: %s
|
||||
# kanhole auto-provisioning for: %s
|
||||
set -e
|
||||
CONFIG_URL="http://%s/admin/api/frpc/proxy-config/%s"
|
||||
echo "==> Downloading frpc with server-config support..."
|
||||
curl -sL https://github.com/fatedier/frp/releases/latest/download/frp_linux_amd64.tar.gz | tar xz
|
||||
curl -sL https://kanhole/releases/latest/download/frp_linux_amd64.tar.gz | tar xz
|
||||
FRPC_DIR=$(ls -d frp_* 2>/dev/null | head -1)
|
||||
echo "==> Starting frpc for %s..."
|
||||
"$FRPC_DIR/frpc" --server-config "$CONFIG_URL"
|
||||
@@ -790,8 +790,8 @@ func (h *Handler) writeClientConfig(w http.ResponseWriter, ctx context.Context,
|
||||
|
||||
proxies, _ := db.Client().Proxy.Query().Where(proxy.ClientIDEQ(c.ID)).All(ctx)
|
||||
|
||||
content := fmt.Sprintf(`# frpc config for %s
|
||||
# Auto-generated by frp admin server
|
||||
content := fmt.Sprintf(`# kanholec config for %s
|
||||
# Auto-generated by kanhole admin server
|
||||
|
||||
serverAddr = %q
|
||||
serverPort = %d
|
||||
@@ -839,8 +839,8 @@ func (h *Handler) handleFrpcProxyConfig(w http.ResponseWriter, r *http.Request)
|
||||
|
||||
proxies, _ := db.Client().Proxy.Query().Where(proxy.ClientIDEQ(client.ID)).All(ctx)
|
||||
|
||||
content := fmt.Sprintf(`# frpc config for %s
|
||||
# Auto-generated by frp admin server
|
||||
content := fmt.Sprintf(`# kanholec config for %s
|
||||
# Auto-generated by kanhole admin server
|
||||
|
||||
serverAddr = %q
|
||||
serverPort = %d
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<div style="border:1px solid var(--border);padding:20px;margin-bottom:16px">
|
||||
<h2 style="font-size:12px;font-weight:600;letter-spacing:.3px;color:var(--fg2);margin-bottom:12px;text-transform:uppercase">One-Liner Setup</h2>
|
||||
<p style="font-size:12px;color:var(--fg2);margin-bottom:8px">Run this on your client machine. It downloads frpc and auto-updates from this server:</p>
|
||||
<pre class="text-mono" style="padding:12px;background:var(--bg2);border:1px solid var(--border);overflow-x:auto;white-space:pre-wrap;word-break:break-all;font-size:12px">curl -sL https://github.com/fatedier/frp/releases/latest/download/frp_linux_amd64.tar.gz | tar xz \
|
||||
<pre class="text-mono" style="padding:12px;background:var(--bg2);border:1px solid var(--border);overflow-x:auto;white-space:pre-wrap;word-break:break-all;font-size:12px">curl -sL https://github.com/kanhole/kanhole/releases/latest/download/frp_linux_amd64.tar.gz | tar xz \
|
||||
&& ./frp_*/frpc --server-config http://{{.ServerAddr}}:{{.ServerPort}}/admin/api/frpc/proxy-config/{{.Client.Key}}</pre>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user