run vtun with s6

cmd/server.go

@@ -52,11 +52,6 @@ func runServer(cmd *cobra.Command, _ []string) error {
 
  olsrdExitedChan := olsrd.Run(ctx)
 
- vtunExitedChan := make(chan struct{})
- if !config.DisableVTun {
- vtunExitedChan = vtun.Run(ctx)
- }
-
  // Start the metrics server
  go metrics.CreateMetricsServer(config, cmd.Root().Version)
  log.Printf("Metrics server started")
@@ -147,19 +142,6 @@ func runServer(cmd *cobra.Command, _ []string) error {
  }
  })
 
- if !config.DisableVTun {
- errGrp.Go(func() error {
- ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
- defer cancel()
- select {
- case <-ctx.Done():
- return fmt.Errorf("vtund did not exit in time")
- case <-vtunExitedChan:
- return nil
- }
- })
- }
-
  errGrp.Go(func() error {
  return wireguardManager.Stop()
  })

internal/vtun/reload.go

@@ -1,10 +1,33 @@
 package vtun
 
 import (
+ "os"
+ "strconv"
+ "syscall"
+
  "github.com/USA-RedDragon/aredn-manager/internal/db/models"
  "gorm.io/gorm"
 )
 
+// This file will run vtund
+const (
+ pidFile = "/usr/var/run/vtund.pid"
+)
+
+func Reload() error {
+ // Read the PID file
+ pidBytes, err := os.ReadFile(pidFile)
+ if err != nil {
+ return err
+ }
+ pidStr := string(pidBytes)
+ pid, err := strconv.ParseInt(pidStr, 10, 64)
+ if err != nil {
+ return err
+ }
+ return syscall.Kill(int(pid), syscall.SIGHUP)
+}
+
 func ReloadAllClients(db *gorm.DB, watcher *ClientWatcher) error {
  tunnels, err := models.ListClientTunnels(db)
  if err != nil {
@@ -16,3 +39,17 @@ func ReloadAllClients(db *gorm.DB, watcher *ClientWatcher) error {
  }
  return nil
 }
+
+func IsRunning() bool {
+ pidBytes, err := os.ReadFile(pidFile)
+ if err != nil {
+ return false
+ }
+ pidStr := string(pidBytes)
+ pid, err := strconv.ParseInt(pidStr, 10, 64)
+ if err != nil {
+ return false
+ }
+ err = syscall.Kill(int(pid), 0)
+ return err == nil
+}