Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

haproxy-devel, move files to haproxy subfolders + small fixes. #43

Merged
merged 1 commit into from
Jan 16, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 39 additions & 36 deletions net/pfSense-pkg-haproxy-devel/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-haproxy-devel
PORTVERSION= 0.36
PORTVERSION= 0.37
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
@@ -25,6 +25,7 @@ do-extract:

do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/pkg
${MKDIR} ${STAGEDIR}${PREFIX}/pkg/haproxy
${MKDIR} ${STAGEDIR}${PREFIX}/www
${MKDIR} ${STAGEDIR}${PREFIX}/www/widgets/widgets
${MKDIR} ${STAGEDIR}${PREFIX}/www/shortcuts
@@ -33,46 +34,48 @@ do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/haproxy.xml \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_listeners.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_listeners_edit.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_global.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_files.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_pools.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_pool_edit.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_stats.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy_templates.php \
${STAGEDIR}${PREFIX}/www
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_socket.sh \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_gui.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_socketinfo.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_xmlrpcsyncclient.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_htmllist.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_utils.inc \
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_rules.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_socket.sh \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_gui.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_socketinfo.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_xmlrpcsyncclient.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_htmllist.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_utils.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/pkg_haproxy_tabs.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy/haproxy_upgrade_config.inc \
${STAGEDIR}${PREFIX}/pkg/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_listeners.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_listeners_edit.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_global.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_files.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_pools.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_pool_edit.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_stats.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_templates.php \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_geturl.js \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/widgets/widgets/haproxy.widget.php \
${STAGEDIR}${PREFIX}/www/widgets/widgets
${INSTALL_DATA} -m 0755 ${FILESDIR}${PREFIX}/www/shortcuts/pkg_haproxy.inc \
${STAGEDIR}${PREFIX}/www/shortcuts
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/pkg_haproxy_tabs.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/haproxy_upgrade_config.inc \
${STAGEDIR}${PREFIX}/pkg
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/haproxy/haproxy_geturl.js \
${STAGEDIR}${PREFIX}/www/haproxy
${INSTALL_DATA} ${FILESDIR}/etc/inc/priv/haproxy.priv.inc \
${STAGEDIR}/etc/inc/priv
${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
Original file line number Diff line number Diff line change
@@ -33,18 +33,18 @@ $priv_list['page-service-haproxy']['name'] = "WebCfg - Services: HAProxy package
$priv_list['page-service-haproxy']['descr'] = "Allow access to HAProxy package GUI";
$priv_list['page-service-haproxy']['match'] = array();

$priv_list['page-service-haproxy']['match'][] = "haproxy_files.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy_global.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy_listeners.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy_listeners_edit.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy_pool_edit.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy_pools.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy_templates.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_files.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_global.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_listeners.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_listeners_edit.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_pool_edit.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_pools.php*";
$priv_list['page-service-haproxy']['match'][] = "haproxy/haproxy_templates.php*";

$priv_list['page-service-haproxy-stats'] = array();
$priv_list['page-service-haproxy-stats']['name'] = "WebCfg - Services: HAProxy package stats";
$priv_list['page-service-haproxy-stats']['descr'] = "Allow access to HAProxy package GUI stats";
$priv_list['page-service-haproxy-stats']['match'] = array();
$priv_list['page-service-haproxy-stats']['match'][] = "haproxy_stats.php*";
$priv_list['page-service-haproxy-stats']['match'][] = "haproxy/haproxy_stats.php*";

?>
93 changes: 4 additions & 89 deletions net/pfSense-pkg-haproxy-devel/files/usr/local/pkg/haproxy.xml
Original file line number Diff line number Diff line change
@@ -42,21 +42,21 @@
]]>
</copyright>
<name>haproxy</name>
<version>0.36</version>
<version>0.37</version>
<title>HAProxy</title>
<aftersaveredirect>/pkg_edit.php?xml=haproxy_pools.php</aftersaveredirect>
<include_file>/usr/local/pkg/haproxy.inc</include_file>
<include_file>/usr/local/pkg/haproxy/haproxy.inc</include_file>
<menu>
<name>HAProxy</name>
<tooltiptext></tooltiptext>
<section>Services</section>
<url>/haproxy_listeners.php</url>
<url>/haproxy/haproxy_listeners.php</url>
</menu>
<menu>
<name>HAProxy Stats</name>
<tooltiptext>Stats of HAProxy</tooltiptext>
<section>Status</section>
<url>/haproxy_stats.php?haproxystats=1</url>
<url>/haproxy/haproxy_stats.php?haproxystats=1</url>
</menu>
<service>
<name>HAProxy</name>
@@ -73,91 +73,6 @@
</item>
</plugins>
<configpath>installedpackages->haproxy->config</configpath>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_listeners.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_listeners_edit.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_global.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_files.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_pools.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_pool_edit.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_stats.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_templates.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_gui.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_socket.sh</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_socketinfo.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_htmllist.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_utils.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/widgets/widgets/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/widgets/widgets/haproxy.widget.php</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/shortcuts/</prefix>
<chmod>0755</chmod>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/shortcuts/pkg_haproxy.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_upgrade_config.inc</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/usr/local/www/haproxy/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy/haproxy_geturl.js</item>
</additional_files_needed>
<additional_files_needed>
<prefix>/etc/inc/priv/</prefix>
<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.priv.inc</item>
</additional_files_needed>
<custom_php_install_command>
haproxy_custom_php_install_command();
</custom_php_install_command>
Original file line number Diff line number Diff line change
@@ -654,12 +654,12 @@ haproxy_start () {
/usr/bin/env \
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
/usr/local/bin/php-cgi -q -d auto_prepend_file=config.inc <<ENDOFF
<?php
<?php
require_once("globals.inc");
require_once("functions.inc");
require_once("haproxy.inc");
require_once("haproxy/haproxy.inc");
haproxy_configure();
?>
?>
ENDOFF
}

@@ -668,12 +668,12 @@ haproxy_check () {
/usr/bin/env \
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
/usr/local/bin/php-cgi -q -d auto_prepend_file=config.inc <<ENDOFF
<?php
<?php
require_once("globals.inc");
require_once("functions.inc");
require_once("haproxy.inc");
require_once("haproxy/haproxy.inc");
haproxy_check_run(0);
?>
?>
ENDOFF
}

@@ -1546,7 +1546,7 @@ function haproxy_writeconf($configpath) {
fwrite ($fd, "\tstats refresh {$a_global['localstats_refreshtime']}\n");
}
fwrite ($fd, "\tstats admin if TRUE\n");
fwrite ($fd, "\tstats uri /haproxy_stats.php?haproxystats=1\n");
fwrite ($fd, "\tstats uri /haproxy/haproxy_stats.php?haproxystats=1\n");
fwrite ($fd, "\ttimeout client 5000\n");
fwrite ($fd, "\ttimeout connect 5000\n");
fwrite ($fd, "\ttimeout server 5000\n");
@@ -2126,8 +2126,7 @@ function haproxy_get_transparent_backends(){
return $transparent_backends;
}

function haproxy_generate_rules($type) {
// called by filter.inc when pfSense rules generation happens
function haproxy_generate_rules_plugin($type) {
global $g, $config;
$rules = "";
switch($type) {
@@ -2226,19 +2225,24 @@ function haproxy_plugin_certificates($pluginparams) {
// return a array of used certificates.
foreach($config['installedpackages']['haproxy']['ha_backends']['item'] as &$frontend) {
if (get_frontend_uses_ssl($frontend)) {
if ($frontend['ssloffloadacl']){
$item = array();
$cert = $frontend['ssloffloadcert'];
$item['usedby'] = $frontend['name'];
$result['certificatelist'][$cert][] = $item;
}
if ($frontend['ssloffloadacladditional']){
foreach($frontend['ha_certificates']['item'] as $certref){
if ($frontend['secondary'] != 'yes' || $frontend['ssloffload'])
// primary or secondary with additional certs checkbox

if ($frontend['ssloffloadcert']){
$item = array();
$cert = $certref['ssl_certificate'];
$cert = $frontend['ssloffloadcert'];
$item['usedby'] = $frontend['name'];
$result['certificatelist'][$cert][] = $item;
}
if ($frontend['ha_certificates'] && is_array($frontend['ha_certificates']['item'])) {
foreach($frontend['ha_certificates']['item'] as $certref){
if ($certref['ssl_certificate']){
$item = array();
$cert = $certref['ssl_certificate'];
$item['usedby'] = $frontend['name'];
$result['certificatelist'][$cert][] = $item;
}
}
}
}
}
@@ -2255,7 +2259,7 @@ function haproxy_carpipismaster($ip) {
if ($ipaddress != $ip)
continue;

$carp_int = "{$carp['interface']}_vip{$carp['vhid']}";
$carp_int = "_vip{$carp['uniqid']}";
$status = get_carp_interface_status($carp_int);
return ($status == "MASTER");
}
@@ -2264,7 +2268,6 @@ function haproxy_carpipismaster($ip) {

function haproxy_check_run($reload) {
global $config, $g, $haproxy_run_message;

$haproxylock = lock("haproxy", LOCK_EX);
$a_global = &$config['installedpackages']['haproxy'];
$configpath = "{$g['varetc_path']}/haproxy";
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php
/*
haproxy_pkg.inc
Copyright (C) 2016 PiBa-NL
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.
*/

require_once("haproxy/haproxy.inc");

function haproxy_rules_generate_rules($type) {
// called by filter.inc when pfSense rules generation happens
return haproxy_generate_rules_plugin($type);
}

?>
Loading