From 723e9257d2a9548c2a051cf76a1ee9c807cb0cc9 Mon Sep 17 00:00:00 2001 From: dominic Date: Thu, 24 Apr 2025 23:30:31 -0400 Subject: [PATCH] More deploymnet build stuff --- Makefile | 6 +++--- web/main.go | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a9088a9..302ceaa 100644 --- a/Makefile +++ b/Makefile @@ -25,12 +25,12 @@ img/clear: build: go build -o ./out/comfychan ./web - sudo mkdir -p /var/lib/comfychan/static - sudo mkdir -p /var/lib/comfychan/internal/database - sudo cp -r web/static/* /var/lib/comfychan/static/ deploy: + sudo mkdir -p /var/lib/comfychan/web/static + sudo mkdir -p /var/lib/comfychan/internal/database sudo cp ./out/comfychan /srv/comfychan/ + sudo cp -r web/static/* /var/lib/comfychan/web/static/ sudo chown root:root /srv/comfychan/comfychan db/deploy: diff --git a/web/main.go b/web/main.go index 20611c5..a580420 100644 --- a/web/main.go +++ b/web/main.go @@ -75,12 +75,14 @@ func main() { dataDir = "." // for development } + log.Println("DATADIR: ", dataDir) + util.POST_MEDIA_FULL_PATH = filepath.Join(dataDir, util.POST_MEDIA_FULL_PATH) util.POST_MEDIA_THUMB_PATH = filepath.Join(dataDir, util.POST_MEDIA_FULL_PATH) util.DATABASE_PATH = filepath.Join(dataDir, util.DATABASE_PATH) util.STATIC_PATH = filepath.Join(dataDir, util.STATIC_PATH) - db, err := sql.Open("sqlite3", "internal/database/comfychan.db") + db, err := sql.Open("sqlite3", util.DATABASE_PATH) if err != nil { log.Fatal(err) }