From 0c7abaaffbd771aae199bcc394a6a5ee50ce2b95 Mon Sep 17 00:00:00 2001
From: TomZ <tom@flowee.org>
Date: Sat, 24 Jul 2021 12:58:10 +0200
Subject: [PATCH] Match sock file default to systemd setup.

The `AdminListen` option and `yggdrasilctl` now default to
`unix:///var/run/yggdrasil/yggdrasil.sock` on Linux

This allows yggdrasil to be run as its own user.

Closes #802
---
 CHANGELOG.md                   | 6 ++++++
 src/defaults/defaults_linux.go | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb418b11..ba96fc44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - in case of vulnerabilities.
 -->
 
+## [future]
+
+### Changed
+- The `AdminListen` option and `yggdrasilctl` now default to `unix:///var/run/yggdrasil/yggdrasil.sock` on Linux
+
+
 ## [0.4.2] - 2021-11-03
 ### Fixed
 - Reverted a dependency update which resulted in problems building with Go 1.16 and running on Windows
diff --git a/src/defaults/defaults_linux.go b/src/defaults/defaults_linux.go
index c7f5f119..3741a766 100644
--- a/src/defaults/defaults_linux.go
+++ b/src/defaults/defaults_linux.go
@@ -8,7 +8,7 @@ package defaults
 func GetDefaults() platformDefaultParameters {
 	return platformDefaultParameters{
 		// Admin
-		DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+		DefaultAdminListen: "unix:///var/run/yggdrasil/yggdrasil.sock",
 
 		// Configuration (used for yggdrasilctl)
 		DefaultConfigFile: "/etc/yggdrasil.conf",