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 b5c00b8654ccbe438d6d38d29859c67fbf0a6cc7 (commit) via 9c55c65e050d60c2604490247a4f7ccb0b0032b5 (commit) from 15be554282c3c424d5d9eab9de62f6fde4203585 (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 b5c00b8654ccbe438d6d38d29859c67fbf0a6cc7 Merge: 9c55c65 15be554 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jul 16 23:05:00 2013 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

Summary of changes: config/backup/include | 1 + config/rootfiles/common/configroot | 2 ++ config/rootfiles/core/71/filelists/files | 1 + lfs/configroot | 4 ++-- 4 files changed, 6 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/backup/include b/config/backup/include index 8463a89..c863a0e 100644 --- a/config/backup/include +++ b/config/backup/include @@ -14,6 +14,7 @@ /etc/ssh/ssh_host* /var/ipfire/auth/users /var/ipfire/dhcp/* +/var/ipfire/dnsforward/* /var/ipfire/main/* /var/ipfire/outgoing/groups /var/ipfire/outgoing/macgroups diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 3910b36..cd33ec4 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -30,6 +30,8 @@ var/ipfire/dmzholes #var/ipfire/dmzholes/config var/ipfire/dns #var/ipfire/dns/settings +var/ipfire/dnsforward +#var/ipfire/dnsforward/config var/ipfire/ethernet #var/ipfire/ethernet/aliases #var/ipfire/ethernet/known_nics diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files index 9dd0e30..c7df219 100644 --- a/config/rootfiles/core/71/filelists/files +++ b/config/rootfiles/core/71/filelists/files @@ -19,6 +19,7 @@ srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi +var/ipfire/dnsforward/config var/ipfire/general-functions.pl var/ipfire/langs var/ipfire/backup/include diff --git a/lfs/configroot b/lfs/configroot index 1f84a16..1185236 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -50,7 +50,7 @@ $(TARGET) : @$(PREBUILD)

# Create all directories - for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \ + for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns dnsforward \ ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \ outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \ @@ -63,7 +63,7 @@ $(TARGET) : # Touch empty files for i in auth/users backup/include.user backup/exclude.user \ certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ - dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ + dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \

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