From: Michael Tremer Date: Wed, 11 Dec 2013 20:59:22 +0000 (+0100) Subject: Always create squid.conf. X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=dfb1bfaf7b88a914ae2a384a0f30bdafaebc9125 Always create squid.conf. In some cases, /var/ipfire/proxy/squid.conf does not belong to nobody:nobody, so we do this explicitely. --- diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 8965ff70e..5a169d8d8 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 118523685..1260ceb61 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; \