From ebb50292557f0f50095eb908a7a3e11ca0ee3447 Mon Sep 17 00:00:00 2001
From: Mark Heily <mark@heily.com>
Date: Mon, 23 May 2016 22:17:31 -0400
Subject: [PATCH] Migrate relaunchd manifests to jobd

---
 src/daemons.d/org.pcbsd.sysadm-rest.json.dist |  5 -----
 src/daemons.d/org.pcbsd.sysadm.json.dist      |  5 -----
 src/job.d/org.pcbsd.sysadm-rest.json          |  5 +++++
 src/job.d/org.pcbsd.sysadm.json               |  5 +++++
 src/sysadm.pro                                | 12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/daemons.d/org.pcbsd.sysadm-rest.json.dist
 delete mode 100644 src/daemons.d/org.pcbsd.sysadm.json.dist
 create mode 100644 src/job.d/org.pcbsd.sysadm-rest.json
 create mode 100644 src/job.d/org.pcbsd.sysadm.json

diff --git a/src/daemons.d/org.pcbsd.sysadm-rest.json.dist b/src/daemons.d/org.pcbsd.sysadm-rest.json.dist
deleted file mode 100644
index 6b2ad52..0000000
--- a/src/daemons.d/org.pcbsd.sysadm-rest.json.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"Label": "org.pcbsd.sysadm-rest",
-	"ProgramArguments": [ "/usr/local/bin/sysadm-server", "-rest" ],
-	"RunAtLoad": false
-}
diff --git a/src/daemons.d/org.pcbsd.sysadm.json.dist b/src/daemons.d/org.pcbsd.sysadm.json.dist
deleted file mode 100644
index 5f239c1..0000000
--- a/src/daemons.d/org.pcbsd.sysadm.json.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"Label": "org.pcbsd.sysadm",
-	"Program": "/usr/local/bin/sysadm-server",
-	"RunAtLoad": true
-}
diff --git a/src/job.d/org.pcbsd.sysadm-rest.json b/src/job.d/org.pcbsd.sysadm-rest.json
new file mode 100644
index 0000000..04c3f1c
--- /dev/null
+++ b/src/job.d/org.pcbsd.sysadm-rest.json
@@ -0,0 +1,5 @@
+{
+	"Label": "org.pcbsd.sysadm-rest",
+	"Program": [ "/usr/local/bin/sysadm-server", "-rest" ],
+	"Enable": false
+}
diff --git a/src/job.d/org.pcbsd.sysadm.json b/src/job.d/org.pcbsd.sysadm.json
new file mode 100644
index 0000000..617ff27
--- /dev/null
+++ b/src/job.d/org.pcbsd.sysadm.json
@@ -0,0 +1,5 @@
+{
+	"Label": "org.pcbsd.sysadm",
+	"Program": ["/usr/local/bin/sysadm-server"],
+	"Enable": true
+}
diff --git a/src/sysadm.pro b/src/sysadm.pro
index 17b1da5..fb829b9 100644
--- a/src/sysadm.pro
+++ b/src/sysadm.pro
@@ -6,14 +6,14 @@ SUBDIRS+= server bridge
 rcd.path = /usr/local/etc/rc.d/
 rcd.extra = cp rc.d/* $(INSTALL_ROOT)/usr/local/etc/rc.d/
 
-dconf.path = /usr/local/etc/launchd/daemons/
-dconf.extra = cp daemons.d/* $(INSTALL_ROOT)/usr/local/etc/launchd/daemons/
-
-wsdaemon.path = /usr/local/share/launchd/daemons/
-wsdaemon.extra = cp daemons.d/org.pcbsd.sysadm.json.dist $(INSTALL_ROOT)/usr/local/share/launchd/daemons/org.pcbsd.sysadm.json
+dconf.path = /usr/local/etc/job.d/
+dconf.extra = cp job.d/* $(INSTALL_ROOT)/usr/local/etc/job.d/
 
+wsdaemon.path = /usr/local/share/job.d/
+wsdaemon.extra = cp job.d/org.pcbsd.sysadm.json $(INSTALL_ROOT)/usr/local/etc/job.d/org.pcbsd.sysadm.json
+-
 rstdaemon.path = /usr/local/share/launchd/daemons/
-rstdaemon.extra = cp daemons.d/org.pcbsd.sysadm-rest.json.dist $(INSTALL_ROOT)/usr/local/share/launchd/daemons/org.pcbsd.sysadm-rest.json
+rstdaemon.extra = cp job.d/org.pcbsd.sysadm-rest.json $(INSTALL_ROOT)/usr/local/etc/job.d/org.pcbsd.sysadm-rest.json
 
 conf.path = /usr/local/etc/
 conf.extra = cp conf/sysadm.conf ${INSTALL_ROOT}/usr/local/etc/sysadm.conf.dist