[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dfb1bfaf7b88a914ae2a384a0f30bdafaebc9125

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dfb1bfaf7b88a914ae2a384a0f30bdafaebc9125

[git]

[-- Attachment #1: Type: text/plain, Size: 2876 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  dfb1bfaf7b88a914ae2a384a0f30bdafaebc9125 (commit)
      from  9fa18495864b421b508201870abe93acc5a35b7c (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 dfb1bfaf7b88a914ae2a384a0f30bdafaebc9125
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Dec 11 21:59:22 2013 +0100

    Always create squid.conf.
    
    In some cases, /var/ipfire/proxy/squid.conf does not belong to
    nobody:nobody, so we do this explicitely.

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

Summary of changes:
 config/rootfiles/common/configroot | 1 +
 lfs/configroot                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 8965ff7..5a169d8 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -144,6 +144,7 @@ var/ipfire/proxy
 #var/ipfire/proxy/calamaris
 #var/ipfire/proxy/calamaris/bin
 #var/ipfire/proxy/settings
+#var/ipfire/proxy/squid.conf
 var/ipfire/qos
 #var/ipfire/qos/bin
 #var/ipfire/qos/bin/RRD-func.pl
diff --git a/lfs/configroot b/lfs/configroot
index 1185236..1260ceb 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -67,7 +67,7 @@ $(TARGET) :
 	    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 \
-	    ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+	    ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
 	    qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
 	    vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
 	        touch $(CONFIG_ROOT)/$$i; \


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