diff options
author | Phil Davis <phil.davis@inf.org> | 2014-11-27 16:12:01 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2014-11-27 16:12:01 +0545 |
commit | e318d59221f839c55387959eda736baf290f7743 (patch) | |
tree | faa837d29f4f5642a59973278c14a523e700931d | |
parent | 23c5cf732a9ebbb70cc80030c6fdf925429fcd70 (diff) | |
download | pfsense-e318d59221f839c55387959eda736baf290f7743.zip pfsense-e318d59221f839c55387959eda736baf290f7743.tar.gz |
Fix Unbound host_entries.conf warnings on console during boot
system_hosts_generate() tried to make /var/unbound/host_entries.conf at various times in the boot sequence before the main Unbound start code was called. But these early calls to unbound-related things did not have any check to see if /var/unbound was created yet.
I pulled out the code to create /var/unbound into a separate routine, create_unbound_chroot_path, then call that before any of the file_put_contents.
That gets rid of the console error messages during boot, and also will correct any future issue with the sequence of calls to any of these routines.
-rw-r--r-- | etc/inc/unbound.inc | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc index 76512c9..acc803b 100644 --- a/etc/inc/unbound.inc +++ b/etc/inc/unbound.inc @@ -37,6 +37,18 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); +function create_unbound_chroot_path() { + global $config, $g; + + // Configure chroot + if (!is_dir($g['unbound_chroot_path'])) { + mkdir($g['unbound_chroot_path']); + chown($g['unbound_chroot_path'], "unbound"); + chgrp($g['unbound_chroot_path'], "unbound"); + } + +} + /* Optimize Unbound for environment */ function unbound_optimization() { global $config; @@ -325,6 +337,7 @@ include: {$g['unbound_chroot_path']}/remotecontrol.conf EOD; + create_unbound_chroot_path(); file_put_contents("{$g['unbound_chroot_path']}/unbound.conf", $unboundconf); return 0; @@ -346,6 +359,7 @@ remote-control: EOF; + create_unbound_chroot_path(); file_put_contents("{$g['unbound_chroot_path']}/remotecontrol.conf", $remotcfg); // Generate our keys @@ -383,12 +397,7 @@ function read_hosts() { function sync_unbound_service() { global $config, $g; - // Configure chroot - if (!is_dir($g['unbound_chroot_path'])) { - mkdir($g['unbound_chroot_path']); - chown($g['unbound_chroot_path'], "unbound"); - chgrp($g['unbound_chroot_path'], "unbound"); - } + create_unbound_chroot_path(); // Configure our Unbound service do_as_unbound_user("unbound-anchor"); @@ -479,8 +488,10 @@ function unbound_add_domain_overrides($pvt_rev="") { if ($pvt_rev != "") return $domain_entries; - else + else { + create_unbound_chroot_path(); file_put_contents("{$g['unbound_chroot_path']}/domainoverrides.conf", $domain_entries); + } } function unbound_add_host_entries() { @@ -504,6 +515,7 @@ function unbound_add_host_entries() { } // Write out entries + create_unbound_chroot_path(); file_put_contents("{$g['unbound_chroot_path']}/host_entries.conf", $unbound_entries); /* dhcpleases will write to this config file, make sure it exists */ @@ -636,6 +648,7 @@ function unbound_acls_config() { } } // Write out Access list + create_unbound_chroot_path(); file_put_contents("{$g['unbound_chroot_path']}/access_lists.conf", $aclcfg); } |