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  0ff9099443994b167e4ddc4a4912328e6c40e241 (commit)
       via  f868ccb7632e56fa9038b72d9adb3fe4a4c88cea (commit)
       via  9b0618c09f634358415e963cfa618b3fafdcce0e (commit)
       via  7486e30eebc5f7d6f456274ac82191987135f2e1 (commit)
      from  3b81e38a08c7433c1462d01b26754913752d6c4e (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 0ff9099443994b167e4ddc4a4912328e6c40e241
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 21 15:06:22 2018 +0100

    core124: Ship updated backup include/exclude files
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f868ccb7632e56fa9038b72d9adb3fe4a4c88cea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 21 15:05:40 2018 +0100

    backup: Add root's SSH keys and settings
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9b0618c09f634358415e963cfa618b3fafdcce0e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 21 15:05:13 2018 +0100

    backup: Add custom squid configuration files
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 7486e30eebc5f7d6f456274ac82191987135f2e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 21 11:32:04 2018 +0100

    backup: Order incldue/exclude alphabetically
    
    Nothing has been added or removed
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/backup/exclude                     |  2 +-
 config/backup/include                     | 49 ++++++++++++++++---------------
 config/rootfiles/core/124/filelists/files |  2 ++
 3 files changed, 29 insertions(+), 24 deletions(-)

Difference in files:
diff --git a/config/backup/exclude b/config/backup/exclude
index 7ca9d10b2..0d3de04d2 100644
--- a/config/backup/exclude
+++ b/config/backup/exclude
@@ -1,5 +1,5 @@
-*.tmp
 /etc/sysconfig/lm_sensors
+*.tmp
 /var/ipfire/ethernet/settings
 /var/ipfire/firewall/bin/*
 /var/ipfire/ovpn/openssl/*
diff --git a/config/backup/include b/config/backup/include
index 59430c576..6982b1c92 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -1,38 +1,48 @@
-/var/ipfire/*/settings
-/var/ipfire/*/*.conf
-/var/ipfire/*/*.pem
-/var/ipfire/*/config
-/var/ipfire/*/enable
-/var/ipfire/*/*enable*
-/var/ipfire/ovpn/collectd.vpn
-/etc/unbound
-/etc/passwd
-/etc/shadow
 /etc/group
-/etc/ipsec.user.*
-/etc/ipsec.user-post.conf
-/etc/sysconfig/*
 /etc/hosts*
 /etc/httpd/server.crt
 /etc/httpd/server.csr
-/etc/httpd/server.key
 /etc/httpd/server-ecdsa.crt
 /etc/httpd/server-ecdsa.csr
 /etc/httpd/server-ecdsa.key
-/etc/ssh/ssh_host*
-/etc/ssh/sshd_config
+/etc/httpd/server.key
+/etc/ipsec.user.*
+/etc/ipsec.user-post.conf
 /etc/logrotate.d
+/etc/passwd
+/etc/shadow
+/etc/ssh/sshd_config
+/etc/ssh/ssh_host*
+/etc/squid/squid.conf.local
+/etc/squid/squid.conf.pre.local
+/etc/sysconfig/*
+/etc/sysconfig/firewall.local
+/etc/sysconfig/rc.local
+/etc/unbound
+/root/.bash_history
+/root/.gitconfig
+/root/.ssh
 /var/ipfire/auth/users
+/var/ipfire/captive/*
+/var/ipfire/*/*.conf
+/var/ipfire/*/config
 /var/ipfire/dhcp/*
 /var/ipfire/dnsforward/*
+/var/ipfire/*/enable
+/var/ipfire/*/*enable*
+/var/ipfire/ethernet/aliases
+/var/ipfire/ethernet/wireless
 /var/ipfire/firewall
 /var/ipfire/fwhosts
 /var/ipfire/main/*
 /var/ipfire/ovpn
+/var/ipfire/ovpn/collectd.vpn
+/var/ipfire/*/*.pem
 /var/ipfire/ppp
 /var/ipfire/proxy
 /var/ipfire/qos/*
 /var/ipfire/qos/bin/qos.sh
+/var/ipfire/*/settings
 /var/ipfire/time/
 /var/ipfire/urlfilter
 /var/ipfire/vpn
@@ -40,10 +50,3 @@
 /var/log/rrd/*
 /var/log/rrd/collectd
 /var/log/vnstat
-/etc/sysconfig/firewall.local
-/etc/sysconfig/rc.local
-/root/.gitconfig
-/root/.bash_history
-/var/ipfire/ethernet/aliases
-/var/ipfire/ethernet/wireless
-/var/ipfire/captive/*
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index 037a779cd..bfe50cffa 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -5,4 +5,6 @@ etc/rc.d/init.d/partresize
 srv/web/ipfire/cgi-bin/ids.cgi
 usr/bin/install-bootloader
 usr/local/bin/backupiso
+var/ipfire/backup/exclude
+var/ipfire/backup/include
 var/ipfire/langs


hooks/post-receive
--
IPFire 2.x development tree