Merge pull request #1393 from hmalphettes/systemd-user

Support for targeting `systemd --user`
coreos · Jul 11, 2016 · 72e1d96 · 72e1d96
2 parents a1a21b8 + 9b83262
commit 72e1d96
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/config/config.go b/config/config.go
@@ -34,6 +34,8 @@ type Config struct {
 	DisableEngine           bool
 	DisableWatches          bool
 	VerifyUnits             bool
+	UnitsDirectory          string
+	SystemdUser             bool
 	AuthorizedKeysFile      string
 }
 

diff --git a/fleetd/fleetd.go b/fleetd/fleetd.go
@@ -86,6 +86,8 @@ func main() {
 	cfgset.String("public_ip", "", "IP address that fleet machine should publish")
 	cfgset.String("metadata", "", "List of key-value metadata to assign to the fleet machine")
 	cfgset.String("agent_ttl", agent.DefaultTTL, "TTL in seconds of fleet machine state in etcd")
+	cfgset.String("units_directory", "/run/fleet/units/", "Path to the fleet units directory")
+	cfgset.Bool("systemd_user", false, "When true use systemd --user)")
 	cfgset.Int("token_limit", 100, "Maximum number of entries per page returned from API requests")
 	cfgset.Bool("disable_engine", false, "Disable the engine entirely, use with care")
 	cfgset.Bool("disable_watches", false, "Disable the use of etcd watches. Increases scheduling latency")
@@ -225,6 +227,8 @@ func getConfig(flagset *flag.FlagSet, userCfgFile string) (*config.Config, error
 		DisableEngine:           (*flagset.Lookup("disable_engine")).Value.(flag.Getter).Get().(bool),
 		DisableWatches:          (*flagset.Lookup("disable_watches")).Value.(flag.Getter).Get().(bool),
 		VerifyUnits:             (*flagset.Lookup("verify_units")).Value.(flag.Getter).Get().(bool),
+		UnitsDirectory:          (*flagset.Lookup("units_directory")).Value.(flag.Getter).Get().(string),
+		SystemdUser:             (*flagset.Lookup("systemd_user")).Value.(flag.Getter).Get().(bool),
 		TokenLimit:              (*flagset.Lookup("token_limit")).Value.(flag.Getter).Get().(int),
 		AuthorizedKeysFile:      (*flagset.Lookup("authorized_keys_file")).Value.(flag.Getter).Get().(string),
 	}

diff --git a/functional/systemd_test.go b/functional/systemd_test.go
@@ -35,7 +35,7 @@ func TestSystemdUnitFlow(t *testing.T) {
 	}
 	defer os.RemoveAll(uDir)
 
-	mgr, err := systemd.NewSystemdUnitManager(uDir)
+	mgr, err := systemd.NewSystemdUnitManager(uDir, false)
 	if err != nil {
 		t.Fatalf("Failed initializing SystemdUnitManager: %v", err)
 	}

diff --git a/server/server.go b/server/server.go
@@ -75,7 +75,7 @@ func New(cfg config.Config, listeners []net.Listener) (*Server, error) {
 		return nil, err
 	}
 
-	mgr, err := systemd.NewSystemdUnitManager(systemd.DefaultUnitsDirectory)
+	mgr, err := systemd.NewSystemdUnitManager(cfg.UnitsDirectory, cfg.SystemdUser)
 	if err != nil {
 		return nil, err
 	}

diff --git a/systemd/manager.go b/systemd/manager.go
@@ -28,10 +28,6 @@ import (
 	"github.com/coreos/fleet/unit"
 )
 
-const (
-	DefaultUnitsDirectory = "/run/fleet/units/"
-)
-
 type systemdUnitManager struct {
 	systemd  *dbus.Conn
 	unitsDir string
@@ -40,8 +36,8 @@ type systemdUnitManager struct {
 	mutex  sync.RWMutex
 }
 
-func NewSystemdUnitManager(uDir string) (*systemdUnitManager, error) {
-	systemd, err := dbus.New()
+func NewSystemdUnitManager(uDir string, systemdUser bool) (*systemdUnitManager, error) {
+	systemd, err := createDbusConnection(systemdUser)
 	if err != nil {
 		return nil, err
 	}
@@ -64,6 +60,13 @@ func NewSystemdUnitManager(uDir string) (*systemdUnitManager, error) {
 	return &mgr, nil
 }
 
+func createDbusConnection(systemdUser bool) (*dbus.Conn, error) {
+	if systemdUser {
+		return dbus.NewUserConnection()
+	}
+	return dbus.New()
+}
+
 func hashUnitFiles(dir string) (map[string]unit.Hash, error) {
 	uNames, err := lsUnitsDir(dir)
 	if err != nil {