From 52d55e3997d58c9ec3d4d5c13fea371d827ec76e Mon Sep 17 00:00:00 2001
From: Julian Labus <julian@labus-online.de>
Date: Sat, 23 Mar 2019 14:59:12 +0100
Subject: [PATCH] Role server-basic: use openresolv to set nameserver

---
 roles/server-basic/files/resolvconf.if-down |  8 ++++++++
 roles/server-basic/files/resolvconf.if-up   | 18 ++++++++++++++++++
 roles/server-basic/tasks/main.yml           | 16 ++++++++++++++++
 roles/server-basic/vars/main.yml            |  1 +
 4 files changed, 43 insertions(+)
 create mode 100644 roles/server-basic/files/resolvconf.if-down
 create mode 100644 roles/server-basic/files/resolvconf.if-up

diff --git a/roles/server-basic/files/resolvconf.if-down b/roles/server-basic/files/resolvconf.if-down
new file mode 100644
index 0000000..b90c557
--- /dev/null
+++ b/roles/server-basic/files/resolvconf.if-down
@@ -0,0 +1,8 @@
+#!/bin/sh
+# ifdown hook script for resolvconf
+# Written by Roy Marples <roy@marples.name> under the BSD-2 license
+
+[ -x /sbin/resolvconf ] || exit 0
+
+[ "$METHOD" = dhcp ] && /sbin/resolvconf -f -d "$IFACE"
+/sbin/resolvconf -f -d "$IFACE"
diff --git a/roles/server-basic/files/resolvconf.if-up b/roles/server-basic/files/resolvconf.if-up
new file mode 100644
index 0000000..0eeefd2
--- /dev/null
+++ b/roles/server-basic/files/resolvconf.if-up
@@ -0,0 +1,18 @@
+#!/bin/sh
+# ifup hook script for resolvconf
+# Written by Roy Marples <roy@marples.name> under the BSD-2 license
+
+[ -x /sbin/resolvconf ] || exit 0
+
+conf=
+[ -n "$IF_DNS_DOMAIN" ] && conf="${conf}domain $IF_DNS_DOMAIN\n"
+[ -n "$IF_DNS_SEARCH" ] && conf="${conf}search $IF_DNS_SEARCH\n"
+[ -n "$IF_DNS_SORTLIST" ] && conf="${conf}sortlist $IF_DNS_SORTLIST\n"
+[ -n "$IF_DNS_OPTIONS" ] && conf="${conf}options $IF_DNS_OPTIONS\n"
+for nameserver in $IF_DNS_NAMESERVERS; do
+	conf="${conf}nameserver $nameserver\n"
+done
+if [ -n "$conf" ]; then
+	conf="# Generated by ifup for $IFACE\n$conf"
+	printf "$conf" | /sbin/resolvconf -a "$IFACE"
+fi
diff --git a/roles/server-basic/tasks/main.yml b/roles/server-basic/tasks/main.yml
index 877ca28..d50e282 100644
--- a/roles/server-basic/tasks/main.yml
+++ b/roles/server-basic/tasks/main.yml
@@ -39,6 +39,22 @@
   timezone:
     name: Europe/Berlin
 
+- name: copy resolvconf if-up
+  copy:
+    src: resolvconf.if-up
+    dest: /etc/network/if-up.d/000resolvconf
+    owner: root
+    group: root
+    mode: 0755
+
+- name: copy resolvconf if-down
+  copy:
+    src: resolvconf.if-down
+    dest: /etc/network/if-down.d/resolvconf
+    owner: root
+    group: root
+    mode: 0755
+
 - name: create ffmwu custom config dir
   file:
     path: /home/admin/.ffmwu-config
diff --git a/roles/server-basic/vars/main.yml b/roles/server-basic/vars/main.yml
index dfccc46..1b05a40 100644
--- a/roles/server-basic/vars/main.yml
+++ b/roles/server-basic/vars/main.yml
@@ -9,6 +9,7 @@ packages:
   - mlocate
   - mosh
   - net-tools
+  - openresolv
   - python-pip
   - python3-yaml
   - sysfsutils