* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5321fcbff33f69e98f87bd0a354bab53e2a830bf
@ 2019-01-08 17:59 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2019-01-08 17:59 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 17351 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 5321fcbff33f69e98f87bd0a354bab53e2a830bf (commit)
via 7d5caee6bdbb44b688b579f9b1836bd5a3d0d619 (commit)
via ae5b9c5ad5fafbb42e2d7f8201f4cbcc995bfcc4 (commit)
via e26a5c488556579d1bd639b50adbc31da450e70c (commit)
from e0c4ed1783d665d6f341d00e506395c507198807 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5321fcbff33f69e98f87bd0a354bab53e2a830bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 6 09:00:47 2019 +0000
Backup conntrackd's configuration file
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7d5caee6bdbb44b688b579f9b1836bd5a3d0d619
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 6 08:59:25 2019 +0000
Add initscript for conntrackd
The daemon will be started by default when a configuration
file exists.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ae5b9c5ad5fafbb42e2d7f8201f4cbcc995bfcc4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 6 07:03:08 2019 +0000
Update translations
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e26a5c488556579d1bd639b50adbc31da450e70c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Jan 8 14:14:41 2019 +0100
Fix typo in 'html/cgi-bin/logs.cgi/log.dat'
Translation string uses capital letter: 'Captive' => 'Captive Portal',
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/include | 1 +
config/rootfiles/common/aarch64/initscripts | 4 +++
config/rootfiles/common/armv5tel/initscripts | 4 +++
config/rootfiles/common/i586/initscripts | 4 +++
config/rootfiles/common/x86_64/initscripts | 4 +++
config/rootfiles/core/127/filelists/files | 5 ++++
doc/language_issues.de | 1 -
doc/language_issues.en | 1 -
doc/language_issues.es | 1 -
doc/language_issues.fr | 1 -
doc/language_issues.it | 1 -
doc/language_issues.nl | 1 -
doc/language_issues.pl | 1 -
doc/language_issues.ru | 1 -
doc/language_issues.tr | 1 -
html/cgi-bin/logs.cgi/log.dat | 2 +-
lfs/initscripts | 3 ++
src/initscripts/system/conntrackd | 41 ++++++++++++++++++++++++++++
18 files changed, 67 insertions(+), 10 deletions(-)
create mode 100755 src/initscripts/system/conntrackd
Difference in files:
diff --git a/config/backup/include b/config/backup/include
index 75bd85807..6c7affa20 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -1,3 +1,4 @@
+/etc/conntrackd/conntrackd.conf
/etc/group
/etc/hosts*
/etc/httpd/server.crt
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 18adeea21..367a0a725 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -12,6 +12,7 @@ etc/rc.d/init.d/checkfs
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
+etc/rc.d/init.d/conntrackd
etc/rc.d/init.d/console
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
@@ -103,6 +104,7 @@ etc/rc.d/rc0.d/K45random
etc/rc.d/rc0.d/K47setclock
etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K51vnstat
+etc/rc.d/rc0.d/K77conntrackd
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K79unbound
@@ -131,6 +133,7 @@ etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S21leds
+etc/rc.d/rc3.d/S22conntrackd
etc/rc.d/rc3.d/S24cyrus-sasl
etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
@@ -154,6 +157,7 @@ etc/rc.d/rc6.d/K45random
etc/rc.d/rc6.d/K47setclock
etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K51vnstat
+etc/rc.d/rc6.d/K77conntrackd
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K79unbound
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 18adeea21..367a0a725 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -12,6 +12,7 @@ etc/rc.d/init.d/checkfs
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
+etc/rc.d/init.d/conntrackd
etc/rc.d/init.d/console
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
@@ -103,6 +104,7 @@ etc/rc.d/rc0.d/K45random
etc/rc.d/rc0.d/K47setclock
etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K51vnstat
+etc/rc.d/rc0.d/K77conntrackd
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K79unbound
@@ -131,6 +133,7 @@ etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S21leds
+etc/rc.d/rc3.d/S22conntrackd
etc/rc.d/rc3.d/S24cyrus-sasl
etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
@@ -154,6 +157,7 @@ etc/rc.d/rc6.d/K45random
etc/rc.d/rc6.d/K47setclock
etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K51vnstat
+etc/rc.d/rc6.d/K77conntrackd
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K79unbound
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 7b2c1c5f4..6f9868ec3 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -12,6 +12,7 @@ etc/rc.d/init.d/checkfs
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
+etc/rc.d/init.d/conntrackd
etc/rc.d/init.d/console
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
@@ -102,6 +103,7 @@ etc/rc.d/rc0.d/K45random
etc/rc.d/rc0.d/K47setclock
etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K51vnstat
+etc/rc.d/rc0.d/K77conntrackd
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K79unbound
@@ -130,6 +132,7 @@ etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S11unbound
etc/rc.d/rc3.d/S21leds
+etc/rc.d/rc3.d/S22conntrackd
etc/rc.d/rc3.d/S24cyrus-sasl
etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
@@ -153,6 +156,7 @@ etc/rc.d/rc6.d/K45random
etc/rc.d/rc6.d/K47setclock
etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K51vnstat
+etc/rc.d/rc6.d/K77conntrackd
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K79unbound
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 7b2c1c5f4..6f9868ec3 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -12,6 +12,7 @@ etc/rc.d/init.d/checkfs
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/collectd
etc/rc.d/init.d/connectd
+etc/rc.d/init.d/conntrackd
etc/rc.d/init.d/console
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
@@ -102,6 +103,7 @@ etc/rc.d/rc0.d/K45random
etc/rc.d/rc0.d/K47setclock
etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K51vnstat
+etc/rc.d/rc0.d/K77conntrackd
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K79unbound
@@ -130,6 +132,7 @@ etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S11unbound
etc/rc.d/rc3.d/S21leds
+etc/rc.d/rc3.d/S22conntrackd
etc/rc.d/rc3.d/S24cyrus-sasl
etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
@@ -153,6 +156,7 @@ etc/rc.d/rc6.d/K45random
etc/rc.d/rc6.d/K47setclock
etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K51vnstat
+etc/rc.d/rc6.d/K77conntrackd
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K79unbound
diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
index cb705e3c1..d3de58f52 100644
--- a/config/rootfiles/core/127/filelists/files
+++ b/config/rootfiles/core/127/filelists/files
@@ -4,9 +4,14 @@ etc/modprobe.d/framebuffer.conf
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
etc/rc.d/init.d/aws
+etc/rc.d/init.d/conntrackd
etc/rc.d/init.d/unbound
+etc/rc.d/rc0.d/K77conntrackd
+etc/rc.d/rc3.d/S22conntrackd
+etc/rc.d/rc6.d/K77conntrackd
srv/web/ipfire/cgi-bin/dnsforward.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/backup/include
diff --git a/doc/language_issues.de b/doc/language_issues.de
index f8b84c651..c5dad0168 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -732,7 +732,6 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs = unknown string
WARNING: untranslated string: addons = Addons
WARNING: untranslated string: bytes = unknown string
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6dcf03929..3e16e2180 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -404,7 +404,6 @@ WARNING: untranslated string: capsclosed = DISCONNECTED
WARNING: untranslated string: capsopen = CONNECTED
WARNING: untranslated string: capswarning = WARNING
WARNING: untranslated string: caption = Caption
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
WARNING: untranslated string: ccd client options = Advanced client options
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6485fccbc..236248d55 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -715,7 +715,6 @@ WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: capabilities = Capabilities
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
WARNING: untranslated string: ccd client options = Advanced client options
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 06f5a0f55..e2f20eb5c 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -770,7 +770,6 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Captive clients = unknown string
WARNING: untranslated string: Scan for Songs = unknown string
WARNING: untranslated string: bytes = unknown string
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index ba746410a..5500eedc9 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -786,7 +786,6 @@ WARNING: untranslated string: advproxy group required = Required group
WARNING: untranslated string: application layer gateways = Application Layer Gateways
WARNING: untranslated string: block = Block
WARNING: untranslated string: bytes = unknown string
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 883c6ba02..64778ffd7 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -783,7 +783,6 @@ WARNING: untranslated string: atm device = Device:
WARNING: untranslated string: block = Block
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: capabilities = Capabilities
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6485fccbc..236248d55 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -715,7 +715,6 @@ WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: capabilities = Capabilities
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
WARNING: untranslated string: ccd client options = Advanced client options
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 88ba126a1..810b16f50 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -717,7 +717,6 @@ WARNING: untranslated string: bit = bit
WARNING: untranslated string: block = Block
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: capabilities = Capabilities
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: ccd add = Add network
WARNING: untranslated string: ccd choose net = Choose network
WARNING: untranslated string: ccd client options = Advanced client options
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index f4aca5b7e..140658346 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -770,7 +770,6 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Captive clients = unknown string
WARNING: untranslated string: Scan for Songs = unknown string
WARNING: untranslated string: bytes = unknown string
-WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
WARNING: untranslated string: dnsforward forward_servers = Nameservers
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index f241365a1..153ffb5f0 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -78,7 +78,7 @@ my %sections = (
my %trsections = (
'auth' => "$Lang::tr{'loginlogout'}",
'wio' => 'Who Is Online?',
- 'captive' => $Lang::tr{'captive'},
+ 'captive' => $Lang::tr{'Captive'},
'clamav' => 'ClamAV',
'collectd' => 'Collectd',
'cron' => 'Cron',
diff --git a/lfs/initscripts b/lfs/initscripts
index bdab03dfe..c053b7115 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -155,6 +155,9 @@ $(TARGET) :
ln -sf ../init.d/leds /etc/rc.d/rc3.d/S21leds
ln -sf ../init.d/leds /etc/rc.d/rc6.d/K79leds
ln -sf ../init.d/fireinfo /etc/rc.d/rc3.d/S15fireinfo
+ ln -sf ../init.d/conntrackd /etc/rc.d/rc0.d/K77conntrackd
+ ln -sf ../init.d/conntrackd /etc/rc.d/rc3.d/S22conntrackd
+ ln -sf ../init.d/conntrackd /etc/rc.d/rc6.d/K77conntrackd
ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S01sysctl
ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules
diff --git a/src/initscripts/system/conntrackd b/src/initscripts/system/conntrackd
new file mode 100755
index 000000000..2e7a2678b
--- /dev/null
+++ b/src/initscripts/system/conntrackd
@@ -0,0 +1,41 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/conntrackd
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+ start)
+ # Don't attempt to launch the daemon when we have no configuration
+ if [ ! -s "/etc/conntrackd/conntrackd.conf" ]; then
+ exit 0
+ fi
+
+ boot_mesg "Starting Connection Tracking Daemon..."
+ loadproc /usr/sbin/conntrackd -d
+ ;;
+
+ stop)
+ boot_mesg "Stopping Connection Tracking Daemon..."
+ killproc /usr/sbin/conntrackd
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /usr/sbin/conntrackd
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/conntrackd
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-01-08 17:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-08 17:59 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5321fcbff33f69e98f87bd0a354bab53e2a830bf Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox