[PATCH 1/2] configroot: Create /var/ipfire/dns/servers file

[PATCH 1/2] configroot: Create /var/ipfire/dns/servers file

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/rootfiles/common/configroot | 1 +
 lfs/configroot                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 56b0257bc..67c4abc75 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -41,6 +41,7 @@ var/ipfire/dhcp
 var/ipfire/dhcpc
 var/ipfire/dns
 #var/ipfire/dns/settings
+#var/ipfire/dns/servers
 var/ipfire/dnsforward
 #var/ipfire/dnsforward/config
 var/ipfire/ethernet
diff --git a/lfs/configroot b/lfs/configroot
index 227d09239..d9a31e999 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -63,7 +63,7 @@ $(TARGET) :
 	# Touch empty files
 	for i in auth/users backup/include.user backup/exclude.user \
 	    captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
-	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
 	    ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
 	    fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
 	    isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
-- 
2.25.0.rc0

[PATCH 2/2] DNS: Defaults to use the ISP nameservers.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/configroot | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lfs/configroot b/lfs/configroot
index d9a31e999..6092f889b 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -132,6 +132,7 @@ $(TARGET) :
 	echo  "DROPWIRELESSFORWARD=on"	>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "POLICY=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
 	echo  "POLICY1=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
+	echo  "USE_ISP_NAMESERVERS=on"  >> $(CONFIG_ROOT)/dns/settings
 
 	# Install snort to suricata converter.
 	cp $(DIR_SRC)/config/suricata/convert-snort	/usr/sbin/convert-snort
-- 
2.25.0.rc0

Re: [PATCH 2/2] DNS: Defaults to use the ISP nameservers.

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 16 Jan 2020, at 16:18, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> lfs/configroot | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/lfs/configroot b/lfs/configroot
> index d9a31e999..6092f889b 100644
> --- a/lfs/configroot
> +++ b/lfs/configroot
> @@ -132,6 +132,7 @@ $(TARGET) :
> 	echo  "DROPWIRELESSFORWARD=on"	>> $(CONFIG_ROOT)/optionsfw/settings
> 	echo  "POLICY=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
> 	echo  "POLICY1=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
> +	echo  "USE_ISP_NAMESERVERS=on"  >> $(CONFIG_ROOT)/dns/settings
> 
> 	# Install snort to suricata converter.
> 	cp $(DIR_SRC)/config/suricata/convert-snort	/usr/sbin/convert-snort
> -- 
> 2.25.0.rc0
> 

Re: [PATCH 1/2] configroot: Create /var/ipfire/dns/servers file

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2041 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 16 Jan 2020, at 16:18, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> config/rootfiles/common/configroot | 1 +
> lfs/configroot                     | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
> index 56b0257bc..67c4abc75 100644
> --- a/config/rootfiles/common/configroot
> +++ b/config/rootfiles/common/configroot
> @@ -41,6 +41,7 @@ var/ipfire/dhcp
> var/ipfire/dhcpc
> var/ipfire/dns
> #var/ipfire/dns/settings
> +#var/ipfire/dns/servers
> var/ipfire/dnsforward
> #var/ipfire/dnsforward/config
> var/ipfire/ethernet
> diff --git a/lfs/configroot b/lfs/configroot
> index 227d09239..d9a31e999 100644
> --- a/lfs/configroot
> +++ b/lfs/configroot
> @@ -63,7 +63,7 @@ $(TARGET) :
> 	# Touch empty files
> 	for i in auth/users backup/include.user backup/exclude.user \
> 	    captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
> -	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
> +	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
> 	    ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
> 	    fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
> 	    isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
> -- 
> 2.25.0.rc0
>