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 d9ef106e5cb1e2476101090caeac4609a41a1906 (commit) via a8d24cee436f87939625f9506e6f84fc092f4200 (commit) via 306098a49811868e2ffc4e19ce8cd62f69a2e9f3 (commit) via 08729f79fb7b31326d367a74a50e372e4fb688d7 (commit) from 429524c0406baeddf270d6e2df6e5a60a410e61a (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 d9ef106e5cb1e2476101090caeac4609a41a1906 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Dec 13 18:04:40 2015 +0100
Midnight Commander 4.8.15: Update for rootfile
There was a syntax file which I overlooked...
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a8d24cee436f87939625f9506e6f84fc092f4200 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 15 13:54:04 2015 +0000
core96: Ship rules.pl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 306098a49811868e2ffc4e19ce8cd62f69a2e9f3 Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Dec 7 15:57:32 2015 +0100
BUG10994: SNAT rules are missing the outgoing interface
When creating SNAT rules, the outgoing interface is not set. As a side effect, traffic that should be send unnatted to a vpn tunnel can be natted which is a BUG. With this patch the SNAT rules are getting a outgoing interface according to the configuration. When selecting the RED Target network, all SNAT rules will be configured with "-o red0". Otherwise if "all" is selected, there is no interface in the rule, which matches all networks.
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 08729f79fb7b31326d367a74a50e372e4fb688d7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 15 13:47:52 2015 +0000
ramdisk: Backup ramdisks once a night
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cron/crontab | 5 ++++- config/firewall/rules.pl | 4 ++++ config/rootfiles/core/96/filelists/files | 1 + config/rootfiles/core/96/update.sh | 9 +++++++++ config/rootfiles/packages/mc | 1 + src/initscripts/init.d/collectd | 9 ++++++++- src/initscripts/init.d/vnstat | 10 +++++++++- 7 files changed, 36 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index 02abadc..c42c650 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -22,7 +22,10 @@ HOME=/
# Make some nice graphs */5 * * * * /usr/local/bin/makegraphs >/dev/null -17 5 * * * /etc/init.d/tmpfs backup >/dev/null + +# Backup ramdisks if necessary +%nightly,random * 23-4 /etc/init.d/collectd backup &>/dev/null +%nightly,random * 23-4 /etc/init.d/vnstat backup &>/dev/null
# Update dynamic DNS records every five minutes. */5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index daa9565..8b0c6dd 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -467,6 +467,10 @@ sub buildrules { } elsif ($NAT_MODE eq "SNAT") { my @nat_options = @options;
+ if ($destination_intf) { + push(@nat_options, ("-o", $destination_intf)); + } + push(@nat_options, @source_options); push(@nat_options, @destination_options);
diff --git a/config/rootfiles/core/96/filelists/files b/config/rootfiles/core/96/filelists/files index 0eb5b56..85fb05a 100644 --- a/config/rootfiles/core/96/filelists/files +++ b/config/rootfiles/core/96/filelists/files @@ -12,5 +12,6 @@ etc/rc.d/rc6.d/K51vnstat opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/routing.cgi +usr/lib/firewall/rules.pl usr/sbin/convert-portfw var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh index b860207..a3cf5cf 100644 --- a/config/rootfiles/core/96/update.sh +++ b/config/rootfiles/core/96/update.sh @@ -67,6 +67,15 @@ if [ -L "/var/spool/cron" ]; then rm -f /var/spool/cron mv /var/log/rrd/cron /var/spool/cron chown cron:cron /var/spool/cron + + # Add new crontab entries + sed -i /var/spool/cron/root.orig -e "/tmpfs backup/d" + grep -q "collectd backup" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig +# Backup ramdisks if necessary +%nightly,random * 23-4 /etc/init.d/collectd backup &>/dev/null +%nightly,random * 23-4 /etc/init.d/vnstat backup &>/dev/null +EOF + fcrontab -z fi
# Start services diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index c612edf..d09a21b 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -181,6 +181,7 @@ usr/share/mc/syntax/po.syntax usr/share/mc/syntax/povray.syntax usr/share/mc/syntax/procmail.syntax usr/share/mc/syntax/properties.syntax +usr/share/mc/syntax/puppet.syntax usr/share/mc/syntax/python.syntax usr/share/mc/syntax/ruby.syntax usr/share/mc/syntax/sh.syntax diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index e5c3595..761e9c3 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -124,8 +124,15 @@ case "$1" in statusproc /usr/sbin/collectd ;;
+ backup) + # Backup all data if ramdisk is used + if mountpoint "${RRDLOG}" &>/dev/null; then + ${0} restart + fi + ;; + *) - echo "Usage: $0 {start|stop|restart|status}" + echo "Usage: $0 {start|stop|restart|status|backup}" exit 1 ;; esac diff --git a/src/initscripts/init.d/vnstat b/src/initscripts/init.d/vnstat index 05c35ee..518b2d7 100755 --- a/src/initscripts/init.d/vnstat +++ b/src/initscripts/init.d/vnstat @@ -21,8 +21,16 @@ case "$1" in stop) umount_ramdisk "${VNSTATLOG}" ;; + + backup) + # Backup all data if ramdisk is used + if mountpoint "${RRDLOG}" &>/dev/null; then + ${0} restart + fi + ;; + *) - echo "Usage: $0 {start|stop}" + echo "Usage: $0 {start|stop|backup}" exit 1 ;; esac
hooks/post-receive -- IPFire 2.x development tree