summaryrefslogtreecommitdiff
path: root/cmd/gotosocial/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/gotosocial/main.go')
-rw-r--r--cmd/gotosocial/main.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/cmd/gotosocial/main.go b/cmd/gotosocial/main.go
index ffb7b9b8d..26b9d49b6 100644
--- a/cmd/gotosocial/main.go
+++ b/cmd/gotosocial/main.go
@@ -21,7 +21,7 @@ package main
import (
"os"
- "github.com/gotosocial/gotosocial/cmd/server"
+ "github.com/gotosocial/gotosocial/internal/server"
"github.com/gotosocial/gotosocial/internal/consts"
"github.com/sirupsen/logrus"
@@ -32,6 +32,7 @@ func main() {
flagNames := consts.GetFlagNames()
envNames := consts.GetEnvNames()
app := &cli.App{
+ Usage: "a fediverse social media server",
Flags: []cli.Flag{
// GENERAL FLAGS
&cli.StringFlag{
@@ -47,6 +48,12 @@ func main() {
EnvVars: []string{envNames.ApplicationName},
Hidden: true,
},
+ &cli.StringFlag{
+ Name: flagNames.ConfigPath,
+ Usage: "Path to a yaml file containing gotosocial configuration. Values set in this file will be overwritten by values set as env vars or arguments",
+ Value: "",
+ EnvVars: []string{envNames.ConfigPath},
+ },
// DATABASE FLAGS
&cli.StringFlag{
@@ -76,9 +83,7 @@ func main() {
&cli.StringFlag{
Name: flagNames.DbPassword,
Usage: "Database password",
- Value: "postgres",
EnvVars: []string{envNames.DbPassword},
- FilePath: "./dbpass",
},
&cli.StringFlag{
Name: flagNames.DbDatabase,