From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Mon, 24 Oct 2016 08:46:35 +0000 (+0200)
Subject: Correction :         local/network-configure
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/%40%20%27info_adresse%27%20=%3E%20%27to%20this%20address:%27%2C%20%27info_adresse_url%27%20=%3E%20%27URL%20of%20the%20public%20site%27%2C%20%27info_afficher_par_nb%27%20=%3E%20%27Show%20%27%2C-%27info_afficher_visites%27%20=%3E%20%27Show%20visits%20for:%27%2C%20%27info_aide_en_ligne%27%20=%3E%20%27SPIP%20Online%20Help%27%2C%20%27info_ajout_image%27%20=%3E%20%27When%20you%20add%20images%20as%20attached%20documents%20to%20an%20article%2C%20%20%20SPIP%20can%20automatically%20create%20thumbnails%20from%20%20%20inserted%20images.%20This%20will%20allow%2C%20for%20instance%2C%20the%20automated%20%20%20creation%20of%20a%20gallery%20or%20portfolio.%27%2C-%27info_ajout_participant%27%20=%3E%20%27The%20following%20participant%20has%20been%20added:%27%2C%20%27info_ajouter_rubrique%27%20=%3E%20%27Add%20another%20section%20to%20manage:%27%2C%20%27info_annonce_nouveautes%27%20=%3E%20%27Latest%20news%20announcements%27%2C-%27info_anterieur%27%20=%3E%20%27previous%27%2C%20%27info_article%27%20=%3E%20%27article%27%2C%20%27info_article_2%27%20=%3E%20%27articles%27%2C%20%27info_article_a_paraitre%27%20=%3E%20%27Post-dated%20articles%20set%20for%20publication%27%2C%40%40%20-268%2C17%20%20229%2C12%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=0f30c735772aaf4cf4931b4a4fdf6092b5e177f0;p=lhc%2Fateliers.git

Correction :         local/network-configure
---

diff --git a/etc/sv/unbound/local.sh b/etc/sv/unbound/local.sh
index 319df49..866f665 100644
--- a/etc/sv/unbound/local.sh
+++ b/etc/sv/unbound/local.sh
@@ -1,11 +1,6 @@
 sudo apt-get install unbound
 "$tool"/local/insserv-remove  unbound
 
-sudo install -m 644 -o root -g root /dev/stdin /etc/resolv.conf <<-EOF
-	search ${local_host#*.}
-	nameserver 127.0.0.1
-	#nameserver ${local_host_nameserver}
-	EOF
 sudo install -m 440 -o unbound -g unbound \
  "$tool"/etc/unbound/named.cache \
  /etc/unbound/named.cache
diff --git a/local/network-configure b/local/network-configure
index 8a7e721..e349a7b 100755
--- a/local/network-configure
+++ b/local/network-configure
@@ -17,7 +17,6 @@ sudo install -m 644 -o root -g root /dev/stdin \
  /etc/hosts
 sudo install -m 644 -o root -g root /dev/stdin \
  /etc/resolv.conf <<-EOF
-	domain ${local_domainname}
 	search ${local_host#*.}
 	nameserver 127.0.0.1
 	#nameserver ${local_host_nameserver}