From 7750d1a26653288300c865e47c6f3838ba08e3b1 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 1 Mar 2017 23:01:09 +0100 Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20la=20config=20du=20r?= =?UTF-8?q?=C3=A9solveur=20dns=20vers=20private=20+=20purge=20base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base.nix | 1 - base/Makefile | 1 - base/base.nix | 14 -------------- base/network-dns.nix | 22 ---------------------- 4 files changed, 38 deletions(-) delete mode 120000 base/Makefile delete mode 100644 base/base.nix delete mode 100644 base/network-dns.nix diff --git a/base.nix b/base.nix index c25215e..099469e 100644 --- a/base.nix +++ b/base.nix @@ -10,7 +10,6 @@ in { imports = [ # recettes - ./base/base.nix ./desktop/desktop.nix ./public/public.nix diff --git a/base/Makefile b/base/Makefile deleted file mode 120000 index c63c5da..0000000 --- a/base/Makefile +++ /dev/null @@ -1 +0,0 @@ -/etc/nixos/base/Makefile \ No newline at end of file diff --git a/base/base.nix b/base/base.nix deleted file mode 100644 index d351f06..0000000 --- a/base/base.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - #inherit (lib) mkIf mkMerge mkThenElse; - cfg = config.r6d.config-generator; - computers = config.r6d.computers; - profiles = config.r6d.profiles; -in - -{ - imports = [ - ./network-dns.nix - ]; -} diff --git a/base/network-dns.nix b/base/network-dns.nix deleted file mode 100644 index fe5efe4..0000000 --- a/base/network-dns.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) mkIf mkMerge mkThenElse; - cfg = config.r6d.config-generator; - computers = config.r6d.computers; - profiles = config.r6d.profiles; -in - -mkIf true { - - # Définition des domaines utilisés lorsque un identifiant non-FQDN est donné (ping, nslookup) - networking = { - search = [ - "dubronetwork.fr" - "prunetwork.fr" - "teleragno.fr" - "teleragno.net" - ]; - dnsExtensionMechanism = true; - }; -}