From patchwork Wed Feb 5 14:27:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2762 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48CP6105Tkz3xyQ for ; Wed, 5 Feb 2020 14:27:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48CP5y5Gxtz6ZJ; Wed, 5 Feb 2020 14:27:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48CP5y1m38z2yXv; Wed, 5 Feb 2020 14:27:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48CP5w53lnz2yRX for ; Wed, 5 Feb 2020 14:27:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48CP5w1mSNz6Z2; Wed, 5 Feb 2020 14:27:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1580912836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MgNpl/6gfdxqw+PNLX5grlrdSzepQ5mzxFYzpYvIpqw=; b=Jliz/Zk+GP8B3ytVS/2QlEWRwLuuPgktYK3IlEl/AHnRhTJlA7/aW3oqVXulXRozi9dRNW B+xtgL5W2hVoZMAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1580912836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MgNpl/6gfdxqw+PNLX5grlrdSzepQ5mzxFYzpYvIpqw=; b=IlLM3NzVTXNA6Y12xEiSuarcHs12fDVzN78ngs2L8Szdn4SZSdyHYKN/S3gPTWIKXLEhEb hbttIwhim7DET2VDTJ/g4F1CwLPWcRitTlJ6bZVPLfS8RxdJ6N5eJP61odh8CQATiYC8Hp Cjr9DU1tnSMWE7UK6d1+rfcbUK6wyXDA3jdeb9b2SdhzvIGjjeFxTL+eVR5PaHuBNsf3XW f0xoKmFYUnC74+6DJ2zfzrL/rZJ7wj7/be2tJM08yxSXjEWJK8HbHqut1bLuv6kW75XBIa 8C+TxtJVnrToi9XjQB5RwzhM4FpQlUFGWc2aR+tleLJ01SZ3UxyXJCwBMNaCHw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] cloud-init: Disable using ISP nameservers Date: Wed, 5 Feb 2020 14:27:08 +0000 Message-Id: <20200205142708.22129-3-michael.tremer@ipfire.org> In-Reply-To: <20200205142708.22129-1-michael.tremer@ipfire.org> References: <20200205142708.22129-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is mostly aesthetic because there are no ISP nameservers anyways that we could use here. Signed-off-by: Michael Tremer --- src/initscripts/helper/aws-setup | 3 +++ src/initscripts/helper/azure-setup | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 2c3311fc2..884319822 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -214,6 +214,9 @@ import_aws_configuration() { # Actions performed only on the very first start if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Disable using ISP nameservers + sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings + # Enable SSH sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index d84ec3aca..291b8e0a4 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -240,6 +240,9 @@ import_azure_configuration() { # Actions performed only on the very first start if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Disable using ISP nameservers + sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings + # Enable SSH sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings