From 57730f392a48574659ffa6efcd4397ef2054e93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 11 Jun 2022 12:38:36 +0200
Subject: [PATCH] fix defaults for systemd runtime directory

---
 Procfile | 2 +-
 justfile | 4 ++++
 main.go  | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Procfile b/Procfile
index be8bcb1..53eba59 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
 vault: vault server -dev
-systemd-vault: go run .
+systemd-vaultd: go run . -secrets tmp/secrets -sock tmp/sock
diff --git a/justfile b/justfile
index 7acb11b..788d264 100644
--- a/justfile
+++ b/justfile
@@ -17,3 +17,7 @@ lint:
 # Run unitests
 test:
      pytest -s ./tests
+
+# Local vault + systemd-vaultd
+up:
+    hivemind
diff --git a/main.go b/main.go
index 763c077..dc7efc1 100644
--- a/main.go
+++ b/main.go
@@ -142,13 +142,13 @@ var secretDir, socketDir string
 func init() {
 	defaultDir := os.Getenv("SYSTEMD_VAULT_SECRETS")
 	if defaultDir == "" {
-		defaultDir = "/run/systemd-vault"
+		defaultDir = "/run/systemd-vaultd/secrets"
 	}
 	flag.StringVar(&secretDir, "secrets", defaultDir, "directory where secrets are looked up")
 
 	defaultSock := os.Getenv("SYSTEMD_VAULT_SOCK")
 	if defaultSock == "" {
-		defaultSock = "/run/systemd-vault.sock"
+		defaultSock = "/run/systemd-vaultd/sock"
 	}
 	flag.StringVar(&socketDir, "sock", defaultSock, "unix socket to listen to for systemd requests")
 	flag.Parse()