From ebb50292557f0f50095eb908a7a3e11ca0ee3447 Mon Sep 17 00:00:00 2001 From: Mark Heily Date: Mon, 23 May 2016 22:17:31 -0400 Subject: [PATCH 1/4] 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 From 22e9088a810c24427b0bd1345391d60bb65e3801 Mon Sep 17 00:00:00 2001 From: Mark Heily Date: Mon, 23 May 2016 22:20:10 -0400 Subject: [PATCH 2/4] Remove /usr/local/share path --- src/sysadm.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sysadm.pro b/src/sysadm.pro index fb829b9..0d5b6d2 100644 --- a/src/sysadm.pro +++ b/src/sysadm.pro @@ -9,10 +9,10 @@ rcd.extra = cp rc.d/* $(INSTALL_ROOT)/usr/local/etc/rc.d/ 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.path = /usr/local/etc/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.path = /usr/local/etc/job.d/ 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/ From f5bdfc4f1d84cdc63f79c381f98b49902dd4681d Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Tue, 24 May 2016 09:42:12 -0400 Subject: [PATCH 3/4] Fix pkg-plist --- src/port-files/pkg-plist | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/port-files/pkg-plist b/src/port-files/pkg-plist index 523cb07..55d1892 100644 --- a/src/port-files/pkg-plist +++ b/src/port-files/pkg-plist @@ -2,11 +2,9 @@ bin/sysadm-binary bin/sysadm-server bin/sysadm-bridge bin/sysadm-bridge-start -etc/launchd/daemons/org.pcbsd.sysadm.json.dist -etc/launchd/daemons/org.pcbsd.sysadm-rest.json.dist +etc/jobd/org.pcbsd.sysadm.json +etc/jobd/org.pcbsd.sysadm-rest.json etc/sysadm.conf.dist etc/rc.d/sysadm etc/rc.d/sysadm-bridge etc/rc.d/sysadm-rest -share/launchd/daemons/org.pcbsd.sysadm.json -share/launchd/daemons/org.pcbsd.sysadm-rest.json From dc7b2f613857a9f1f22ff059ece8f93f1d74b0d4 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Tue, 24 May 2016 09:43:30 -0400 Subject: [PATCH 4/4] Opps fix typo --- src/port-files/pkg-plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/port-files/pkg-plist b/src/port-files/pkg-plist index 55d1892..c5ac613 100644 --- a/src/port-files/pkg-plist +++ b/src/port-files/pkg-plist @@ -2,8 +2,8 @@ bin/sysadm-binary bin/sysadm-server bin/sysadm-bridge bin/sysadm-bridge-start -etc/jobd/org.pcbsd.sysadm.json -etc/jobd/org.pcbsd.sysadm-rest.json +etc/job.d/org.pcbsd.sysadm.json +etc/job.d/org.pcbsd.sysadm-rest.json etc/sysadm.conf.dist etc/rc.d/sysadm etc/rc.d/sysadm-bridge