public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 083c1258bf28023957d1b7204e4b05a5d4082998
Date: Thu, 06 Dec 2012 19:04:19 +0100	[thread overview]
Message-ID: <20121206180420.12D6B201DE@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2118 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  083c1258bf28023957d1b7204e4b05a5d4082998 (commit)
      from  82c809c7529a9cd7c9cdd6c96d5671d4e261a546 (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 083c1258bf28023957d1b7204e4b05a5d4082998
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Dec 6 18:59:30 2012 +0100

    backup: add vnstat,collectd and outgoingfw-macgroups to backup.
    
    fixes #10251
    and additional the missing macgroups.

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

Summary of changes:
 config/backup/include                    | 3 +++
 config/rootfiles/core/65/filelists/files | 1 +
 2 files changed, 4 insertions(+)

Difference in files:
diff --git a/config/backup/include b/config/backup/include
index 8806640..a1d1fbc 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -16,6 +16,7 @@
 /var/ipfire/dhcp/*
 /var/ipfire/main/*
 /var/ipfire/outgoing/groups
+/var/ipfire/outgoing/macgroups
 /var/ipfire/outgoing/rules
 /var/ipfire/outgoing/p2protocols
 /var/ipfire/ovpn
@@ -28,6 +29,8 @@
 /var/ipfire/vpn
 /var/log/ip-acct/*
 /var/log/rrd/*
+/var/log/rrd/collectd
+/var/log/rrd/vnstat
 /etc/sysconfig/firewall.local
 /etc/sysconfig/rc.local
 /root/.gitconfig
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 6c88a31..67bd0b3 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -7,3 +7,4 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/ovpn-ccd-convert
 var/ipfire/general-functions.pl
 var/ipfire/langs
+var/ipfire/backup/include


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

                 reply	other threads:[~2012-12-06 18:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121206180420.12D6B201DE@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox