webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 18:32:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

cloud-init: Remove importing DNS settings

Browse Source 
Those scripts used to import settings from the meta-data services
and wrote them to the local configuration files.

For the DNS settings and Amazon, this is no longer possible because
their DNS servers do not support DNSSEC at all. Therefore we default
to recursor mode.

To be consistent across cloud providers, we are doing the same for
Azure.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Michael Tremer
2020-01-19 16:32:14 +00:00
committed by Arne Fitzenreiter
parent c07c3e47f1
commit f770492902
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/initscripts/helper/aws-setup
View File

@@ -115,9 +115,6 @@ import_aws_configuration() {
fi
fi
# Import any DNS server settings
eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
# Import network configuration
# After this, no network connectivity will be available from this script due to the
# renaming of the network interfaces for which they have to be shut down
@@ -161,10 +158,6 @@ import_aws_configuration() {
# The gateway is always the first IP address in the subnet
local gateway="$(to_address $(( netaddress_num + 1 )))"
# The AWS internal DNS service is available on the second IP address of the VPC
local dns1="$(to_address $(( vpc_netaddress_num + 2 )))"
local dns2=
(
echo "RED_TYPE=STATIC"
echo "RED_DEV=${interface_name}"
@@ -175,8 +168,6 @@ import_aws_configuration() {
echo "RED_NETADDRESS=${netaddress}"
echo "RED_BROADCAST=${broadcast}"
echo "DEFAULT_GATEWAY=${gateway}"
echo "DNS1=${DNS1:-${dns1}}"
echo "DNS2=${DNS2:-${dns2}}"
) >> /var/ipfire/ethernet/settings
# Import aliases for RED

10
src/initscripts/helper/azure-setup
View File

@@ -138,9 +138,6 @@ import_azure_configuration() {
fi
fi
# Import any DNS server settings
eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
# Import network configuration
# After this, no network connectivity will be available from this script due to the
# renaming of the network interfaces for which they have to be shut down
@@ -175,11 +172,6 @@ import_azure_configuration() {
# The gateway is always the first IP address in the subnet
local gateway="$(to_address $(( netaddress_num + 1 )))"
# Microsoft uses a special IP address for DNS
# https://blogs.msdn.microsoft.com/mast/2015/05/18/what-is-the-ip-address-168-63-129-16/
local dns1="168.63.129.16"
local dns2=
(
echo "RED_TYPE=STATIC"
echo "RED_DEV=${interface_name}"
@@ -190,8 +182,6 @@ import_azure_configuration() {
echo "RED_NETADDRESS=${netaddress}"
echo "RED_BROADCAST=${broadcast}"
echo "DEFAULT_GATEWAY=${gateway}"
echo "DNS1=${DNS1:-${dns1}}"
echo "DNS2=${DNS2:-${dns2}}"
) >> /var/ipfire/ethernet/settings
# Import aliases for RED