This commit is contained in:
@@ -1,62 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/fonu/fonu/internal/agent"
|
||||
)
|
||||
|
||||
func main() {
|
||||
listen := flag.String("listen", envOr("FONU_AGENT_LISTEN", "127.0.0.1:7700"), "agent listen address")
|
||||
allowRemote := flag.Bool("allow-remote", envBool("FONU_AGENT_ALLOW_REMOTE"), "allow non-loopback listen address")
|
||||
token := flag.String("token", os.Getenv("FONU_AGENT_TOKEN"), "agent bearer token")
|
||||
nginxDir := flag.String("nginx-conf-dir", envOr("FONU_AGENT_NGINX_CONF_DIR", ""), "managed nginx config directory(留空自动探测 Nginx 实际加载的 vhost 目录)")
|
||||
certsDir := flag.String("certs-dir", envOr("FONU_AGENT_CERTS_DIR", "/var/lib/fonu-agent/certs"), "certificate directory")
|
||||
frpsConfig := flag.String("frps-config", envOr("FONU_AGENT_FRPS_CONFIG", "/etc/frp/frps.toml"), "frps config path")
|
||||
frpsBin := flag.String("frps-bin", envOr("FONU_AGENT_FRPS_BIN", "frps"), "frps binary")
|
||||
dataDir := flag.String("data-dir", envOr("FONU_AGENT_DATA_DIR", "/var/lib/fonu-agent"), "agent data directory")
|
||||
showVersion := flag.Bool("version", false, "print agent version and exit")
|
||||
flag.Parse()
|
||||
if *showVersion {
|
||||
fmt.Println("fonu-agent", agent.AgentVersion)
|
||||
return
|
||||
}
|
||||
if *token == "" {
|
||||
log.Fatal("FONU_AGENT_TOKEN or -token is required")
|
||||
}
|
||||
server, err := agent.NewServer(agent.Config{
|
||||
ListenAddr: *listen, AllowRemote: *allowRemote, Token: *token, NginxConfDir: *nginxDir,
|
||||
CertsDir: *certsDir, FrpsConfigPath: *frpsConfig, FrpsBinary: *frpsBin, DataDir: *dataDir,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
if err := server.ListenAndServe(ctx); err != nil && ctx.Err() == nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func envOr(key, fallback string) string {
|
||||
if value := os.Getenv(key); value != "" {
|
||||
return value
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func envBool(key string) bool {
|
||||
switch strings.ToLower(strings.TrimSpace(os.Getenv(key))) {
|
||||
case "1", "true", "yes", "on":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
|
||||
"github.com/fonu/fonu/internal/updater"
|
||||
)
|
||||
|
||||
func main() {
|
||||
server, err := updater.NewServer(updater.Config{
|
||||
SocketPath: envOr("FONU_UPDATER_SOCKET", "/run/fonu-updater/updater.sock"),
|
||||
ProjectDir: envOr("FONU_UPDATE_PROJECT_DIR", "/workspace"),
|
||||
ComposeFile: envOr("FONU_UPDATE_COMPOSE_FILE", "docker-compose.yml"),
|
||||
Service: envOr("FONU_UPDATE_SERVICE", "fonu"),
|
||||
Mode: envOr("FONU_UPDATE_MODE", "local"),
|
||||
RepoURL: envOr("FONU_UPDATE_REPO", ""),
|
||||
Branch: envOr("FONU_UPDATE_BRANCH", "main"),
|
||||
AppURL: envOr("FONU_UPDATE_APP_URL", "http://fonu:6893"),
|
||||
HostProjectDir: envOr("FONU_UPDATE_HOST_DIR", ""),
|
||||
ProjectName: envOr("FONU_UPDATE_PROJECT_NAME", ""),
|
||||
SelfImage: envOr("FONU_UPDATE_SELF_IMAGE", ""),
|
||||
DockerSocket: envOr("FONU_UPDATE_DOCKER_SOCK", "/var/run/docker.sock"),
|
||||
}, nil)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
if err := server.Serve(ctx); err != nil && ctx.Err() == nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func envOr(key, fallback string) string {
|
||||
if value := os.Getenv(key); value != "" {
|
||||
return value
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/havline/havline/internal/agent"
|
||||
)
|
||||
|
||||
func main() {
|
||||
listen := flag.String("listen", envOr("HAVLINE_AGENT_LISTEN", "127.0.0.1:7700"), "agent listen address")
|
||||
allowRemote := flag.Bool("allow-remote", envBool("HAVLINE_AGENT_ALLOW_REMOTE"), "allow non-loopback listen address")
|
||||
token := flag.String("token", os.Getenv("HAVLINE_AGENT_TOKEN"), "agent bearer token")
|
||||
nginxDir := flag.String("nginx-conf-dir", envOr("HAVLINE_AGENT_NGINX_CONF_DIR", ""), "managed nginx config directory(留空自动探测 Nginx 实际加载的 vhost 目录)")
|
||||
certsDir := flag.String("certs-dir", envOr("HAVLINE_AGENT_CERTS_DIR", "/var/lib/havline-agent/certs"), "certificate directory")
|
||||
frpsConfig := flag.String("frps-config", envOr("HAVLINE_AGENT_FRPS_CONFIG", "/etc/frp/frps.toml"), "frps config path")
|
||||
frpsBin := flag.String("frps-bin", envOr("HAVLINE_AGENT_FRPS_BIN", "frps"), "frps binary")
|
||||
dataDir := flag.String("data-dir", envOr("HAVLINE_AGENT_DATA_DIR", "/var/lib/havline-agent"), "agent data directory")
|
||||
showVersion := flag.Bool("version", false, "print agent version and exit")
|
||||
flag.Parse()
|
||||
if *showVersion {
|
||||
fmt.Println("havline-agent", agent.AgentVersion)
|
||||
return
|
||||
}
|
||||
if *token == "" {
|
||||
log.Fatal("HAVLINE_AGENT_TOKEN or -token is required")
|
||||
}
|
||||
server, err := agent.NewServer(agent.Config{
|
||||
ListenAddr: *listen, AllowRemote: *allowRemote, Token: *token, NginxConfDir: *nginxDir,
|
||||
CertsDir: *certsDir, FrpsConfigPath: *frpsConfig, FrpsBinary: *frpsBin, DataDir: *dataDir,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
if err := server.ListenAndServe(ctx); err != nil && ctx.Err() == nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func envOr(key, fallback string) string {
|
||||
if value := os.Getenv(key); value != "" {
|
||||
return value
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
|
||||
func envBool(key string) bool {
|
||||
switch strings.ToLower(strings.TrimSpace(os.Getenv(key))) {
|
||||
case "1", "true", "yes", "on":
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
|
||||
"github.com/havline/havline/internal/updater"
|
||||
)
|
||||
|
||||
func main() {
|
||||
server, err := updater.NewServer(updater.Config{
|
||||
SocketPath: envOr("HAVLINE_UPDATER_SOCKET", "/run/havline-updater/updater.sock"),
|
||||
ProjectDir: envOr("HAVLINE_UPDATE_PROJECT_DIR", "/workspace"),
|
||||
ComposeFile: envOr("HAVLINE_UPDATE_COMPOSE_FILE", "docker-compose.yml"),
|
||||
Service: envOr("HAVLINE_UPDATE_SERVICE", "havline"),
|
||||
Mode: envOr("HAVLINE_UPDATE_MODE", "local"),
|
||||
RepoURL: envOr("HAVLINE_UPDATE_REPO", ""),
|
||||
Branch: envOr("HAVLINE_UPDATE_BRANCH", "main"),
|
||||
AppURL: envOr("HAVLINE_UPDATE_APP_URL", "http://havline:6893"),
|
||||
HostProjectDir: envOr("HAVLINE_UPDATE_HOST_DIR", ""),
|
||||
ProjectName: envOr("HAVLINE_UPDATE_PROJECT_NAME", ""),
|
||||
SelfImage: envOr("HAVLINE_UPDATE_SELF_IMAGE", ""),
|
||||
DockerSocket: envOr("HAVLINE_UPDATE_DOCKER_SOCK", "/var/run/docker.sock"),
|
||||
}, nil)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
if err := server.Serve(ctx); err != nil && ctx.Err() == nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func envOr(key, fallback string) string {
|
||||
if value := os.Getenv(key); value != "" {
|
||||
return value
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
@@ -12,8 +12,8 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/fonu/fonu/internal/app"
|
||||
"github.com/fonu/fonu/internal/config"
|
||||
"github.com/havline/havline/internal/app"
|
||||
"github.com/havline/havline/internal/config"
|
||||
)
|
||||
|
||||
//go:embed all:web/dist
|
||||
Reference in New Issue
Block a user