warden/rlgwebd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RLGWebD: move the control socket into /var/run.

Browse source 
This is a more standard location.  /run is preferred by systemd, but
portability to non-systemd systems is important.
This commit is contained in:
John "Elwin" Edwards 2016-01-14 19:10:46 -05:00
parent 9a709adc58
commit ff0814c7ac
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -20,6 +20,5 @@ install: all
cp sqlickrypt dglwatcher ${CHROOT}/bin cp sqlickrypt dglwatcher ${CHROOT}/bin
for LIB in `ldd ./sqlickrypt | awk '$$1 ~ "^/" {print $$1}; $$3 ~ "^/" {print $$3}'`; do mkdir -p ${CHROOT}`dirname $$LIB`; cp $$LIB ${CHROOT}$$LIB; done for LIB in `ldd ./sqlickrypt | awk '$$1 ~ "^/" {print $$1}; $$3 ~ "^/" {print $$3}'`; do mkdir -p ${CHROOT}`dirname $$LIB`; cp $$LIB ${CHROOT}$$LIB; done
cp rlgwebd.js rlgwebd-stop.js ${BINDIR} cp rlgwebd.js rlgwebd-stop.js ${BINDIR}
mkdir -p /var/local/rlgwebd
cp ${WEBASSETS} ${CHROOT}/var/www cp ${WEBASSETS} ${CHROOT}/var/www
cp rlgwebd.service /usr/lib/systemd/system cp rlgwebd.service /usr/lib/systemd/system

2
rlgwebd
View file

@ -2,7 +2,7 @@
NODE_PATH=/usr/lib/node_modules NODE_PATH=/usr/lib/node_modules
LOGFILE=/var/local/rlgwebd/log LOGFILE=/var/local/rlgwebd/log
CTLSOCKET=/var/local/rlgwebd/ctl CTLSOCKET=/var/run/rlgwebd.sock
RLGWEBDJS=./rlgwebd.js RLGWEBDJS=./rlgwebd.js
export NODE_PATH export NODE_PATH

2
rlgwebd-stop.js
View file

@ -1,7 +1,7 @@
#!/usr/bin/env node #!/usr/bin/env node
var net = require('net'); var net = require('net');
var sockpath = "/var/local/rlgwebd/ctl"; var sockpath = "/var/run/rlgwebd.sock";
var sock = net.connect(sockpath, function () { var sock = net.connect(sockpath, function () {
sock.on('close', function () { sock.on('close', function () {

2
rlgwebd.js
View file

@ -14,7 +14,7 @@ var WebSocketServer = require("websocket").server;
/* Configuration variables */ /* Configuration variables */
// The first file is NOT in the chroot. // The first file is NOT in the chroot.
var ctlsocket = "/var/local/rlgwebd/ctl"; var ctlsocket = "/var/run/rlgwebd.sock";
var httpPort = 8080; var httpPort = 8080;
var chrootDir = "/var/dgl/"; var chrootDir = "/var/dgl/";
var dropToUser = "rodney"; var dropToUser = "rodney";