diff options
| author | Scott Ullrich <sullrich@mpb-geekgod.geekgod.com> | 2009-06-18 20:15:20 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@mpb-geekgod.geekgod.com> | 2009-06-18 20:16:23 -0400 |
| commit | 62b035ce5f41c8342f0eea0b78e5878ff467e525 (patch) | |
| tree | 5006198c3b5869611449edf848ebfb49a917b3a5 | |
| parent | ab0dbe3cb175c88541a23035e7accca5c8bd1120 (diff) | |
| download | pfsense-62b035ce5f41c8342f0eea0b78e5878ff467e525.zip pfsense-62b035ce5f41c8342f0eea0b78e5878ff467e525.tar.gz | |
Rename cvssync to gitsync
| -rw-r--r-- | etc/inc/functions.inc | 3 | ||||
| -rw-r--r-- | etc/inc/xmlparse.inc | 3 | ||||
| -rw-r--r-- | etc/phpshellsessions/gitsync (renamed from etc/phpshellsessions/cvssync) | 0 | ||||
| -rwxr-xr-x | etc/rc.bootup | 9 | ||||
| -rwxr-xr-x | usr/local/www/fbegin.inc | 1 | ||||
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 1 |
6 files changed, 12 insertions, 5 deletions
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc index 60e0475..5f021bf 100644 --- a/etc/inc/functions.inc +++ b/etc/inc/functions.inc @@ -84,5 +84,6 @@ require_once("vpn.inc"); require_once("vslb.inc"); require_once("cmd_chain.inc"); require_once("rrd.inc"); +require_once("haproxy.inc"); -?> +?>
\ No newline at end of file diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc index cb55117..8125256 100644 --- a/etc/inc/xmlparse.inc +++ b/etc/inc/xmlparse.inc @@ -47,7 +47,8 @@ function listtags() { "option ppp package passthrumac phase1 phase2 priv proxyarpnet qinqentry queue ". "pages pipe roll route row rrddatafile rule schedule service servernat servers ". "serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ". - "tunnel user vip virtual_server vlan winsserver wolentry widget " + "tunnel user vip virtual_server vlan winsserver wolentry widget " . + "ha_frontend ha_backend ha_acl ha_server " ); return $ret; } diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/gitsync index 238f5d0..238f5d0 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/gitsync diff --git a/etc/rc.bootup b/etc/rc.bootup index 7784ec2..3d58deb 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -197,9 +197,12 @@ echo "done.\n"; /* start load balancer daemon */ relayd_configure(); - /* reconfigure our gateway monitor */ +/* start haproxy daemon */ +haproxy_configure(); + +/* reconfigure our gateway monitor */ echo "Setting up gateway monitors..."; - setup_gateways_monitor(); +setup_gateways_monitor(); echo "done.\n"; /* start OpenVPN server & clients */ @@ -346,4 +349,4 @@ mwexec_bg("/usr/sbin/update_dns_cache.sh"); unlink("{$g['varrun_path']}/booting"); $g['booting'] = FALSE; -?> +?>
\ No newline at end of file diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index cd4439d..63c741c 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -183,6 +183,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') { output_menu_item("/services_dhcp.php", "DHCP Server"); output_menu_item("/services_dyndns.php", "Dynamic DNS"); output_menu_item("/services_igmpproxy.php", "IGMP proxy"); + output_menu_item("/haproxy_global.php", "HAProxy"); output_menu_item("/load_balancer_pool.php", "Load Balancer"); output_menu_item("/pkg_edit.php?xml=olsrd.xml&id=0", "OLSR"); output_menu_item("/vpn_pppoe.php", "PPPoE Server"); diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index f80c375..7ef37c1 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -94,6 +94,7 @@ $d_vipconfdirty_path = $g['varrun_path'] . "/vip.conf.dirty"; $d_sysctldirty_path = $g['varrun_path'] . "/sysctl.conf.dirty"; $d_vsconfdirty_path = $g['varrun_path'] . "/vs.conf.dirty"; $d_shaperconfdirty_path = $g['varrun_path'] . "/shaper.conf.dirty"; +$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; /* OpenVPN Directories */ $d_ovpnsrvdirty_path = "/tmp/ovpn-srv.dirty"; |
