From d6d25e9ec65f5c65a539eaca472814c78fd22a15 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 27 Jul 2018 13:09:33 -0400 Subject: [PATCH 1/2] Fix script invocation when scanning a directory Since the directory was not preprended to the filenames, no scripts could ever be called. --- bureau/class/m_hooks.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bureau/class/m_hooks.php b/bureau/class/m_hooks.php index 1093b077..956edc4c 100644 --- a/bureau/class/m_hooks.php +++ b/bureau/class/m_hooks.php @@ -82,6 +82,8 @@ class m_hooks { } } else if (is_dir($scripts)) { foreach (scandir($scripts) as $ccc) { + # scandir returns the file names only + $ccc = $scripts . '/' . $ccc; if (is_file($ccc) && is_executable($ccc)) { $to_launch[] = $ccc; } From e24d17288b676c8912631c20dd40d98d9dbe500e Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 27 Jul 2018 13:22:12 -0400 Subject: [PATCH 2/2] Reload the zone after running the reload.d hooks for dns_reload_zone This matches the existing behaviour of dns_regenerate in functions_dns.sh, where dns_reload_zone is called before bind9 reload is invoked for the domain. A future improvement would be to add a new hook for modifying zone files in save_zone() instead of doing it in a script in reload.d --- bureau/class/class_system_bind.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bureau/class/class_system_bind.php b/bureau/class/class_system_bind.php index 34d045b4..698b9939 100644 --- a/bureau/class/class_system_bind.php +++ b/bureau/class/class_system_bind.php @@ -502,8 +502,8 @@ class system_bind { if ( ( $all || strtoupper($ds['dns_action']) == 'UPDATE' ) && $ds['gesdns'] ) { $this->save_zone($domain); - $this->reload_zone($domain); $hooks->invoke_scripts("/usr/lib/alternc/reload.d", array('dns_reload_zone', $domain) ); + $this->reload_zone($domain); } } // end foreach domain