further fun

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,

cmd/server/server.go

@@ -1,65 +0,0 @@
-/*
-   GoToSocial
-   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Affero General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package server
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/gotosocial/gotosocial/internal/config"
-	"github.com/gotosocial/gotosocial/internal/db"
-	"github.com/gotosocial/gotosocial/internal/log"
-	"github.com/urfave/cli/v2"
-)
-
-// Run starts the gotosocial server
-func Run(c *cli.Context) error {
-	log, err := log.New(c.String("log-level"))
-	if err != nil {
-		return fmt.Errorf("error creating logger: %s", err)
-	}
-
-	var gtsConfig *config.Config
-	if gtsConfig, err = config.New(c.String("config")); err != nil {
-		return fmt.Errorf("error creating config: %s", err)
-	}
-
-	ctx := context.Background()
-	dbService, err := db.NewService(ctx, gtsConfig.DBConfig, log)
-	if err != nil {
-		return fmt.Errorf("error creating dbservice: %s", err)
-	}
-
-	// catch shutdown signals from the operating system
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, os.Interrupt, syscall.SIGTERM)
-	sig := <-sigs
-	log.Infof("received signal %s, shutting down", sig)
-
-	// close down all running services in order
-	if err := dbService.Stop(ctx); err != nil {
-		return fmt.Errorf("error closing dbservice: %s", err)
-	}
-
-	log.Info("done! exiting...")
-	return nil
-}