ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

updated dependencies

Browse source
This commit is contained in:
ston1th 2023-04-01 19:50:50 +02:00
commit c9aa60ca28
155 changed files with 3240 additions and 1516 deletions
Download patch file Download diff file Expand all files Collapse all files

48
pkg/cmd/cmd.go
View file

@ -4,18 +4,19 @@ package cmd
import (
"encoding/json"
"git.giftfish.de/ston1th/godrop/v2"
"git.giftfish.de/ston1th/gowiki/pkg/core"
"git.giftfish.de/ston1th/gowiki/pkg/db"
"git.giftfish.de/ston1th/gowiki/pkg/log"
"git.giftfish.de/ston1th/gowiki/pkg/server"
"github.com/urfave/cli"
stdlog "log"
"net"
"os"
"os/signal"
"syscall"
"time"
"git.giftfish.de/ston1th/godrop/v2"
"git.giftfish.de/ston1th/gowiki/pkg/core"
"git.giftfish.de/ston1th/gowiki/pkg/db"
"git.giftfish.de/ston1th/gowiki/pkg/log"
"git.giftfish.de/ston1th/gowiki/pkg/server"
"github.com/urfave/cli"
)
const (
@ -23,8 +24,8 @@ const (
defListen = "127.0.0.1:8080"
defLogFile = "gowiki.log"
defRunUser = "wiki"
defRunGroup = "wiki"
defRunUser = "_wiki"
defRunGroup = "_wiki"
)
var (
@ -39,26 +40,27 @@ func initServer(cfg *core.Config) (err error) {
// if err = godrop.PledgePromises("stdio rpath wpath cpath inet fattr flock proc exec id unveil"); err != nil {
// return
// }
dropCfg := godrop.Config{
User: cfg.User,
Group: cfg.Group,
Foreground: cfg.Foreground,
}
err = godrop.Drop(dropCfg, func() (net.Listener, error) {
return net.Listen("tcp", cfg.ListenAddr)
})
if err != nil {
return
}
if err = os.Chdir(cfg.DataDir); err != nil {
return
}
//dropCfg := godrop.Config{
// User: cfg.User,
// Group: cfg.Group,
// Foreground: cfg.Foreground,
//}
//err = godrop.Drop(dropCfg, func() (net.Listener, error) {
// return net.Listen("tcp", cfg.ListenAddr)
//})
//if err != nil {
// return
//}
//if err = os.Chdir(cfg.DataDir); err != nil {
// return
//}
if err = godrop.PledgePromises("stdio rpath wpath cpath inet fattr flock unveil"); err != nil {
return
}
l, err := godrop.GetListener()
//l, err := godrop.GetListener()
l, err := net.Listen("tcp", cfg.ListenAddr)
if err != nil {
return
}