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

src/library/sysadm-global.h

@@ -8,15 +8,17 @@
 #define __PCBSD_LIB_UTILS_GENERAL_INCLUDES_H
 
 //Qt Includes
-#include <QProcess>
 #include <QCoreApplication>
-#include <QFile>
-#include <QTextStream>
+#include <QDateTime>
 #include <QDir>
+#include <QDebug>
+#include <QFile>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QProcess>
 #include <QString>
 #include <QStringList>
-#include <QDateTime>
-#include <QDebug>
+#include <QTextStream>
 
 //FreeBSD Includes
 #include <sys/types.h>

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

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"

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"