From daf217600ba4f1f0faf551ee049d8f1978f1b1c6 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 13 Oct 2009 22:01:52 -0400 Subject: Define d_haproxyconfdirty_path --- config/haproxy/haproxy.inc | 2 ++ config/haproxy/haproxy_backends.php | 3 +++ config/haproxy/haproxy_backends_edit.php | 2 ++ config/haproxy/haproxy_global.php | 2 ++ config/haproxy/haproxy_servers.php | 2 ++ config/haproxy/haproxy_servers_edit.php | 2 ++ 6 files changed, 13 insertions(+) diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index cb22d8c9..88fa01e1 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -31,6 +31,8 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("notices.inc"); +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; + function haproxy_custom_php_install_command() { global $g, $config; conf_mount_rw(); diff --git a/config/haproxy/haproxy_backends.php b/config/haproxy/haproxy_backends.php index 95c3d6b0..78882aa2 100755 --- a/config/haproxy/haproxy_backends.php +++ b/config/haproxy/haproxy_backends.php @@ -29,6 +29,9 @@ */ require_once("guiconfig.inc"); + +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; + require_once("haproxy.inc"); if (!is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) { diff --git a/config/haproxy/haproxy_backends_edit.php b/config/haproxy/haproxy_backends_edit.php index 0863286e..491a1fa5 100755 --- a/config/haproxy/haproxy_backends_edit.php +++ b/config/haproxy/haproxy_backends_edit.php @@ -30,6 +30,8 @@ require("guiconfig.inc"); +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; + if (!is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) { $config['installedpackages']['haproxy']['ha_backends']['item'] = array(); } diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php index 02a50115..0efdacdc 100755 --- a/config/haproxy/haproxy_global.php +++ b/config/haproxy/haproxy_global.php @@ -32,6 +32,8 @@ require("globals.inc"); require("guiconfig.inc"); require_once("haproxy.inc"); +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; + if (!is_array($config['installedpackages']['haproxy'])) { $config['installedpackages']['haproxy'] = array(); } diff --git a/config/haproxy/haproxy_servers.php b/config/haproxy/haproxy_servers.php index b44ab8a6..a261fe13 100755 --- a/config/haproxy/haproxy_servers.php +++ b/config/haproxy/haproxy_servers.php @@ -31,6 +31,8 @@ require_once("guiconfig.inc"); require_once("haproxy.inc"); +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; + if (!is_array($config['installedpackages']['haproxy']['ha_servers']['item'])) { $config['installedpackages']['haproxy']['ha_servers']['item'] = array(); } diff --git a/config/haproxy/haproxy_servers_edit.php b/config/haproxy/haproxy_servers_edit.php index 32460f08..a69dbb45 100755 --- a/config/haproxy/haproxy_servers_edit.php +++ b/config/haproxy/haproxy_servers_edit.php @@ -30,6 +30,8 @@ require("guiconfig.inc"); +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; + if (!is_array($config['installedpackages']['haproxy']['ha_servers']['item'])) { $config['installedpackages']['haproxy']['ha_servers']['item'] = array(); } -- cgit v1.2.3