arch/tclip
1
0
Fork 0
Code Pull requests Actions Packages Activity

Formatting
All checks were successful
Nix build / build-docker (pull_request) Successful in 2m9s
Details
Nix build / build-docker-arm (pull_request) Successful in 4m53s
Details

Browse source
This commit is contained in:
Gabriel Simmer 2024-04-30 17:07:14 +01:00
parent 242e1c81a3
commit 9605a9d6f6
Signed by: arch
SSH key fingerprint: SHA256:m3OEcdtrnBpMX+2BDGh/byv3hrCekCLzDYMdvGEKPPQ
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmd/tclipd/main.go
View file

@ -23,11 +23,11 @@ import (
"github.com/go-enry/go-enry/v2" "github.com/go-enry/go-enry/v2"
"github.com/google/uuid" "github.com/google/uuid"
_ "github.com/lib/pq"
"github.com/microcosm-cc/bluemonday" "github.com/microcosm-cc/bluemonday"
"github.com/niklasfasching/go-org/org" "github.com/niklasfasching/go-org/org"
"github.com/russross/blackfriday" "github.com/russross/blackfriday"
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
_ "github.com/lib/pq"
"tailscale.com/client/tailscale" "tailscale.com/client/tailscale"
"tailscale.com/client/tailscale/apitype" "tailscale.com/client/tailscale/apitype"
"tailscale.com/ipn" "tailscale.com/ipn"
@ -36,12 +36,12 @@ import (
) )
var ( var (
hostname = flag.String("hostname", envOr("TSNET_HOSTNAME", "paste"), "hostname to use on your tailnet, TSNET_HOSTNAME in the environment") hostname = flag.String("hostname", envOr("TSNET_HOSTNAME", "paste"), "hostname to use on your tailnet, TSNET_HOSTNAME in the environment")
dataDir = flag.String("data-location", dataLocation(), "where data is stored, defaults to DATA_DIR or ~/.config/tailscale/paste") dataDir = flag.String("data-location", dataLocation(), "where data is stored, defaults to DATA_DIR or ~/.config/tailscale/paste")
tsnetLogVerbose = flag.Bool("tsnet-verbose", hasEnv("TSNET_VERBOSE"), "if set, have tsnet log verbosely to standard error") tsnetLogVerbose = flag.Bool("tsnet-verbose", hasEnv("TSNET_VERBOSE"), "if set, have tsnet log verbosely to standard error")
useFunnel = flag.Bool("use-funnel", hasEnv("USE_FUNNEL"), "if set, expose individual pastes to the public internet with Funnel, USE_FUNNEL in the environment") useFunnel = flag.Bool("use-funnel", hasEnv("USE_FUNNEL"), "if set, expose individual pastes to the public internet with Funnel, USE_FUNNEL in the environment")
hidePasteUserInfo = flag.Bool("hide-funnel-users", hasEnv("HIDE_FUNNEL_USERS"), "if set, display the username and profile picture of the user who created the paste in funneled pastes") hidePasteUserInfo = flag.Bool("hide-funnel-users", hasEnv("HIDE_FUNNEL_USERS"), "if set, display the username and profile picture of the user who created the paste in funneled pastes")
databaseUrl = flag.String("database-url", envOr("DATABASE_URL", ""), "optional database url if you'd rather use Postgres instead of sqlite") databaseUrl = flag.String("database-url", envOr("DATABASE_URL", ""), "optional database url if you'd rather use Postgres instead of sqlite")
//go:embed schema.sql //go:embed schema.sql
sqlSchema string sqlSchema string
@ -826,12 +826,12 @@ func (mch MixedCriticalityHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
func openDB(dir string, databaseUrl string) (*sql.DB, error) { func openDB(dir string, databaseUrl string) (*sql.DB, error) {
dbtype := "sqlite" dbtype := "sqlite"
dbpath := "file:"+filepath.Join(dir, "data.db") dbpath := "file:" + filepath.Join(dir, "data.db")
if databaseUrl != "" { if databaseUrl != "" {
dbtype = "postgres" dbtype = "postgres"
dbpath = databaseUrl dbpath = databaseUrl
} }
db, err := sql.Open(dbtype, dbpath) db, err := sql.Open(dbtype, dbpath)
if err != nil { if err != nil {
return nil, err return nil, err
@ -849,7 +849,7 @@ func openDB(dir string, databaseUrl string) (*sql.DB, error) {
return nil, err return nil, err
} }
} }
if _, err := db.Exec(sqlSchema); err != nil { if _, err := db.Exec(sqlSchema); err != nil {
return nil, err return nil, err
} }