diff options
Diffstat (limited to 'config')
-rwxr-xr-x[-rw-r--r--] | config/postfix/postfix.inc | 9 | ||||
-rw-r--r-- | config/widescreen/old/bin/all.css_ (renamed from config/widescreen/bin/all.css_) | 0 | ||||
-rw-r--r-- | config/widescreen/old/bin/fbegin.inc_ (renamed from config/widescreen/bin/fbegin.inc_) | 0 | ||||
-rw-r--r-- | config/widescreen/old/bin/fend.inc_ (renamed from config/widescreen/bin/fend.inc_) | 0 | ||||
-rw-r--r-- | config/widescreen/old/bin/footer-left.png (renamed from config/widescreen/bin/footer-left.png) | bin | 811 -> 811 bytes | |||
-rw-r--r-- | config/widescreen/old/bin/footer-middle.png (renamed from config/widescreen/bin/footer-middle.png) | bin | 338 -> 338 bytes | |||
-rw-r--r-- | config/widescreen/old/bin/footer-right.png (renamed from config/widescreen/bin/footer-right.png) | bin | 769 -> 769 bytes | |||
-rw-r--r-- | config/widescreen/old/bin/header-mid.png (renamed from config/widescreen/bin/header-mid.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | config/widescreen/old/bin/horiz-left.png (renamed from config/widescreen/bin/horiz-left.png) | bin | 224 -> 224 bytes | |||
-rw-r--r-- | config/widescreen/old/bin/horiz-right.png (renamed from config/widescreen/bin/horiz-right.png) | bin | 228 -> 228 bytes | |||
-rw-r--r-- | config/widescreen/old/bin/index.php_ (renamed from config/widescreen/bin/index.php_) | 0 | ||||
-rw-r--r-- | config/widescreen/old/widescreen.inc (renamed from config/widescreen/widescreen.inc) | 0 | ||||
-rw-r--r-- | config/widescreen/old/widescreen.xml (renamed from config/widescreen/widescreen.xml) | 0 |
13 files changed, 5 insertions, 4 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index b564fd47..4378a1f9 100644..100755 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -278,9 +278,10 @@ function check_cron(){ } -function sync_package_postfix($via_rpc=false) { +function sync_package_postfix($via_rpc="no") { global $config; + log_error("sync_package_postfix called with via_rpc={$via_rpc}"); # detect boot process if (is_array($_POST)){ if (preg_match("/\w+/",$_POST['__csrf_magic'])) @@ -289,7 +290,7 @@ function sync_package_postfix($via_rpc=false) { $boot_process="on"; } - if(is_process_running("master") && isset($boot_process) && $via_rpc==false) + if(is_process_running("master") && isset($boot_process) && $via_rpc=="no") return; #check patch in /etc/inc/config. @@ -731,7 +732,7 @@ MASTEREOF2; postfix_start(); #Do not sync during boot - if(!isset($boot_process)) + if(!isset($boot_process) || $via_rpc=="yes") postfix_sync_on_changes(); } @@ -944,7 +945,7 @@ function postfix_do_xmlrpc_sync($sync_to_ip,$username,$password,$sync_type,$sync /* tell postfix to reload our settings on the destionation sync host. */ $method = 'pfsense.exec_php'; $execcmd = "require_once('/usr/local/pkg/postfix.inc');\n"; - $execcmd .= "sync_package_postfix(true);"; + $execcmd .= "sync_package_postfix('yes');"; /* assemble xmlrpc payload */ $params = array( diff --git a/config/widescreen/bin/all.css_ b/config/widescreen/old/bin/all.css_ index d11dedca..d11dedca 100644 --- a/config/widescreen/bin/all.css_ +++ b/config/widescreen/old/bin/all.css_ diff --git a/config/widescreen/bin/fbegin.inc_ b/config/widescreen/old/bin/fbegin.inc_ index a7a96e0f..a7a96e0f 100644 --- a/config/widescreen/bin/fbegin.inc_ +++ b/config/widescreen/old/bin/fbegin.inc_ diff --git a/config/widescreen/bin/fend.inc_ b/config/widescreen/old/bin/fend.inc_ index 1eb3ada8..1eb3ada8 100644 --- a/config/widescreen/bin/fend.inc_ +++ b/config/widescreen/old/bin/fend.inc_ diff --git a/config/widescreen/bin/footer-left.png b/config/widescreen/old/bin/footer-left.png Binary files differindex 7c068c21..7c068c21 100644 --- a/config/widescreen/bin/footer-left.png +++ b/config/widescreen/old/bin/footer-left.png diff --git a/config/widescreen/bin/footer-middle.png b/config/widescreen/old/bin/footer-middle.png Binary files differindex 2176e741..2176e741 100644 --- a/config/widescreen/bin/footer-middle.png +++ b/config/widescreen/old/bin/footer-middle.png diff --git a/config/widescreen/bin/footer-right.png b/config/widescreen/old/bin/footer-right.png Binary files differindex 33169290..33169290 100644 --- a/config/widescreen/bin/footer-right.png +++ b/config/widescreen/old/bin/footer-right.png diff --git a/config/widescreen/bin/header-mid.png b/config/widescreen/old/bin/header-mid.png Binary files differindex 93963c65..93963c65 100644 --- a/config/widescreen/bin/header-mid.png +++ b/config/widescreen/old/bin/header-mid.png diff --git a/config/widescreen/bin/horiz-left.png b/config/widescreen/old/bin/horiz-left.png Binary files differindex 8f772a4f..8f772a4f 100644 --- a/config/widescreen/bin/horiz-left.png +++ b/config/widescreen/old/bin/horiz-left.png diff --git a/config/widescreen/bin/horiz-right.png b/config/widescreen/old/bin/horiz-right.png Binary files differindex edacbc23..edacbc23 100644 --- a/config/widescreen/bin/horiz-right.png +++ b/config/widescreen/old/bin/horiz-right.png diff --git a/config/widescreen/bin/index.php_ b/config/widescreen/old/bin/index.php_ index a6ad1019..a6ad1019 100644 --- a/config/widescreen/bin/index.php_ +++ b/config/widescreen/old/bin/index.php_ diff --git a/config/widescreen/widescreen.inc b/config/widescreen/old/widescreen.inc index 52c91d92..52c91d92 100644 --- a/config/widescreen/widescreen.inc +++ b/config/widescreen/old/widescreen.inc diff --git a/config/widescreen/widescreen.xml b/config/widescreen/old/widescreen.xml index 98dd9daa..98dd9daa 100644 --- a/config/widescreen/widescreen.xml +++ b/config/widescreen/old/widescreen.xml |