Merge branch 'master' of github.com:pcbsd/sysadm

This commit is contained in:
Ken Moore
2016-05-25 08:17:06 -04:00
6 changed files with 18 additions and 20 deletions

View File

@@ -1,5 +0,0 @@
{
"Label": "org.pcbsd.sysadm-rest",
"ProgramArguments": [ "/usr/local/bin/sysadm-server", "-rest" ],
"RunAtLoad": false
}

View File

@@ -1,5 +0,0 @@
{
"Label": "org.pcbsd.sysadm",
"Program": "/usr/local/bin/sysadm-server",
"RunAtLoad": true
}

View File

@@ -0,0 +1,5 @@
{
"Label": "org.pcbsd.sysadm-rest",
"Program": [ "/usr/local/bin/sysadm-server", "-rest" ],
"Enable": false
}

View File

@@ -0,0 +1,5 @@
{
"Label": "org.pcbsd.sysadm",
"Program": ["/usr/local/bin/sysadm-server"],
"Enable": true
}

View File

@@ -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/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
etc/rc.d/sysadm-rest
share/launchd/daemons/org.pcbsd.sysadm.json
share/launchd/daemons/org.pcbsd.sysadm-rest.json

View File

@@ -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/
dconf.path = /usr/local/etc/job.d/
dconf.extra = cp job.d/* $(INSTALL_ROOT)/usr/local/etc/job.d/
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
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.extra = cp daemons.d/org.pcbsd.sysadm-rest.json.dist $(INSTALL_ROOT)/usr/local/share/launchd/daemons/org.pcbsd.sysadm-rest.json
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/
conf.extra = cp conf/sysadm.conf ${INSTALL_ROOT}/usr/local/etc/sysadm.conf.dist