diff options
| -rw-r--r-- | config/varnish64/varnish.inc | 125 | ||||
| -rw-r--r-- | config/varnish64/varnish_lb_directors.xml | 2 | ||||
| -rw-r--r-- | config/varnish64/varnish_sync.xml | 146 |
3 files changed, 272 insertions, 1 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc index 351345f0..70425409 100644 --- a/config/varnish64/varnish.inc +++ b/config/varnish64/varnish.inc @@ -254,6 +254,131 @@ EOF; fwrite($fd, $varnish_config_file); fclose($fd); exec("/usr/local/etc/rc.d/varnish.sh"); + + varnish_sync_on_changes(); +} + +function varnish_sync_on_changes() { + global $g, $config; + log_error("[varnish] varnish_xmlrpc_sync.php is starting."); + $synconchanges = $config['installedpackages']['varnishsync']['config'][0]['synconchanges']; + if(!$synconchanges) + return; + $sync_hosts = $config['installedpackages']['varnishsync']['config']; + $previous_ip = ""; + $x=0; + $sh = $config['installedpackages']['varnishsync']['config'][0]; + for($x=1; $x<5; $x++) { + if($x > 1) + $counter = $x; + else + $counter = ""; + $sync_to_ip = ""; + $password = ""; + if($sh['ipaddress' . $counter]) { + $sync_to_ip = $sh['ipaddress' . $counter]; + $password = $sh['password' . $counter]; + } + if($password && $sync_to_ip) + varnish_do_xmlrpc_sync($sync_to_ip, $password); + } + varnish_create_zone_file(); + varnish_setup_ping_items(); + log_error("[varnish] varnish_xmlrpc_sync.php is ending."); +} + +function varnish_do_xmlrpc_sync($sync_to_ip, $password) { + global $config, $g; + + if(!$password) + return; + + if(!$sync_to_ip) + return; + + $xmlrpc_sync_neighbor = $sync_to_ip; + if($config['system']['webgui']['protocol'] != "") { + $synchronizetoip = $config['system']['webgui']['protocol']; + $synchronizetoip .= "://"; + } + $port = $config['system']['webgui']['port']; + /* if port is empty lets rely on the protocol selection */ + if($port == "") { + if($config['system']['webgui']['protocol'] == "http") + $port = "80"; + else + $port = "443"; + } + $synchronizetoip .= $sync_to_ip; + + /* xml will hold the sections to sync */ + $xml = array(); + $xml['varnishcustomvcl'] = $config['installedpackages']['varnishcustomvcl']; + $xml['varnishbackends'] = $config['installedpackages']['varnishbackends']; + $xml['varnishlbdirectors'] = $config['installedpackages']['varnishlbdirectors']; + $xml['varnishsettings'] = $config['installedpackages']['varnishsettings']; + + /* assemble xmlrpc payload */ + $params = array( + XML_RPC_encode($password), + XML_RPC_encode($xml) + ); + + /* set a few variables needed for sync code borrowed from filter.inc */ + $url = $synchronizetoip; + log_error("Beginning Varnish XMLRPC sync to {$url}:{$port}."); + $method = 'pfsense.merge_installedpackages_section_xmlrpc'; + $msg = new XML_RPC_Message($method, $params); + $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); + $cli->setCredentials('admin', $password); + if($g['debug']) + $cli->setDebug(1); + /* send our XMLRPC message and timeout after 250 seconds */ + $resp = $cli->send($msg, "250"); + if(!$resp) { + $error = "A communications error occured while attempting varnish XMLRPC sync with {$url}:{$port}."; + log_error($error); + file_notice("sync_settings", $error, "varnish Settings Sync", ""); + } elseif($resp->faultCode()) { + $cli->setDebug(1); + $resp = $cli->send($msg, "250"); + $error = "An error code was received while attempting varnish XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + log_error($error); + file_notice("sync_settings", $error, "varnish Settings Sync", ""); + } else { + log_error("varnish XMLRPC sync successfully completed with {$url}:{$port}."); + } + + /* tell varnish to reload our settings on the destionation sync host. */ + $method = 'pfsense.exec_php'; + $execcmd = "require_once('/usr/local/pkg/varnish.inc');\n"; + $execcmd .= "sync_package_varnish();\n"; + + /* assemble xmlrpc payload */ + $params = array( + XML_RPC_encode($password), + XML_RPC_encode($execcmd) + ); + + log_error("varnish XMLRPC reload data {$url}:{$port}."); + $msg = new XML_RPC_Message($method, $params); + $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port); + $cli->setCredentials('admin', $password); + $resp = $cli->send($msg, "250"); + if(!$resp) { + $error = "A communications error occured while attempting varnish XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; + log_error($error); + file_notice("sync_settings", $error, "varnish Settings Sync", ""); + } elseif($resp->faultCode()) { + $cli->setDebug(1); + $resp = $cli->send($msg, "250"); + $error = "An error code was received while attempting varnish XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + log_error($error); + file_notice("sync_settings", $error, "varnish Settings Sync", ""); + } else { + log_error("varnish XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php)."); + } + } ?>
\ No newline at end of file diff --git a/config/varnish64/varnish_lb_directors.xml b/config/varnish64/varnish_lb_directors.xml index 1c771dbb..4c55faed 100644 --- a/config/varnish64/varnish_lb_directors.xml +++ b/config/varnish64/varnish_lb_directors.xml @@ -40,7 +40,7 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <name>varnish_lb_directors</name> + <name>varnishlbdirectors</name> <version>0.0.1</version> <title>Varnish: Backends</title> <include_file>/usr/local/pkg/varnish.inc</include_file> diff --git a/config/varnish64/varnish_sync.xml b/config/varnish64/varnish_sync.xml new file mode 100644 index 00000000..1f7f5678 --- /dev/null +++ b/config/varnish64/varnish_sync.xml @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> +<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> +<packagegui> + <copyright> + <![CDATA[ +/* $Id$ */ +/* ========================================================================== */ +/* + varnish_sync.xml + part of pfSense (http://www.pfSense.com) + Copyright (C) 2008 Scott Ullrich + All rights reserved. + */ +/* ========================================================================== */ +/* + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ +/* ========================================================================== */ + ]]> + </copyright> + <description>Describe your package here</description> + <requirements>Describe your package requirements here</requirements> + <faq>Currently there are no FAQ items provided.</faq> + <name>varnishsync</name> + <version>1.0</version> + <title>Varnish: Manual Sync</title> + <include_file>/usr/local/pkg/varnish.inc</include_file> + <tabs> + <tab> + <text>Settings</text> + <url>/pkg_edit.php?xml=varnish.xml&id=0</url> + </tab> + <tab> + <text>Add/Edit Record</text> + <url>/varnish_filter.php</url> + </tab> + <tab> + <text>Failover Status</text> + <url>/varnish_status.php</url> + </tab> + <tab> + <text>Logs</text> + <url>/varnish_view_logs.php</url> + </tab> + <tab> + <text>Zone Sync</text> + <url>/pkg_edit.php?xml=varnish_sync.xml&id=0</url> + <active/> + </tab> + <tab> + <text>New domain wizard</text> + <url>/wizard.php?xml=new_zone_wizard.xml</url> + </tab> + </tabs> + <configpath>installedpackages->package->varnish</configpath> + <fields> + <field> + <type>listtopic</type> + <fieldname>temp</fieldname> + <name>Enbable DNS zone sync</name> + </field> + <field> + <fielddescr>Automatically sync DNS zone changes</fielddescr> + <fieldname>synconchanges</fieldname> + <description>pfSense will automatically sync changes to the hosts defined below.</description> + <type>checkbox</type> + </field> + <field> + <type>listtopic</type> + <name>Sync host #1</name> + <fieldname>temp</fieldname> + </field> + <field> + <fielddescr>IP Address</fielddescr> + <fieldname>ipaddress</fieldname> + <description>The IP address of the first host that Varnish will Sync its DNS zone data to.</description> + <type>input</type> + </field> + <field> + <fielddescr>Password</fielddescr> + <fieldname>password</fieldname> + <description>Admin password of the first host that Varnish will Sync its DNS zone data to.</description> + <type>password</type> + </field> + <field> + <type>listtopic</type> + <name>Sync host #2</name> + <fieldname>temp</fieldname> + </field> + <field> + <fielddescr>IP Address 2</fielddescr> + <fieldname>ipaddress2</fieldname> + <description>OPTIONAL. The IP address of the second host that Varnish will Sync its DNS zone data to.</description> + <type>input</type> + </field> + <field> + <fielddescr>Password 2</fielddescr> + <fieldname>password2</fieldname> + <description>Admin password of the second host that Varnish will Sync its DNS zone data to.</description> + <type>password</type> + </field> + <field> + <type>listtopic</type> + <name>Sync host #3</name> + <fieldname>temp</fieldname> + </field> + <field> + <fielddescr>IP Address 3</fielddescr> + <fieldname>ipaddress3</fieldname> + <description>OPTIONAL. The IP address of the third host that Varnish will Sync its DNS zone data to.</description> + <type>input</type> + </field> + <field> + <fielddescr>Password 3</fielddescr> + <fieldname>password3</fieldname> + <description>Admin password of the third host that Varnish will Sync its DNS zone data to.</description> + <type>password</type> + </field> + </fields> + <custom_php_resync_config_command> + varnish_sync_on_changes(); + </custom_php_resync_config_command> + <custom_php_command_before_form> + unset($_POST['temp']); + </custom_php_command_before_form> +</packagegui>
\ No newline at end of file |