From de4a7bd3c6da0c5abb22f0f5ac5f6efa19058dc2 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Mon, 18 Jan 2016 12:34:50 -0500 Subject: [PATCH] Make pid files 744, and update sysadm-global.h with some cleanup --- src/library/sysadm-global.h | 12 +++++++----- src/library/sysadm-lifepreserver.cpp | 2 -- src/rc.d/sysadm-restserver | 1 + src/rc.d/sysadm-websocket | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/library/sysadm-global.h b/src/library/sysadm-global.h index 0dd3576..a9290dd 100644 --- a/src/library/sysadm-global.h +++ b/src/library/sysadm-global.h @@ -8,15 +8,17 @@ #define __PCBSD_LIB_UTILS_GENERAL_INCLUDES_H //Qt Includes -#include #include -#include -#include +#include #include +#include +#include +#include +#include +#include #include #include -#include -#include +#include //FreeBSD Includes #include diff --git a/src/library/sysadm-lifepreserver.cpp b/src/library/sysadm-lifepreserver.cpp index d5ca03e..c3fe76d 100644 --- a/src/library/sysadm-lifepreserver.cpp +++ b/src/library/sysadm-lifepreserver.cpp @@ -8,8 +8,6 @@ #include "sysadm-lifepreserver.h" #include "sysadm-global.h" -#include "QJsonValue" - using namespace sysadm; //PLEASE: Keep the functions in the same order as listed in pcbsd-general.h diff --git a/src/rc.d/sysadm-restserver b/src/rc.d/sysadm-restserver index 0ba8ea0..2433234 100755 --- a/src/rc.d/sysadm-restserver +++ b/src/rc.d/sysadm-restserver @@ -49,6 +49,7 @@ sysadm_start() ssl_keygen echo "Starting sysadm (REST)..." daemon -p /var/run/sysadm-rest.pid $command $flags >/dev/null 2>/dev/null + chmod 744 /var/run/sysadm-rest.pid >/dev/null 2>/dev/null } run_rc_command "$1" diff --git a/src/rc.d/sysadm-websocket b/src/rc.d/sysadm-websocket index 60352f4..9ddae20 100755 --- a/src/rc.d/sysadm-websocket +++ b/src/rc.d/sysadm-websocket @@ -49,6 +49,7 @@ sysadm_start() ssl_keygen echo "Starting sysadm (WebSocket)..." daemon -p /var/run/sysadm-websocket.pid $command $flags >/dev/null 2>/dev/null + chmod 744 /var/run/sysadm-websocket.pid >/dev/null 2>/dev/null } run_rc_command "$1"