From 979cef09fc9744938455bd451dfe0b5f1b96b812 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 20 Sep 2025 12:59:14 -0700 Subject: Revert "Support systemd dynamic user" This reverts commit 3d0eb1e9d214b8a0652b360313aa2d27eacc3a3a. --- roseh.moe.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roseh.moe.go b/roseh.moe.go index 033c6c1..681ab8e 100644 --- a/roseh.moe.go +++ b/roseh.moe.go @@ -21,7 +21,9 @@ import ( ) var ( - port = flag.Int("port", 42069, "port to listen on") + port = flag.Int("port", 42069, "port to listen on") + secretsFile = flag.String("secrets", "secrets", "path to the secrets file") + notepadFile = flag.String("notepad", "notepad", "path to save user notes") serverStartTime = time.Now() ) @@ -32,7 +34,7 @@ var ( ) func loadSecrets() error { - secrets, err := os.ReadFile(filepath.Join(os.Getenv("CONFIGURATION_DIRECTORY"), "secrets")) + secrets, err := os.ReadFile(*secretsFile) if err != nil { return err } @@ -193,7 +195,7 @@ var ( func notepad(w http.ResponseWriter, r *http.Request) { var currentContent string - if currentContentBytes, err := os.ReadFile(filepath.Join(os.Getenv("STATE_DIRECTORY"), "notepad")); err != nil { + if currentContentBytes, err := os.ReadFile(*notepadFile); err != nil { currentContent = fmt.Sprintf("Error reading notepad file: %s", err) } else { currentContent = string(currentContentBytes) @@ -207,7 +209,7 @@ func notepad(w http.ResponseWriter, r *http.Request) { } func saveNote(content []byte) error { - f, err := os.CreateTemp(os.Getenv("STATE_DIRECTORY"), "notepad") + f, err := os.CreateTemp(filepath.Dir(*notepadFile), "notepad") if err != nil { return err } @@ -218,7 +220,7 @@ func saveNote(content []byte) error { if err := f.Close(); err != nil { return err } - return os.Rename(f.Name(), filepath.Join(os.Getenv("STATE_DIRECTORY"), "notepad")) + return os.Rename(f.Name(), *notepadFile) } func autosave(w http.ResponseWriter, r *http.Request) { -- cgit v1.3.1