Explorar el Código

the directory for the pid files is set to /run
The netflow collector is launched from the eye user

root hace 1 año
padre
commit
659e7a8ccd

+ 2 - 2
docs/deprecated/nfcapd-1.6@.service

@@ -5,14 +5,14 @@ After=syslog.target network-online.target
 [Service]
 Type=forking
 EnvironmentFile=/etc/nfcapd/%i.conf
-ExecStart=/usr/bin/nfcapd -D -P /var/run/nfcapd.%i.pid -z -w -t 600 -p ${LISTEN_PORT} -S 1 -l ${DATA_DIR} -x ${EXT}
+ExecStart=/usr/bin/nfcapd -D -P /run/nfcapd.%i.pid -z -w -t 600 -p ${LISTEN_PORT} -S 1 -l ${DATA_DIR} -x ${EXT}
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SETPCAP
 PermissionsStartOnly=true
 User=tcpdump
 Group=tcpdump
 RuntimeDirectory=nfcapd
 RuntimeDirectoryMode=0770
-PIDFile=/var/run/nfcapd.%i.pid
+PIDFile=/run/nfcapd.%i.pid
 RestartSec=30
 Restart=on-failure
 

+ 1 - 1
docs/syslog-ng/syslog-ng.conf

@@ -15,7 +15,7 @@ options {
 source s_remote { udp(port(514)); };
 
 destination d_socket {
-pipe("/var/run/syslog-ng.socket" template("$UNIXTIME|$SOURCEIP|$MSGHDR $MESSAGE\n") template-escape(yes) flags(no-multi-line));
+pipe("/run/syslog-ng.socket" template("$UNIXTIME|$SOURCEIP|$MSGHDR $MESSAGE\n") template-escape(yes) flags(no-multi-line));
 };
 
 destination d_all { file("/var/log/remote/$R_YEAR/$R_MONTH/$R_YEAR-$R_MONTH-$R_DAY.log" flags(no-multi-line)); };

+ 1 - 1
docs/systemd/dhcp-log.service

@@ -5,7 +5,7 @@ After=network.target mariadb.service dnsmasq.service dhcpd.service
 [Service]
 Type=forking
 ExecStart=/opt/Eye/scripts/dhcp-log.pl --start
-PIDFile=/var/run/dhcp-log.pid
+PIDFile=/run/dhcp-log.pid
 RestartSec=30
 Restart=on-failure
 

+ 1 - 1
docs/systemd/init.d/ipset

@@ -42,7 +42,7 @@ return 0
 }
 
 start_ipset() {
-[ ! -e "/var/run/ipstate" ] && ln -s /usr/local/ipstate /var/run/ipstate
+[ ! -e "/run/ipstate" ] && ln -s /usr/local/ipstate /run/ipstate
 if [ -d "${config_dir}" ] ; then
         CONFS=`ls ${config_dir}/*.save 2>/dev/null`
         [ -z "${CONFS}" ] && exit 6

+ 3 - 1
docs/systemd/stat-sync.service

@@ -4,8 +4,10 @@ After=network.target mariadb.service
 
 [Service]
 Type=forking
+User=eye
+Group=eye
 ExecStart=/opt/Eye/scripts/stat-sync.pl --start
-PIDFile=/var/run/stat-sync.pid
+PIDFile=/run/stat-sync.pid
 RestartSec=30
 Restart=on-failure
 

+ 1 - 1
docs/systemd/syslog-ng.service

@@ -4,7 +4,7 @@ Documentation=man:syslog-ng(8)
 
 [Service]
 Type=notify
-ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd-ng.pid
+ExecStart=/usr/sbin/syslog-ng -F -p /run/syslogd-ng.pid
 ExecReload=/bin/kill -HUP $MAINPID
 StandardOutput=null
 RestartSec=30

+ 1 - 1
docs/systemd/syslog-stat.service

@@ -6,7 +6,7 @@ PartOf=syslog-ng.service
 [Service]
 Type=forking
 ExecStart=/opt/Eye/scripts/syslog-stat.pl --start
-PIDFile=/var/run/syslog-stat.pid
+PIDFile=/run/syslog-stat.pid
 RestartSec=30
 Restart=on-failure
 

+ 1 - 1
scripts/config

@@ -18,7 +18,7 @@ if [ ! -e "${WORKDIR}/cfg/config" ]; then
 LOG1="${log_dir}/$BN.log"
 
 #lock file for working process
-LOCK1="/var/run/$BN.pid"
+LOCK1="/run/$BN.pid"
 
 #debug
 DEBUG=0

+ 1 - 1
scripts/dhcp-log.pl

@@ -24,7 +24,7 @@ use Net::Netmask;
 use Text::Iconv;
 use File::Tail;
 
-my $pf = '/var/run/dhcp-log.pid';
+my $pf = '/run/dhcp-log.pid';
 
 my $log_file='/var/log/dhcp.log';
 

+ 1 - 1
scripts/stat-sync.pl

@@ -22,7 +22,7 @@ use Proc::Daemon;
 use Cwd;
 use Net::Netmask;
 
-my $pf = '/var/run/stat-sync.pid';
+my $pf = '/run/stat-sync.pid';
 
 my $daemon = Proc::Daemon->new(
         pid_file => $pf,

+ 2 - 2
scripts/syslog-stat.pl

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