# HG changeset patch # User John "Elwin" Edwards # Date 1452816646 18000 # Node ID 5483d413a45b1286450ce390383084471ec91cf9 # Parent 80ca029f090656c616f50fddbef621342ee3be29 RLGWebD: move the control socket into /var/run. This is a more standard location. /run is preferred by systemd, but portability to non-systemd systems is important. diff -r 80ca029f0906 -r 5483d413a45b Makefile --- a/Makefile Sat Jan 02 14:33:48 2016 -0500 +++ b/Makefile Thu Jan 14 19:10:46 2016 -0500 @@ -20,6 +20,5 @@ 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 cp rlgwebd.js rlgwebd-stop.js ${BINDIR} - mkdir -p /var/local/rlgwebd cp ${WEBASSETS} ${CHROOT}/var/www cp rlgwebd.service /usr/lib/systemd/system diff -r 80ca029f0906 -r 5483d413a45b rlgwebd --- a/rlgwebd Sat Jan 02 14:33:48 2016 -0500 +++ b/rlgwebd Thu Jan 14 19:10:46 2016 -0500 @@ -2,7 +2,7 @@ NODE_PATH=/usr/lib/node_modules LOGFILE=/var/local/rlgwebd/log -CTLSOCKET=/var/local/rlgwebd/ctl +CTLSOCKET=/var/run/rlgwebd.sock RLGWEBDJS=./rlgwebd.js export NODE_PATH diff -r 80ca029f0906 -r 5483d413a45b rlgwebd-stop.js --- a/rlgwebd-stop.js Sat Jan 02 14:33:48 2016 -0500 +++ b/rlgwebd-stop.js Thu Jan 14 19:10:46 2016 -0500 @@ -1,7 +1,7 @@ #!/usr/bin/env node var net = require('net'); -var sockpath = "/var/local/rlgwebd/ctl"; +var sockpath = "/var/run/rlgwebd.sock"; var sock = net.connect(sockpath, function () { sock.on('close', function () { diff -r 80ca029f0906 -r 5483d413a45b rlgwebd.js --- a/rlgwebd.js Sat Jan 02 14:33:48 2016 -0500 +++ b/rlgwebd.js Thu Jan 14 19:10:46 2016 -0500 @@ -14,7 +14,7 @@ /* Configuration variables */ // The first file is NOT in the chroot. -var ctlsocket = "/var/local/rlgwebd/ctl"; +var ctlsocket = "/var/run/rlgwebd.sock"; var httpPort = 8080; var chrootDir = "/var/dgl/"; var dropToUser = "rodney";