From c0c76557810c0053e8fd79fc822e54632720ccdd Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 09:44:10 -0500 Subject: [PATCH 1/6] Add OpenRC init.d services to the SysAdm build tree and port plist. --- port-files/pkg-plist | 3 +++ src/init.d/sysadm | 13 +++++++++++++ src/init.d/sysadm-bridge | 13 +++++++++++++ src/init.d/sysadm-rest | 13 +++++++++++++ src/sysadm.pro | 7 +++++-- 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100755 src/init.d/sysadm create mode 100755 src/init.d/sysadm-bridge create mode 100755 src/init.d/sysadm-rest diff --git a/port-files/pkg-plist b/port-files/pkg-plist index e4dcf27..f90269b 100644 --- a/port-files/pkg-plist +++ b/port-files/pkg-plist @@ -3,6 +3,9 @@ bin/sysadm-server bin/sysadm-bridge bin/sysadm-bridge-start etc/sysadm.conf.dist +etc/init.d/sysadm +etc/init.d/sysadm-bridge +etc/init.d/sysadm-rest etc/rc.d/sysadm etc/rc.d/sysadm-bridge etc/rc.d/sysadm-rest diff --git a/src/init.d/sysadm b/src/init.d/sysadm new file mode 100755 index 0000000..49af3f4 --- /dev/null +++ b/src/init.d/sysadm @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright (c) 2016 Ken Moore +# Released under the 2-clause BSD license + +command="/usr/local/bin/sysadm-server" +command_args="" +pid=/var/run/sysadm.pid +name="SysAdm Server (WebSocket)" + +depend() { + need syscons network + after bootmisc +} diff --git a/src/init.d/sysadm-bridge b/src/init.d/sysadm-bridge new file mode 100755 index 0000000..f3f3272 --- /dev/null +++ b/src/init.d/sysadm-bridge @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright (c) 2016 Ken Moore +# Released under the 2-clause BSD license + +command="/usr/local/bin/sysadm-bridge" +command_args="" +pid=/var/run/sysadm-bridge.pid +name="SysAdm Bridge" + +depend() { + need syscons network + after bootmisc +} diff --git a/src/init.d/sysadm-rest b/src/init.d/sysadm-rest new file mode 100755 index 0000000..84355f8 --- /dev/null +++ b/src/init.d/sysadm-rest @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright (c) 2016 Ken Moore +# Released under the 2-clause BSD license + +command="/usr/local/bin/sysadm-server" +command_args="-rest" +pid=/var/run/sysadm-rest.pid +name="SysAdm Server (REST)" + +depend() { + need syscons network + after bootmisc +} diff --git a/src/sysadm.pro b/src/sysadm.pro index 1e799bd..2339cbe 100644 --- a/src/sysadm.pro +++ b/src/sysadm.pro @@ -4,7 +4,10 @@ CONFIG += recursive SUBDIRS+= server bridge rcd.path = /usr/local/etc/rc.d/ -rcd.extra = cp rc.d/* $(INSTALL_ROOT)/usr/local/etc/rc.d/ +rcd.files = rc.d/sysadm rc.d/sysadm-rest rc.d/sysadm-bridge + +openrc.path = /usr/local/etc/init.d +openrc.files = init.d/sysadm init.d/sysadm-rest init.d/sysadm-bridge #dconf.path = /usr/local/etc/job.d/ #dconf.extra = cp job.d/* $(INSTALL_ROOT)/usr/local/etc/job.d/ @@ -18,4 +21,4 @@ rcd.extra = cp rc.d/* $(INSTALL_ROOT)/usr/local/etc/rc.d/ conf.path = /usr/local/etc/ conf.extra = cp conf/sysadm.conf ${INSTALL_ROOT}/usr/local/etc/sysadm.conf.dist -INSTALLS += rcd conf +INSTALLS += rcd openrc conf From a09dfabb2bfa0771827b161b8bc9a99f54f8c2b5 Mon Sep 17 00:00:00 2001 From: Joe Maloney Date: Thu, 10 Nov 2016 14:28:57 -0800 Subject: [PATCH 2/6] Make sysadm background --- src/init.d/sysadm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.d/sysadm b/src/init.d/sysadm index 49af3f4..3f54d5d 100755 --- a/src/init.d/sysadm +++ b/src/init.d/sysadm @@ -3,7 +3,7 @@ # Released under the 2-clause BSD license command="/usr/local/bin/sysadm-server" -command_args="" +command_args="&" pid=/var/run/sysadm.pid name="SysAdm Server (WebSocket)" From 752662ad8bf32d654bb93d7b3d722cc12146bf21 Mon Sep 17 00:00:00 2001 From: Joe Maloney Date: Thu, 10 Nov 2016 14:47:05 -0800 Subject: [PATCH 3/6] Also make other services background --- src/init.d/sysadm-bridge | 2 +- src/init.d/sysadm-rest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init.d/sysadm-bridge b/src/init.d/sysadm-bridge index f3f3272..139711f 100755 --- a/src/init.d/sysadm-bridge +++ b/src/init.d/sysadm-bridge @@ -3,7 +3,7 @@ # Released under the 2-clause BSD license command="/usr/local/bin/sysadm-bridge" -command_args="" +command_args="&" pid=/var/run/sysadm-bridge.pid name="SysAdm Bridge" diff --git a/src/init.d/sysadm-rest b/src/init.d/sysadm-rest index 84355f8..66f3e38 100755 --- a/src/init.d/sysadm-rest +++ b/src/init.d/sysadm-rest @@ -3,7 +3,7 @@ # Released under the 2-clause BSD license command="/usr/local/bin/sysadm-server" -command_args="-rest" +command_args="-rest &" pid=/var/run/sysadm-rest.pid name="SysAdm Server (REST)" From 645213c16da617270bfce1979cf3a3e7f07268cb Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Tue, 15 Nov 2016 23:08:44 -0500 Subject: [PATCH 4/6] Fix up the sysadm init.d scripts, set PREFIX properly and drop the useless & --- src/init.d/sysadm | 3 +-- src/init.d/sysadm-bridge | 3 +-- src/init.d/sysadm-rest | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/init.d/sysadm b/src/init.d/sysadm index 3f54d5d..fedd5fd 100755 --- a/src/init.d/sysadm +++ b/src/init.d/sysadm @@ -2,8 +2,7 @@ # Copyright (c) 2016 Ken Moore # Released under the 2-clause BSD license -command="/usr/local/bin/sysadm-server" -command_args="&" +command="%%PREFIX%%/bin/sysadm-server" pid=/var/run/sysadm.pid name="SysAdm Server (WebSocket)" diff --git a/src/init.d/sysadm-bridge b/src/init.d/sysadm-bridge index 139711f..aa2bb4f 100755 --- a/src/init.d/sysadm-bridge +++ b/src/init.d/sysadm-bridge @@ -2,8 +2,7 @@ # Copyright (c) 2016 Ken Moore # Released under the 2-clause BSD license -command="/usr/local/bin/sysadm-bridge" -command_args="&" +command="%%PREFIX%%/bin/sysadm-bridge" pid=/var/run/sysadm-bridge.pid name="SysAdm Bridge" diff --git a/src/init.d/sysadm-rest b/src/init.d/sysadm-rest index 66f3e38..483331d 100755 --- a/src/init.d/sysadm-rest +++ b/src/init.d/sysadm-rest @@ -2,8 +2,8 @@ # Copyright (c) 2016 Ken Moore # Released under the 2-clause BSD license -command="/usr/local/bin/sysadm-server" -command_args="-rest &" +command="%%PREFIX%%/bin/sysadm-server" +command_args="-rest" pid=/var/run/sysadm-rest.pid name="SysAdm Server (REST)" From a5d8bce6ab8cbe5a05b6c0919a484a5f6789e0b2 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Wed, 16 Nov 2016 14:42:56 -0500 Subject: [PATCH 5/6] Add the command_args to sysadm back, fixes a specific shutdown issue --- src/init.d/sysadm | 1 + src/init.d/sysadm-bridge | 1 + src/init.d/sysadm-rest | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/init.d/sysadm b/src/init.d/sysadm index fedd5fd..4ad4758 100755 --- a/src/init.d/sysadm +++ b/src/init.d/sysadm @@ -3,6 +3,7 @@ # Released under the 2-clause BSD license command="%%PREFIX%%/bin/sysadm-server" +command_args="&" pid=/var/run/sysadm.pid name="SysAdm Server (WebSocket)" diff --git a/src/init.d/sysadm-bridge b/src/init.d/sysadm-bridge index aa2bb4f..17249cc 100755 --- a/src/init.d/sysadm-bridge +++ b/src/init.d/sysadm-bridge @@ -3,6 +3,7 @@ # Released under the 2-clause BSD license command="%%PREFIX%%/bin/sysadm-bridge" +command_args="&" pid=/var/run/sysadm-bridge.pid name="SysAdm Bridge" diff --git a/src/init.d/sysadm-rest b/src/init.d/sysadm-rest index 483331d..3556a1e 100755 --- a/src/init.d/sysadm-rest +++ b/src/init.d/sysadm-rest @@ -3,7 +3,7 @@ # Released under the 2-clause BSD license command="%%PREFIX%%/bin/sysadm-server" -command_args="-rest" +command_args="-rest &" pid=/var/run/sysadm-rest.pid name="SysAdm Server (REST)" From 69501224ad42cc18af2a4898bc2f67e0ee1bea03 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Thu, 17 Nov 2016 22:08:31 -0500 Subject: [PATCH 6/6] Move sysadm init.d scripts to the port-files/files where they belong --- port-files/Makefile | 2 ++ .../sysadm-bridge => port-files/files/sysadm-bridge.in | 0 src/init.d/sysadm-rest => port-files/files/sysadm-rest.in | 0 src/init.d/sysadm => port-files/files/sysadm.in | 0 port-files/pkg-plist | 3 --- src/sysadm.pro | 5 +---- 6 files changed, 3 insertions(+), 7 deletions(-) rename src/init.d/sysadm-bridge => port-files/files/sysadm-bridge.in (100%) rename src/init.d/sysadm-rest => port-files/files/sysadm-rest.in (100%) rename src/init.d/sysadm => port-files/files/sysadm.in (100%) diff --git a/port-files/Makefile b/port-files/Makefile index 5e5e53a..5689286 100644 --- a/port-files/Makefile +++ b/port-files/Makefile @@ -15,6 +15,8 @@ USE_QT5= concurrent core network buildtools qmake gui websockets USES= pkgconfig tar:xz qmake MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} +USE_OPENRC_SUBR= sysadm sysadm-bridge sysadm-rest + USE_GITHUB= yes GH_ACCOUNT= pcbsd GH_PROJECT= sysadm diff --git a/src/init.d/sysadm-bridge b/port-files/files/sysadm-bridge.in similarity index 100% rename from src/init.d/sysadm-bridge rename to port-files/files/sysadm-bridge.in diff --git a/src/init.d/sysadm-rest b/port-files/files/sysadm-rest.in similarity index 100% rename from src/init.d/sysadm-rest rename to port-files/files/sysadm-rest.in diff --git a/src/init.d/sysadm b/port-files/files/sysadm.in similarity index 100% rename from src/init.d/sysadm rename to port-files/files/sysadm.in diff --git a/port-files/pkg-plist b/port-files/pkg-plist index f90269b..e4dcf27 100644 --- a/port-files/pkg-plist +++ b/port-files/pkg-plist @@ -3,9 +3,6 @@ bin/sysadm-server bin/sysadm-bridge bin/sysadm-bridge-start etc/sysadm.conf.dist -etc/init.d/sysadm -etc/init.d/sysadm-bridge -etc/init.d/sysadm-rest etc/rc.d/sysadm etc/rc.d/sysadm-bridge etc/rc.d/sysadm-rest diff --git a/src/sysadm.pro b/src/sysadm.pro index 2339cbe..f3d7699 100644 --- a/src/sysadm.pro +++ b/src/sysadm.pro @@ -6,9 +6,6 @@ SUBDIRS+= server bridge rcd.path = /usr/local/etc/rc.d/ rcd.files = rc.d/sysadm rc.d/sysadm-rest rc.d/sysadm-bridge -openrc.path = /usr/local/etc/init.d -openrc.files = init.d/sysadm init.d/sysadm-rest init.d/sysadm-bridge - #dconf.path = /usr/local/etc/job.d/ #dconf.extra = cp job.d/* $(INSTALL_ROOT)/usr/local/etc/job.d/ @@ -21,4 +18,4 @@ openrc.files = init.d/sysadm init.d/sysadm-rest init.d/sysadm-bridge conf.path = /usr/local/etc/ conf.extra = cp conf/sysadm.conf ${INSTALL_ROOT}/usr/local/etc/sysadm.conf.dist -INSTALLS += rcd openrc conf +INSTALLS += rcd conf