rewrited systemd services: each service has its own runtime directory.

docs/systemd/dhcp-log.service

@@ -7,11 +7,11 @@ Requires=dhcp-log-truncate.service
 Type=forking
 User=eye
 Group=eye
-RuntimeDirectory=eye
+RuntimeDirectory=eye-dhcp
 RuntimeDirectoryMode=0700
 RuntimeDirectoryPreserve=yes
 ExecStart=/opt/Eye/scripts/dhcp-log.pl --start
-PIDFile=/run/eye/dhcp-log.pid
+PIDFile=/run/eye-dhcp/dhcp-log.pid
 RestartSec=30
 Restart=on-failure
 

docs/systemd/dnsmasq.service.d/override.conf

@@ -1,2 +0,0 @@
-[Service]
-ExecStartPre=/usr/bin/truncate -s 0 /var/log/dhcp.log

docs/systemd/eye-statd.service

@@ -5,11 +5,11 @@ After=network.target
 [Service]
 User=eye
 Group=eye
-RuntimeDirectory=eye
+RuntimeDirectory=eye-statd
 RuntimeDirectoryMode=0700
 RuntimeDirectoryPreserve=yes
 ExecStart=/opt/Eye/scripts/eye-statd.pl
-PIDFile=/run/eye/eye-statd.pid
+PIDFile=/run/eye-statd/eye-statd.pid
 Restart=on-failure
 RestartSec=1
 

docs/systemd/iptables.service

@@ -1,20 +0,0 @@
-[Unit]
-Description=IPv4 firewall with iptables
-After=syslog.target
-ConditionPathExists=/etc/sysconfig/iptables
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/libexec/iptables/iptables.init start
-ExecStartPre=/etc/init.d/ipset start
-ExecReload=/usr/libexec/iptables/iptables.init reload
-ExecStop=/usr/libexec/iptables/iptables.init stop
-ExecStopPost=/etc/init.d/ipset stop
-Environment=BOOTUP=serial
-Environment=CONSOLETYPE=serial
-StandardOutput=syslog
-StandardError=syslog
-
-[Install]
-WantedBy=basic.target

docs/systemd/stat-sync.service

@@ -7,8 +7,8 @@ Type=forking
 User=eye
 Group=eye
 ExecStart=/opt/Eye/scripts/stat-sync.pl --start
-PIDFile=/run/eye/stat-sync.pid
-RuntimeDirectory=eye
+PIDFile=/run/eye-sync/stat-sync.pid
+RuntimeDirectory=eye-sync
 RuntimeDirectoryMode=0700
 RuntimeDirectoryPreserve=yes
 RestartSec=30

docs/systemd/syslog-stat.service

@@ -8,10 +8,10 @@ Type=forking
 User=eye
 Group=eye
 ExecStart=/opt/Eye/scripts/syslog-stat.pl --start
-RuntimeDirectory=eye
+RuntimeDirectory=eye-syslog
 RuntimeDirectoryMode=0700
 RuntimeDirectoryPreserve=yes
-PIDFile=/run/eye/syslog-stat.pid
+PIDFile=/run/eye-syslog/syslog-stat.pid
 RestartSec=30
 Restart=on-failure
 

scripts/dhcp-log.pl

@@ -49,7 +49,7 @@ my $log_file = '/var/log/dhcp.log';
 # Determine process name and PID file
 my $proc_name = $MY_NAME;
 $proc_name =~ s/\.[^.]+$//;
-my $pid_file = '/run/eye/' . $proc_name;
+my $pid_file = '/run/eye-dhcp/' . $proc_name;
 my $pf = $pid_file . '.pid';
 
 # Daemon setup

scripts/eye-statd.pl

@@ -31,7 +31,7 @@ use IO::Socket;
 my $proc_name = $MY_NAME;
 $proc_name =~ s/\.[^.]+$//;
 
-my $pid_file = '/run/eye/'.$proc_name;
+my $pid_file = '/run/eye-statd/'.$proc_name;
 
 my @router_ref = ();
 my @interfaces = ();

scripts/stat-sync.pl

@@ -30,7 +30,7 @@ use DateTime;
 
 my $mute_time=300;
 
-my $pf = '/run/eye/stat-sync.pid';
+my $pf = '/run/eye-sync/stat-sync.pid';
 
 my $daemon = Proc::Daemon->new(
         pid_file => $pf,

scripts/syslog-stat.pl

@@ -32,7 +32,7 @@ use Proc::Daemon;
 use Cwd;
 
 
-my $pf = '/run/eye/syslog-stat.pid';
+my $pf = '/run/eye-syslog/syslog-stat.pid';
 my $socket_path='/run/syslog-ng.socket';
 
 my $daemon = Proc::Daemon->new(