From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. aa54efa329378b18f891f9e47531d6f38bbe336d
Date: Fri, 12 Apr 2013 12:36:58 +0200 [thread overview]
Message-ID: <20130412103707.8C9C220142@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2359 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 aa54efa329378b18f891f9e47531d6f38bbe336d (commit)
via 262f429733acc2fbea21a5eaa3ba641502776f86 (commit)
from c9a8dd4ca90dfa6c9997db18d48097d6e2f8895a (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 aa54efa329378b18f891f9e47531d6f38bbe336d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 12 12:35:59 2013 +0200
Add updated backup/includes file to core update 68.
commit 262f429733acc2fbea21a5eaa3ba641502776f86
Author: Alexander Marx <amarx(a)ipfire.org>
Date: Fri Apr 12 12:29:10 2013 +0200
Backup: Added directories for old firewall, so that this backup can be restored in the new firewall
-----------------------------------------------------------------------
Summary of changes:
config/backup/include | 3 +++
config/rootfiles/core/68/filelists/files | 1 +
2 files changed, 4 insertions(+)
Difference in files:
diff --git a/config/backup/include b/config/backup/include
index a1d1fbc..9b08683 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -19,6 +19,9 @@
/var/ipfire/outgoing/macgroups
/var/ipfire/outgoing/rules
/var/ipfire/outgoing/p2protocols
+/var/ipfire/dmzholes
+/var/ipfire/xtaccess
+/var/ipfire/portfw
/var/ipfire/ovpn
/var/ipfire/ppp
/var/ipfire/proxy
diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files
index 560d285..10ccc2c 100644
--- a/config/rootfiles/core/68/filelists/files
+++ b/config/rootfiles/core/68/filelists/files
@@ -5,6 +5,7 @@ srv/web/ipfire/html/themes/ipfire/include/style.css
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/style.css
srv/web/ipfire/html/include/jquery-1.9.1.min.js
+var/ipfire/backup/include
var/ipfire/header.pl
var/ipfire/general-functions.pl
var/ipfire/langs
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-04-12 10:36 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=20130412103707.8C9C220142@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