Changeset 12955 in hybrid for branches/releng-10/nanobsd

Timestamp:

Oct 12, 2014, 1:31:47 PM (10 years ago)

Author:

wouter

Message:

Unbound aangepast naar /var/unbound

Location:

branches/releng-10/nanobsd/files

Files:

• etc/rc.d/unbound (copied) (copied from branches/releng-10/nanobsd/files/usr/local/etc/rc.d/unbound ) (1 diff)
• var/unbound (copied) (copied from branches/releng-10/nanobsd/files/usr/local/etc/unbound )
• var/unbound/unbound.conf (modified) (4 diffs)
• var/unbound/unbound.conf.gateway (modified) (4 diffs)
• var/unbound/unbound.conf.node (modified) (4 diffs)
• var/unbound/unbound.conf.sample (modified) (6 diffs)

branches/releng-10/nanobsd/files/etc/rc.d/unbound

@@ -17 +17 @@
 load_rc_config $name
 
-command="/usr/local/sbin/unbound"
-pidfile=${unbound_pidfile:-"/usr/local/etc/unbound/unbound.pid"}
-command_args=${unbound_flags:-"-c /usr/local/etc/unbound/unbound.conf"}
+command="/usr/sbin/unbound"
+pidfile=${unbound_pidfile:-"/var/unbound/unbound.pid"}
+command_args=${unbound_flags:-"-c /var/unbound/unbound.conf"}
 extra_commands="reload"
 

branches/releng-10/nanobsd/files/var/unbound/unbound.conf

@@ -44 +44 @@
   # when servers change,  therefore  it is good practice to use a root-hints
   # file.  get one from ftp://FTP.INTERNIC.NET/domain/named.cache
-    root-hints: "/usr/local/etc/unbound/root.hints"
+    root-hints: "/var/unbound/root.hints"
 
   # enable to not answer id.server and hostname.bind queries.
@@ -151 +151 @@
   # queries will fail.
   
-    auto-trust-anchor-file: "/usr/local/etc/unbound/root.key"
+    auto-trust-anchor-file: "/var/unbound/root.key"
 
   # Should additional section of secure message also be kept clean of unsecure
@@ -179 +179 @@
   # suggest commenting out any of the local-zone and local-data lines above if
   # you suspect they could be included in the unbound_ad_servers servers file.
-  #include: "/usr/local/etc/unbound/unbound_ad_servers"
+  #include: "/var/unbound/unbound_ad_servers"
 
   # locally served zones can be configured for the machines on the LAN.
@@ -242 +242 @@
 
 
-   include: /usr/local/etc/unbound/forward-zone 
+   include: /var/unbound/forward-zone 
 
 #

branches/releng-10/nanobsd/files/var/unbound/unbound.conf.gateway

@@ -44 +44 @@
   # when servers change,  therefore  it is good practice to use a root-hints
   # file.  get one from ftp://FTP.INTERNIC.NET/domain/named.cache
-    root-hints: "/usr/local/etc/unbound/root.hints"
+    root-hints: "/var/unbound/root.hints"
 
   # enable to not answer id.server and hostname.bind queries.
@@ -151 +151 @@
   # queries will fail.
   
-    auto-trust-anchor-file: "/usr/local/etc/unbound/root.key"
+    auto-trust-anchor-file: "/var/unbound/root.key"
 
   # Should additional section of secure message also be kept clean of unsecure
@@ -179 +179 @@
   # suggest commenting out any of the local-zone and local-data lines above if
   # you suspect they could be included in the unbound_ad_servers servers file.
-  #include: "/usr/local/etc/unbound/unbound_ad_servers"
+  #include: "/var/unbound/unbound_ad_servers"
 
   # locally served zones can be configured for the machines on the LAN.
@@ -242 +242 @@
 
 
-   include: /usr/local/etc/unbound/forward-zone 
+   include: /var/unbound/forward-zone 
 
 #

branches/releng-10/nanobsd/files/var/unbound/unbound.conf.node

@@ -44 +44 @@
   # when servers change,  therefore  it is good practice to use a root-hints
   # file.  get one from ftp://FTP.INTERNIC.NET/domain/named.cache
-    root-hints: "/usr/local/etc/unbound/root.hints"
+    root-hints: "/var/unbound/root.hints"
 
   # enable to not answer id.server and hostname.bind queries.
@@ -151 +151 @@
   # queries will fail.
   
-    auto-trust-anchor-file: "/usr/local/etc/unbound/root.key"
+    auto-trust-anchor-file: "/var/unbound/root.key"
 
   # Should additional section of secure message also be kept clean of unsecure
@@ -179 +179 @@
   # suggest commenting out any of the local-zone and local-data lines above if
   # you suspect they could be included in the unbound_ad_servers servers file.
-  #include: "/usr/local/etc/unbound/unbound_ad_servers"
+  #include: "/var/unbound/unbound_ad_servers"
 
   # locally served zones can be configured for the machines on the LAN.
@@ -242 +242 @@
 
 
-   include: /usr/local/etc/unbound/forward-zone 
+   include: /var/unbound/forward-zone 
 
 #

branches/releng-10/nanobsd/files/var/unbound/unbound.conf.sample

@@ -203 +203 @@
         #
         # If you give "" no chroot is performed. The path must not end in a /.
-        # chroot: "/usr/local/etc/unbound"
+        # chroot: "/var/unbound"
 
         # if given, user privileges are dropped (after binding port),
@@ -213 +213 @@
         # relative to this directory. If you give "" the working directory
         # is not changed.
-        # directory: "/usr/local/etc/unbound"
+        # directory: "/var/unbound"
 
         # the log file, "" means log to stderr. 
@@ -230 +230 @@
 
         # the pid file. Can be an absolute path outside of chroot/work dir.
-        # pidfile: "/usr/local/etc/unbound/unbound.pid"
+        # pidfile: "/var/unbound/unbound.pid"
 
         # file to read root hints from.
@@ -343 +343 @@
         # Please note usage of unbound-anchor root anchor is at your own risk
         # and under the terms of our LICENSE (see that file in the source).
-        # auto-trust-anchor-file: "/usr/local/etc/unbound/root.key"
+        # auto-trust-anchor-file: "/var/unbound/root.key"
 
         # File with DLV trusted keys. Same format as trust-anchor-file.
@@ -533 +533 @@
 python:
         # Script file to load
-        # python-script: "/usr/local/etc/unbound/ubmodule-tst.py"
+        # python-script: "/var/unbound/ubmodule-tst.py"
 
 # Remote control config section. 
@@ -550 +550 @@
 
         # unbound server key file.
-        # server-key-file: "/usr/local/etc/unbound/unbound_server.key"
+        # server-key-file: "/var/unbound/unbound_server.key"
 
         # unbound server certificate file.
-        # server-cert-file: "/usr/local/etc/unbound/unbound_server.pem"
+        # server-cert-file: "/var/unbound/unbound_server.pem"
 
         # unbound-control key file.
-        # control-key-file: "/usr/local/etc/unbound/unbound_control.key"
+        # control-key-file: "/var/unbound/unbound_control.key"
 
         # unbound-control certificate file.
-        # control-cert-file: "/usr/local/etc/unbound/unbound_control.pem"
+        # control-cert-file: "/var/unbound/unbound_control.pem"
 
 # Stub zones.