updated to OpenBSD 6.2

synched configuration

14 files changed, 165 insertions, 50 deletions

diff --git a/config/firewall-test/networks b/config/firewall-test/networks
index c7d2fae..90aa283 100644
--- a/config/firewall-test/networks
+++ b/config/firewall-test/networks
@@ -1,10 +1,10 @@
-#       $OpenBSD: networks,v 1.5 1997/09/15 09:54:52 deraadt Exp $
+#	$OpenBSD: networks,v 1.5 1997/09/15 09:54:52 deraadt Exp $
 #
 
 # Internet networks (from nic.ddn.mil)
 # 1) The multicast network
-BASE-ADDRESS.MCAST.NET  224
-loopback                127     loop
+BASE-ADDRESS.MCAST.NET	224
+loopback		127	loop
 
 # Your subnets follow...
 
diff --git a/config/firewall-test/ntpd.conf b/config/firewall-test/ntpd.conf
index 66f9e11..31ddf19 100644
--- a/config/firewall-test/ntpd.conf
+++ b/config/firewall-test/ntpd.conf
@@ -1 +1,7 @@
+# $OpenBSD: ntpd.conf,v 1.14 2015/07/15 20:28:37 ajacoutot Exp $
+#
+# See ntpd.conf(5) and /etc/examples/ntpd.conf
+
 servers pool.ntp.org
+sensor *
+constraints from "https://www.google.com"
diff --git a/config/obr/dhcpd.conf b/config/obr/dhcpd.conf
index ebaa745..79688de 100644
--- a/config/obr/dhcpd.conf
+++ b/config/obr/dhcpd.conf
@@ -93,7 +93,7 @@ shared-network LAN {
     }
 
     host euromac {
-      hardware ethernet 00:1c:b3:c3:74:8c;
+       hardware ethernet 00:1b:63:9f:43:0c;
       fixed-address 192.168.1.20;
     }
 
@@ -101,5 +101,20 @@ shared-network LAN {
       hardware ethernet b8:27:eb:15:62:14;
       fixed-address 192.168.1.21;
     }
+
+    host eurobuild6 {
+      hardware ethernet 00:00:1c:b6:26:37;
+      fixed-address 192.168.1.22;
+    }
+
+    host eurobuild7 {
+      hardware ethernet 00:0E:2E:05:BF:88;
+      fixed-address 192.168.1.23;
+    }
+
+    host eurotv {
+      hardware ethernet B8:27:EB:A0:10:58;
+      fixed-address 192.168.1.24;
+    }
   }
 }
diff --git a/config/obr/joe/ftyperc b/config/obr/joe/ftyperc
index 77c2230..fc2cdaf 100644
--- a/config/obr/joe/ftyperc
+++ b/config/obr/joe/ftyperc
@@ -85,6 +85,7 @@
 [mason]
 *.mas
 -autoindent
+-title
 -syntax mason
 -smarthome
 -smartbacks
@@ -93,6 +94,7 @@
 [sml]
 *.sml
 -autoindent
+-title
 -syntax sml
 -smarthome
 -smartbacks
@@ -104,6 +106,7 @@
  OCaml language interface
 *.mli
 -autoindent
+-title
 -syntax ocaml
 -smarthome
 -smartbacks
@@ -120,6 +123,7 @@
 *Guardfile
 *.rabl
 -autoindent
+-title
 -pound_comment
 -syntax ruby
 -text_delimiters do=end
@@ -132,6 +136,7 @@
 *.pm
 *.t
 -autoindent
+-title
 -syntax perl
 -smarthome
 -smartbacks
@@ -142,6 +147,7 @@
 [sql]
 *.sql
 -autoindent
+-title
 -syntax sql
 -smarthome
 -smartbacks
@@ -157,6 +163,7 @@
 [awk]
 *.awk
 -autoindent
+-title
 -syntax awk
 -smarthome
 -smartbacks
@@ -167,6 +174,7 @@
 [yacc]
 *.y
 -autoindent
+-title
 -syntax c
 -highlighter_context
 -smarthome
@@ -183,6 +191,7 @@
 *.l
 *.lex
 -autoindent
+-title
 -syntax c
 -highlighter_context
 -smarthome
@@ -200,6 +209,7 @@
 *.ads
 -syntax ada
 -autoindent
+-title
 -istep 2
 -smarthome
 -smartbacks
@@ -221,6 +231,7 @@
 +#![ 	]*[^\n]*rexx[0-9.]*\>
 -syntax rexx
 -autoindent
+-title
 
  SED script
 [sed]
@@ -247,6 +258,7 @@
 *.hh
 *.mm
 -autoindent
+-title
 -syntax c
 -highlighter_context
 -smarthome
@@ -330,6 +342,7 @@
 [java]
 *.java
 -autoindent
+-title
 -syntax java
 -smarthome
 -smartbacks
@@ -344,6 +357,7 @@
 *
 +#![ 	]*[^\n]*nodejs[0-9.]*\>
 -autoindent
+-title
 -syntax js
 -smarthome
 -smartbacks
@@ -364,6 +378,7 @@
 [typescript]
 *.ts
 -autoindent
+-title
 -syntax typescript
 -smarthome
 -smartbacks
@@ -376,6 +391,7 @@
 [php]
 *.php
 -autoindent
+-title
 -syntax php
 -smarthome
 -smartbacks
@@ -387,6 +403,7 @@
 +#![ 	]*[^\n]*python[0-9.]*\>
 *.py
 -autoindent
+-title
 -syntax python
 -highlighter_context
 -smarthome
@@ -406,6 +423,7 @@
 *.tcsh
 *.tcshrc
 -autoindent
+-title
 -syntax csh
 -pound_comment
 
@@ -421,6 +439,7 @@
 *.bash_login
 *.bash_logout
 -autoindent
+-title
 -syntax sh
 -highlighter_context
 -pound_comment
@@ -432,6 +451,7 @@
 *.lsp
 *.el
 -autoindent
+-title
 -syntax lisp
 -semi_comment
 
@@ -441,6 +461,7 @@
 +#![ 	]*[^\n 	]*/ksh\>
 *.ksh
 -autoindent
+-title
 -syntax sh
 -highlighter_context
 -pound_comment
@@ -451,19 +472,21 @@
 *.p
 *.pas
 -autoindent
+-title
 -syntax pascal
 -smarthome
 -smartbacks
 -purify
 -text_delimiters begin|BEGIN|record|RECORD|case|CASE=end|END:repeat|REPEAT=until|UNTIL
 
- Fortral
+ Fortran
 [fortran]
 *.f
 *.f90
 *.for
 *.FOR
 -autoindent
+-title
 -syntax fortran
 
  Cadence SKILL
@@ -472,6 +495,7 @@
 -semi_comment
 -syntax skill
 -autoindent
+-title
 -istep 3
 -indentc 32
 -smartbacks
@@ -484,18 +508,21 @@
 *
 +#![ 	]*[^\n]*lua[0-9.]*\>
 -autoindent
+-title
 -syntax lua
 
  TCL
 [tcl]
 *.tcl
 -autoindent
+-title
 -syntax tcl
 
  Go language
 [go]
 *.go
 -autoindent
+-title
 -syntax go
 -smarthome
 -smartbacks
@@ -509,6 +536,7 @@
 [c#]
 *.cs
 -autoindent
+-title
 -syntax csharp
 -smarthome
 -smartbacks
@@ -521,6 +549,7 @@
 *.jsf
 *.jsf.in
 -autoindent
+-title
 -syntax jsf
 -smarthome
 
@@ -529,6 +558,7 @@
 *.ac
 *.m4
 -autoindent
+-title
 -syntax m4
 
  Matlab file (clashes with objective-C)
@@ -647,12 +677,14 @@
 *.erlang
 -syntax erlang
 -autoindent
+-title
 
  Sieve (ManageSieve)
 [sieve]
 *.sieve
 -syntax sieve
 -autoindent
+-title
 
  Puppet
 [puppet]
@@ -660,6 +692,7 @@
 -syntax puppet
 -pound_comment
 -autoindent
+-title
 
  ip(6)tables
 [iptables]
@@ -672,7 +705,11 @@
  PowerShell
 [powershell]
 *.ps1
+*.psm1
 -syntax powershell
+-autoindent
+-smarthome
+-smartbacks
 
  Git COMMIT_EDITMSG
 [git-commit]
@@ -684,14 +721,20 @@
 *.ex
 *.exs
 -autoindent
+-smarthome
+-smartbacks
+-title
 -syntax elixir
 -pound_comment
--text_delimiters do=end
+-text_delimiters do=else=end
+-indentc 32
+-istep 2
 
  R
 [r]
 *.r
 -autoindent
+-title
 -syntax r
 -pound_comment
 -smarthome
@@ -706,6 +749,7 @@
 *.gy
 *.gsh
 -autoindent
+-title
 -syntax groovy
 -c_comment
 -cpp_comment
@@ -721,6 +765,7 @@
 *.cljc
 *.edn
 -autoindent
+-title
 -syntax clojure
 -semi_comment
 -smarthome
@@ -731,6 +776,7 @@
 [rust]
 *.rs
 -autoindent
+-title
 -syntax rust
 -c_comment
 -cpp_comment
@@ -743,6 +789,7 @@
 [coffee]
 *.coffee
 -autoindent
+-title
 -syntax coffee
 -pound_comment
 -smarthome
@@ -754,6 +801,7 @@
 [scala]
 *.scala
 -autoindent
+-title
 -syntax scala
 -c_comment
 -cpp_comment
@@ -766,6 +814,7 @@
 [swift]
 *.swift
 -autoindent
+-title
 -syntax swift
 -c_comment
 -cpp_comment
@@ -778,6 +827,7 @@
 [d]
 *.d
 -autoindent
+-title
 -syntax d
 -c_comment
 -cpp_comment
@@ -785,3 +835,17 @@
 -smartbacks
 -purify
 -single_quoted
+
+ Docker
+[dockerfile]
+*Dockerfile
+-autoindent
+-title
+-syntax dockerfile
+-pound_comment
+
+ RPM Spec
+[spec]
+*.spec
+-autoindent
+-syntax spec
diff --git a/config/obr/joe/jstarrc b/config/obr/joe/jstarrc
index c941e82..63c43b3 100644
--- a/config/obr/joe/jstarrc
+++ b/config/obr/joe/jstarrc
@@ -53,6 +53,8 @@
  -help_is_utf8	Set if help text is in UTF-8 format.  Leave clear if it's a raw 8-bit format.
 
  -mid		Cursor is recentered when scrolling is necessary
+ -left nn	Amount to jump left when scrolling is necessary (-1 for 1/4 width)
+ -right nn	Amount to jump right when scrolling is necessary (-1 for 1/4 width)
  -marking	Text between ^KB and cursor is highlighted (use with -lightoff)
  -asis		Characters 128 - 255 shown as-is
  -force		Force final newline when files are saved
@@ -96,7 +98,7 @@
  -lines nnn	Set no. screen lines
  -baud nnn	Set baud rate for terminal optimizations
  -columns nnn	Set no. screen columns
- -help		Start with help on
+ -helpon	Start with help on
  -skiptop nnn	Don't use top nnn lines of the screen
 
 -notite         Don't send terminal initialization and termination strings: prevents
@@ -235,6 +237,11 @@
 -rmsg  %S Row %4r Col %3c %t  Ctrl-J for help
 -smsg ** Line %r Col %c Offset %o(0x%O) %e %a(0x%A) Width %w ** 
 -zmsg ** Line %r Col %c Offset %o(0x%O) ** 
+-xmsg \i Joe's Own Editor %v (%b) ** Type \bCtrl-K Q\b to exit or \bCtrl-J\b for help **\i
+
+ Key sequence hints which are displayed in various prompts.
+-aborthint ^C
+-helphint ^J
 
 
  SECOND SECTION: File name dependant local option settings:
@@ -409,6 +416,7 @@ mode,"asis",rtn	% % Meta chars as-is
 mode,"language",rtn	V Language
 mode,"picture",rtn	P picture %Zpicture%
 mode,"type",rtn		F File type [%Ztype%]
+mode,"title",rtn	C Context %Ztitle%
 menu,"more-options",rtn	  % % More options...
 
 :defmenu more-options menu,"root",rtn
@@ -490,6 +498,8 @@ mode,"backpath",rtn	% % Path to backup files %Zbackpath%
 :defmenu cursor menu,"more-options",rtn
 mode,"pg",rtn	% % No. PgUp/PgDn lines %Zpg%
 mode,"mid",rtn	C Center on scroll %Zmid%
+mode,"left",rtn	L Columns to scroll left %Zleft%
+mode,"right",rtn R Columns to scroll right %Zright%
 mode,"floatmouse",rtn	% % Click past end %Zfloatmouse%
 mode,"rtbutton",rtn	% % Right button %Zrtbutton%
 
@@ -750,6 +760,8 @@ defm2drag	M2DRAG		Select a region of words
 defm3down	M3DOWN		Select the line at the mouse location
 defm3up		M3UP
 defm3drag	M3DRAG		Select a region of lines
+defmiddleup	MIDDLEUP
+defmiddledown	MIDDLEDOWN	Insert text
 
 xtmouse		^[ [ M		Introduces an xterm mouse event
 extmouse	^[ [ <		Introduces an extended xterm mouse event
@@ -766,12 +778,12 @@ extmouse	^[ [ <		Introduces an extended xterm mouse event
 :def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell --lang=",language,".",charset," -x -c $SPLTMP </dev/tty >/dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword
 
 
-aspellfile	^Q l
-aspellfile	^Q L
-aspellfile	^Q ^L
-aspellword	^Q n
-aspellword	^Q N
-aspellword	^Q ^N
+ispellfile	^Q l
+ispellfile	^Q L
+ispellfile	^Q ^L
+ispellword	^Q n
+ispellword	^Q N
+ispellword	^Q ^N
 
  Compile macro
 
diff --git a/config/obr/nsd-external/zones/maschezuoz.ch b/config/obr/nsd-external/zones/maschezuoz.ch
index e9d62cf..169ca52 100644
--- a/config/obr/nsd-external/zones/maschezuoz.ch
+++ b/config/obr/nsd-external/zones/maschezuoz.ch
@@ -3,7 +3,7 @@
 $TTL 60
 
 @		IN	SOA	ns.maschezuoz.ch. admin.maschezuoz.ch. (
-				2016090301	; serial
+				2017050500	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -24,6 +24,7 @@ $ORIGIN maschezuoz.ch.
 ns	IN	A		83.150.2.48
 
 www	IN	A		83.150.2.48
+www-joomla	IN	A	83.150.2.48
 imap	IN	A		83.150.2.48
 smtp	IN	A		83.150.2.48
 webmail	IN	A		83.150.2.48
diff --git a/config/obr/nsd-internal/zones/1.168.192.in-addr b/config/obr/nsd-internal/zones/1.168.192.in-addr
index 308c459..da3cf1d 100644
--- a/config/obr/nsd-internal/zones/1.168.192.in-addr
+++ b/config/obr/nsd-internal/zones/1.168.192.in-addr
@@ -5,7 +5,7 @@ $ORIGIN .
 $TTL 60
 
 1.168.192.in-addr.arpa	IN SOA	obr.lan. root.obr.lan. (
-				2017031000	; serial
+				2017080800	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -33,6 +33,9 @@ $ORIGIN 1.168.192.in-addr.arpa.
 18		IN	PTR	eurobuild4.lan.
 19		IN	PTR	phone.lan.
 20		IN	PTR	euromac.lan.
-21		IN	PTR	eurobuild5.lan
+21		IN	PTR	eurobuild5.lan.
+22		IN	PTR	eurobuild6.lan.
+23		IN	PTR	eurobuild7.lan.
+24		IN	PTR	eurotv.lan.
 253		IN	PTR	wrt2.lan.
 254		IN	PTR	wrt1.lan.
diff --git a/config/obr/nsd-internal/zones/lan b/config/obr/nsd-internal/zones/lan
index 8c867e3..820d4c2 100644
--- a/config/obr/nsd-internal/zones/lan
+++ b/config/obr/nsd-internal/zones/lan
@@ -5,7 +5,7 @@ $ORIGIN .
 $TTL 60
 
 lan	IN		SOA	obr.lan. root.obr.lan. (
-				2017031000	; serial
+				2017080800	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -34,6 +34,9 @@ eurobuild4		A		192.168.1.18
 phone			A		192.168.1.19
 euromac			A		192.168.1.20
 eurobuild5		A		192.168.1.21
+eurobuild6		A		192.168.1.22
+eurobuild7		A		192.168.1.23
+eurotv			A		192.168.1.24
 wrt2			A		192.168.1.253
 wrt1			A		192.168.1.254
 iway-gateway		A		83.150.2.1
diff --git a/config/obr/nsd-internal/zones/maschezuoz.ch b/config/obr/nsd-internal/zones/maschezuoz.ch
index 5772068..6cf384a 100644
--- a/config/obr/nsd-internal/zones/maschezuoz.ch
+++ b/config/obr/nsd-internal/zones/maschezuoz.ch
@@ -3,7 +3,7 @@
 $TTL 60
 
 @		IN	SOA	ns.maschezuoz.ch. admin.maschezuoz.ch. (
-				2016090500	; serial
+				2017050502	; serial
 				3h		; refresh
 				15m		; retry
 				2w		; expire
@@ -21,6 +21,7 @@ $ORIGIN maschezuoz.ch.
 ns			A	192.168.1.1
 
 www			A	192.168.1.15
+www-joomla		A	192.168.1.15
 smtp			A	192.168.1.15
 imap			A	192.168.1.15
 webmail			A	192.168.1.15
diff --git a/config/obr/ntpd.conf b/config/obr/ntpd.conf
index f006321..77dba6a 100644
--- a/config/obr/ntpd.conf
+++ b/config/obr/ntpd.conf
@@ -1,3 +1,7 @@
+# $OpenBSD: ntpd.conf,v 1.14 2015/07/15 20:28:37 ajacoutot Exp $
+#
+# See ntpd.conf(5) and /etc/examples/ntpd.conf
+
 servers pool.ntp.org
 listen on 127.0.0.1
 listen on 192.168.1.1
diff --git a/config/obr/pf.conf b/config/obr/pf.conf
index d29aa8a..d158799 100644
--- a/config/obr/pf.conf
+++ b/config/obr/pf.conf
@@ -101,10 +101,12 @@ pass out on $int_if inet proto tcp to $eurodata port 21 user proxy
 pass in on $ext_if inet proto tcp to port 2121 divert-to 127.0.0.1 port 8022
 pass out on $int_if inet proto tcp to $eurobuild3 port 2121 user proxy
 pass in on $ext_if proto tcp from any to port 2221 rdr-to $euroweb port 22
+pass in on $ext_if proto tcp from any to port 2222 rdr-to $eurodata port 22
 pass in on $ext_if proto tcp from any to port 2223 rdr-to $eurobuild3 port 22
 pass in on $ext_if proto tcp from any to port 2224 rdr-to $eurobuild4 port 22
 pass in on $ext_if proto tcp from any to port 2225 rdr-to $eurobuild5 port 22
 pass in on $ext_if proto tcp from any to port 5900:5999 rdr-to $eurobuild3
 pass in on $ext_if proto tcp from any to port 6881:6889 rdr-to $eurobuild3
+pass in on $ext_if proto tcp from any to port 9981:9982 rdr-to $eurobuild3
 pass in on $ext_if proto tcp from any to port 6001 rdr-to $europa1 port 6000
 pass in on $ext_if proto tcp from any to port 9372 rdr-to $eeepc port 9372
diff --git a/config/obr/relayd.conf b/config/obr/relayd.conf
index 3036e5f..5857464 100644
--- a/config/obr/relayd.conf
+++ b/config/obr/relayd.conf
@@ -20,17 +20,19 @@ http protocol "http_protocol" {
 	match request header set "Connection" value "close"
 	match request header set "Keep-Alive" value "$TIMEOUT"
 
-	match response header set "Server" value "Non of your business"
+	match response header set "Server" value "None of your business"
 
 	tcp { nodelay, sack, socket buffer 65536, backlog 128 }
 
 	match request tag disallowed_host
 	match request quick header "Host" value "www.maschezuoz.ch" \
 		forward to <euroweb> no tag
-	match request quick header "Host" value "www.andreasbaumann.cc" \
+	match request quick header "Host" value "www-joomla.maschezuoz.ch" \
 		forward to <euroweb> no tag
 	match request quick header "Host" value "maschezuoz.ch" \
 		forward to <euroweb> no tag
+	match request quick header "Host" value "www.andreasbaumann.cc" \
+		forward to <euroweb> no tag
 	match request quick header "Host" value "andreasbaumann.cc" \
 		forward to <euroweb> no tag
 	match request quick header "Host" value "git.andreasbaumann.cc" \
@@ -43,8 +45,6 @@ http protocol "http_protocol" {
 		forward to <euroweb> no tag
 	match request quick header "Host" value "mon.andreasbaumann.cc" \
 		forward to <euroserver> no tag
-	match request quick header "Host" value "www.maschezuoz.ch" \
-		forward to <euroweb> no tag
 
 	block request tagged disallowed_host label "BAD host"
 }
@@ -58,9 +58,13 @@ http protocol "https_protocol" {
 	match request header set "Connection" value "close"
 	match request header set "Keep-Alive" value "$TIMEOUT"
 
-	match response header set "Server" value "Non of your business"
+	match response header set "Server" value "None of your business"
 
 	tcp { nodelay, sack, socket buffer 65536, backlog 128 }
+
+#	tls ca key "/etc/ssl/private/webmail.andreasbaumann.cc.key" password ""
+#	tls ca cert "/etc/ssl/webmail.andreasbaumann.cc.crt"
+#	tls ca file "/etc/ssl/webmail.andreasbaumann.cc.intermediate.crt"
 }
 
 relay http_relay {
diff --git a/config/obr/unbound/etc/root.hints b/config/obr/unbound/etc/root.hints
index 7408cc6..198d1b3 100644
--- a/config/obr/unbound/etc/root.hints
+++ b/config/obr/unbound/etc/root.hints
@@ -1,92 +1,92 @@
-;       This file holds the information on root name servers needed to
+;       This file holds the information on root name servers needed to 
 ;       initialize cache of Internet domain name servers
 ;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
+;       configuration file of BIND domain name servers). 
+; 
 ;       This file is made available by InterNIC 
 ;       under anonymous FTP as
-;           file                /domain/named.cache
+;           file                /domain/named.cache 
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    April 11, 2017
-;       related version of root zone:   2017041101
-;
-; formerly NS.INTERNIC.NET
+; 
+;       last update:     August 29, 2017 
+;       related version of root zone:     2017082901
+; 
+; FORMERLY NS.INTERNIC.NET 
 ;
 .                        3600000      NS    A.ROOT-SERVERS.NET.
 A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
 A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
+; 
+; FORMERLY NS1.ISI.EDU 
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
 B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::b
-;
-; FORMERLY C.PSI.NET
+B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:200::b
+; 
+; FORMERLY C.PSI.NET 
 ;
 .                        3600000      NS    C.ROOT-SERVERS.NET.
 C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
 C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
+; 
+; FORMERLY TERP.UMD.EDU 
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
 D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
-;
+; 
 ; FORMERLY NS.NASA.GOV
 ;
 .                        3600000      NS    E.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
 E.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:a8::e
-;
+; 
 ; FORMERLY NS.ISC.ORG
 ;
 .                        3600000      NS    F.ROOT-SERVERS.NET.
 F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
 F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
-;
+; 
 ; FORMERLY NS.NIC.DDN.MIL
 ;
 .                        3600000      NS    G.ROOT-SERVERS.NET.
 G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
 G.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:12::d0d
-;
+; 
 ; FORMERLY AOS.ARL.ARMY.MIL
 ;
 .                        3600000      NS    H.ROOT-SERVERS.NET.
 H.ROOT-SERVERS.NET.      3600000      A     198.97.190.53
 H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::53
-;
+; 
 ; FORMERLY NIC.NORDU.NET
 ;
 .                        3600000      NS    I.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
 I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
-;
+; 
 ; OPERATED BY VERISIGN, INC.
 ;
 .                        3600000      NS    J.ROOT-SERVERS.NET.
 J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
 J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
-;
+; 
 ; OPERATED BY RIPE NCC
 ;
 .                        3600000      NS    K.ROOT-SERVERS.NET.
 K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
 K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
-;
+; 
 ; OPERATED BY ICANN
 ;
 .                        3600000      NS    L.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
 L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:9f::42
-;
+; 
 ; OPERATED BY WIDE
 ;
 .                        3600000      NS    M.ROOT-SERVERS.NET.
 M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
 M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
-; End of file
+; End of file
\ No newline at end of file
diff --git a/config/obr/unbound/etc/unbound.conf b/config/obr/unbound/etc/unbound.conf
index 37ecd7a..434605b 100644
--- a/config/obr/unbound/etc/unbound.conf
+++ b/config/obr/unbound/etc/unbound.conf
@@ -27,7 +27,7 @@ server:
 
  	verbosity: 2
 
-	root-hints: "/etc/root.hints"
+	root-hints: "/etc/unbound/etc/root.hints"
 
 	do-not-query-localhost: no