Quellcode durchsuchen

rewrite systemd startup scripts

rajven vor 4 Jahren
Ursprung
Commit
98934cb21c

+ 2 - 2
docs/Readme.en.md

@@ -13,7 +13,7 @@ dnf install httpd php php-common perl mariadb-server git fping net-snmp-utils \
 php-mysqlnd php-bcmath php-intl php-mbstring php-pear-Date php-pear-Mail php-snmp perl-Net-Patricia \
 perl-NetAddr-IP perl-Config-Tiny perl-Net-DNS perl-DateTime perl-Proc-Daemon perl-Net-Netmask \
 perl-Text-Iconv perl-DateTime-Format-DateParse perl-Net-SNMP perl-Net-Telnet perl-Net-IPv4Addr \
-perl-DBI -y
+perl-DBI perl-Parallel-ForkManager -y
 
 3. Download project:
 
@@ -32,7 +32,7 @@ example: wget https://code.jquery.com/jquery-3.6.0.min.js
 rename jquery-3.6.0.min.js to jquery.min.js
 
 download from https://github.com/select2/select2 release
-example: https://github.com/select2/select2/archive/4.0.12.tar.gz
+example: wget https://github.com/select2/select2/archive/4.0.12.tar.gz
 extract contents from directory dist archive to /var/www/html/js/select2/
 
 5. Configure mysql

+ 2 - 2
docs/Readme.ru.md

@@ -13,7 +13,7 @@ dnf install httpd php php-common perl mariadb-server git fping net-snmp-utils \
 php-mysqlnd php-bcmath php-intl php-mbstring php-pear-Date php-pear-Mail php-snmp perl-Net-Patricia \
 perl-NetAddr-IP perl-Config-Tiny perl-Net-DNS perl-DateTime perl-Proc-Daemon perl-Net-Netmask \
 perl-Text-Iconv perl-DateTime-Format-DateParse perl-Net-SNMP perl-Net-Telnet perl-Net-IPv4Addr \
-perl-DBI -y
+perl-DBI perl-Parallel-ForkManager -y
 
 3. Качаем исходники и раскидываем по каталогам:
 
@@ -32,7 +32,7 @@ example: wget https://code.jquery.com/jquery-3.6.0.min.js
 rename jquery-3.6.0.min.js to jquery.min.js
 
 download from https://github.com/select2/select2 release
-example: https://github.com/select2/select2/archive/4.0.12.tar.gz
+example: wget https://github.com/select2/select2/archive/4.0.12.tar.gz
 extract contents from directory dist archive to /var/www/html/js/select2/
 
 5. Настраиваем mysql 

+ 4 - 2
docs/systemd/dhcp-log.service

@@ -1,10 +1,12 @@
 [Unit]
 Description=Write dhcp events to Rstat
-After=syslog.target mariadb.service dnsmasq.service dhcpd.service
-PartOf=dnsmasq.service
+After=network.target mariadb.service
+Before=dnsmasq.service dhcpd.service
 
 [Service]
 Type=forking
+ExecStartPre=/bin/mkfifo /var/spool/dhcp-log.socket
+ExecStopPost=/bin/rm -f /var/spool/dhcp-log.socket
 ExecStart=/usr/local/scripts/dhcp-log.pl --start
 PIDFile=/var/run/dhcp-log.pid
 RestartSec=30

+ 2 - 3
docs/systemd/dnsmasq.service

@@ -1,10 +1,9 @@
 [Unit]
 Description=DNS caching server
-After=network.target
+After=network.target dhcp-log.service
+PartOf=dhcp-log.service
 
 [Service]
-ExecStartPre=/bin/mkfifo /var/spool/dhcp-log.socket
-ExecStopPost=/bin/rm -f /var/spool/dhcp-log.socket
 ExecStart=/usr/sbin/dnsmasq -k
 RestartSec=30
 Restart=on-failure

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

@@ -1,6 +1,6 @@
 [Unit]
 Description=Urgent sync access lists at mikrotik
-After=mariadb.service syslog-ng.service
+After=network.target mariadb.service
 
 [Service]
 Type=forking

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

@@ -1,6 +1,7 @@
 [Unit]
 Description=Write syslog to Rstat
-After=mariadb.service syslog-ng.service
+After=network.target mariadb.service syslog-ng.service
+PartOf=syslog-ng.service
 
 [Service]
 Type=forking