diff options
| author | Ermal Luçi <eri@pfsense.org> | 2014-02-17 08:36:00 +0100 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2014-02-17 08:36:00 +0100 |
| commit | b23398b68fabefebd8b9c4715b81772df7c6228c (patch) | |
| tree | e0004e3d7a9ce073ca74f76a5ffe0d288bc6cf3c /config/haproxy-devel/haproxy.inc | |
| parent | 01434bbdb83f14546eb39fb96760708a5a4322e3 (diff) | |
| parent | 46ea54e1b550fcac78752b70f3419a0bf1eb7ec4 (diff) | |
| download | pfsense-packages-b23398b68fabefebd8b9c4715b81772df7c6228c.tar.gz pfsense-packages-b23398b68fabefebd8b9c4715b81772df7c6228c.tar.bz2 pfsense-packages-b23398b68fabefebd8b9c4715b81772df7c6228c.zip | |
Merge pull request #589 from PiBa-NL/hap_statspage
haproxy-devel, integrated stats page with stick-table info WebGUI
Diffstat (limited to 'config/haproxy-devel/haproxy.inc')
| -rw-r--r-- | config/haproxy-devel/haproxy.inc | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index d4b2ab2c..5ae86bb9 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -628,6 +628,21 @@ function haproxy_writeconf($configpath) { } } fwrite ($fd, "\n"); + + $localstatsport = $a_global['localstatsport']; + if ($localstatsport){ + fwrite ($fd, "listen HAProxyLocalStats\n"); + fwrite ($fd, "\tbind 127.0.0.1:$localstatsport\n"); + fwrite ($fd, "\tmode http\n"); + fwrite ($fd, "\tstats enable\n"); + fwrite ($fd, "\tstats refresh 10\n"); + fwrite ($fd, "\tstats admin if TRUE\n"); + fwrite ($fd, "\tstats uri /haproxy_stats.php?haproxystats=1\n"); + fwrite ($fd, "\ttimeout client 5000\n"); + fwrite ($fd, "\ttimeout connect 5000\n"); + fwrite ($fd, "\ttimeout server 5000\n"); + fwrite ($fd, "\n"); + } } // Try and get a unique array for address:port as frontends can duplicate @@ -1249,4 +1264,25 @@ function haproxy_escape_acl_name($aclname) { return preg_replace_callback('([^A-Za-z0-9\._\-\:])', function($match){return "_".dechex(ord($match[0]));}, $aclname); } +function haproxy_find_create_certificate($certificatename) { + global $g; + $cert = lookup_cert_by_name($certificatename); + if (is_array($cert)) + return $cert; + global $config; + $a_cert =& $config['cert']; + $cert = array(); + $cert['refid'] = uniqid(); + $cert['descr'] = gettext($certificatename); + mwexec("/usr/local/bin/openssl genrsa 1024 > {$g['tmp_path']}/ssl.key"); + mwexec("/usr/local/bin/openssl req -new -x509 -nodes -sha256 -days 2000 -key {$g['tmp_path']}/ssl.key > {$g['tmp_path']}/ssl.crt"); + $crt = file_get_contents("{$g['tmp_path']}/ssl.crt"); + $key = file_get_contents("{$g['tmp_path']}/ssl.key"); + unlink("{$g['tmp_path']}/ssl.key"); + unlink("{$g['tmp_path']}/ssl.crt"); + cert_import($cert, $crt, $key); + $a_cert[] = $cert; + return $cert; +} + ?> |