Systemd control

src/init/ossec-server.sh

@@ -109,10 +109,13 @@ enable()
 
     if [ "X$2" = "Xdatabase" ]; then
         echo "DB_DAEMON=ossec-dbd" >> ${PLIST};
+        touch ${DIR}/etc/.dbd
     elif [ "X$2" = "Xclient-syslog" ]; then
         echo "CSYSLOG_DAEMON=ossec-csyslogd" >> ${PLIST};
+        touch ${DIR}/etc/.csyslogd
     elif [ "X$2" = "Xagentless" ]; then
         echo "AGENTLESS_DAEMON=ossec-agentlessd" >> ${PLIST};
+        touch ${DIR}/etc/.agentlessd
     elif [ "X$2" = "Xdebug" ]; then
         echo "DEBUG_CLI=\"-d\"" >> ${PLIST};
     else
@@ -137,10 +140,13 @@ disable()
 
     if [ "X$2" = "Xdatabase" ]; then
         echo "DB_DAEMON=\"\"" >> ${PLIST};
+        rm /var/ossec/etc/.dbd
     elif [ "X$2" = "Xclient-syslog" ]; then
         echo "CSYSLOG_DAEMON=\"\"" >> ${PLIST};
+        rm /var/ossec/etc/.csyslogd
     elif [ "X$2" = "Xagentless" ]; then
         echo "AGENTLESS_DAEMON=\"\"" >> ${PLIST};
+        rm /var/ossec/etc/.agentlessd
     elif [ "X$2" = "Xdebug" ]; then
         echo "DEBUG_CLI=\"\"" >> ${PLIST};
     else
@@ -184,6 +190,7 @@ testconfig()
 # Start function
 start()
 {
+
     SDAEMONS="${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON} ossec-maild ossec-execd ossec-analysisd ossec-logcollector ossec-remoted ossec-syscheckd ossec-monitord"
 
     echo "Starting $NAME $VERSION (by $AUTHOR)..."
@@ -192,6 +199,16 @@ start()
         echo "OSSEC analysisd: Testing rules failed. Configuration error. Exiting."
         exit 1;
     fi
+
+    ## If the system is Linux, look for systemctl. If that file exists, use it.
+    ## XXX - system paths and exact execution are probably wrong.
+    if [ X`uname` == "XLinux" ]; then
+        if [ -x /sbin/systemctl ]; then
+            /sbin/ssytemctl start ossec-server.service
+        fi
+        exit 0
+    fi
+
     lock;
     checkpid;
 
@@ -251,6 +268,14 @@ pstatus()
 stopa()
 {
     lock;
+
+    if [ X`uname` == "XLinux" ]; then
+        if [ -x /sbin/systemctl ]; then
+            /sbin/systemctl stop ossec-server.service
+        fi
+        exit 0
+    if
+
     checkpid;
     for i in ${DAEMONS}; do
         pstatus ${i};

src/systemd/agent/ossec-agentd.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC Agent
 PartOf=ossec-agent.target
+After=ossec-execd.service
+Before=ossec-syscheckd.service ossec-logcollector.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/agent/ossec-execd.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=OSSEC Execd
 PartOf=ossec-agent.target
+Before=ossec-ossec-syscheckd.service ossec-agentd.service ossec-logcollector.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/agent/ossec-logcollector.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC Logcollector
 PartOf=ossec-agent.target
+After=ossec-execd.service ossec-agentd.service
+Before=ossec-syscheckd.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/agent/ossec-syscheckd.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=OSSEC syscheckd
 PartOf=ossec-agent.target
+After=ossec-execd.service ossec-agentd.service ossec-logcollector.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-agentless.service

@@ -1,10 +1,12 @@
 [Unit]
 Description=OSSEC Agentless
 PartOf=ossec-server.target
+After=ossec-analysisd.service ossec-execd.service ossec-logcollector.service ossec-maild.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
+ConditionPathExists=/var/ossec/etc/.agentlessd
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf
 Environment=DIRECTORY=/var/ossec
 
 ExecStartPre=/usr/bin/env ${DIRECTORY}/bin/ossec-agentlessd -t
-ExecStart=/usr/bin/env ${DIRECTORY}/bin/ossec-agentlessd -f
+ExecStart=/usr/bin/env ${DIRECTORY}/bin/ossec-agentlessd -f

src/systemd/server/ossec-analysisd.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC Analysisd
 PartOf=ossec-server.target
+After=ossec-maild.service ossec-execd.service
+Before=ossec-agentless.service ossec-csyslog.service ossec-dbd.service ossec-logcollector.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-csyslog.service

@@ -1,10 +1,12 @@
 [Unit]
 Description=OSSEC Syslog client
 PartOf=ossec-server.target
+After=ossec-analysisd.service ossec-dbd.service ossec-execd.service ossec-logcollector.service ossec-maild.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
+ConditionPathExists=/var/ossec/etc/.csyslogd
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf
 Environment=DIRECTORY=/var/ossec
 
 ExecStartPre=/usr/bin/env ${DIRECTORY}/bin/ossec-csyslogd -t
-ExecStart=/usr/bin/env ${DIRECTORY}/bin/ossec-csyslogd -f
+ExecStart=/usr/bin/env ${DIRECTORY}/bin/ossec-csyslogd -f

src/systemd/server/ossec-dbd.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=The OSSEC DBD
 PartOf=ossec-server.target
+After=ossec-analysisd.service ossec-execd.service ossec-logcollector.service ossec-maild.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
+ConditionPathExists=/var/ossec/etc/.dbd
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-execd.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC Execd
 PartOf=ossec-server.target
+After=ossec-maild.service
+Before=ossec-agentless.service ossec-analysisd.service ossec-csyslog.service ossec-dbd.service ossec-logcollector.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-logcollector.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC Logcollector
 PartOf=ossec-server.target
+After=ossec-maild.service ossec-execd.service ossec-analysisd.service
+Before=ossec-agentless.service ossec-csyslog.service ossec-dbd.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-maild.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=OSSEC Maild
 PartOf=ossec-server.target
+Before=ossec-agentless.service ossec-analysisd.service ossec-csyslog.service ossec-dbd.service ossec-execd.service ossec-logcollector.service ossec-monitord.service ossec-remoted.service ossec-syscheckd.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-monitord.service

@@ -1,6 +1,9 @@
 [Unit]
 Description=OSSEC monitord
 PartOf=ossec-server.target
+After=ossec-maild.service ossec-execd.service ossec-analysisd.service ossec-logcollector.service ossec-remoted.service ossec-syscehckd.service
+Before=ossec-agentless.service ossec-csyslog.service ossec-dbd.service
+
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-remoted.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC remoted
 PartOf=ossec-server.target
+After=ossec-maild.service ossec-execd.service ossec-analysisd.service ossec-logcollector
+Before=ossec-agentless.service ossec-csyslog.service ossec-dbd.service ossec-monitord.service ossec-syscheckd.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf

src/systemd/server/ossec-syscheckd.service

@@ -1,6 +1,8 @@
 [Unit]
 Description=OSSEC syscheckd
 PartOf=ossec-server.target
+After=ossec-maild.service ossec-execd.service ossec-analysisd.service ossec-remoted.service
+Before=ossec-agentless.service ossec-csyslog.service ossec-dbd.service ossec-monitord.service ossec-remoted.service
 
 [Service]
 EnvironmentFile=/etc/ossec-init.conf