Skip to content

Commit

Permalink
Merge pull request #1539 from stdweird/metaconfig_more_haproxy
Browse files Browse the repository at this point in the history 
ncm-metaconfig: haproxy: support frontend errorfile and use_backend
  • Loading branch information
@jrha
jrha committed Jul 27, 2023
2 parents 64deaed + 49d1fa0 commit 3275110
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 22 deletions.
10 changes: 10 additions & 0 deletions ncm-metaconfig/src/main/metaconfig/haproxy/frontend.tt
View file
Expand Up @@ -20,3 +20,13 @@ http-request [% httpr %]
[% END -%]
[% END -%]
default_backend [% fte.default_backend %]
[% IF fte.item('use_backend').defined -%]
[% FOREACH ub IN fte.item('use_backend') -%]
use_backend [% ub %]
[% END -%]
[% END -%]
[% IF fte.errorfile.defined -%]
[% FOREACH ef IN fte.errorfile -%]
errorfile [% ef.code %] [% ef.filename %]
[% END -%]
[% END -%]
9 changes: 8 additions & 1 deletion ncm-metaconfig/src/main/metaconfig/haproxy/pan/schema.pan
View file
Expand Up @@ -160,7 +160,7 @@ type haproxy_service_peer = {
configuration of peers
}
type haproxy_service_peers = {
'peers': haproxy_service_peer[]
'peers': haproxy_service_peer[]
};

@documentation {
Expand Down Expand Up @@ -208,13 +208,20 @@ type haproxy_service_bind = {
'port' ? type_port
};

type haproxy_service_frontend_errorfile = {
'code' : long(200..600)
'filename' : absolute_file_path
};

type haproxy_service_frontend = {
'acl' ? dict()
'bind' : haproxy_service_bind[]
'default_backend' : string
'use_backend' ? string_trimmed[]
'mode' ? choice("tcp", "http")
'tcp-request' ? string[]
'http-request' ? string[]
'errorfile' ? haproxy_service_frontend_errorfile[]
};

type haproxy_service_backend_server = {
Expand Down
86 changes: 65 additions & 21 deletions ncm-metaconfig/src/main/metaconfig/haproxy/tests/profiles/config.pan
View file
Expand Up @@ -3,7 +3,7 @@ object template config;
include 'metaconfig/haproxy/config';

prefix '/software/components/metaconfig/services/{/etc/haproxy/haproxy.cfg}/contents';
'proxys' = append(dict());
'proxys' = append(SELF, dict());

prefix 'global';
'logs/{/dev/log}' = list('local0', 'notice');
Expand All @@ -21,11 +21,13 @@ prefix 'global';
"config/ssl-default-server-options" = list('no-sslv3', 'no-tlsv10', 'no-tlsv11');
'stats/socket' = '/var/lib/haproxy/stats';
'logs/{127.0.0.1}' = list('local2');

prefix 'stats';
'mode' = 'http';
'options/enabled' = '';
'options/hide-version' = '';
'options/refresh' = 5;

prefix 'defaults';
'config/log' = 'global';
'config/retries' = 3;
Expand All @@ -39,6 +41,7 @@ prefix 'defaults';
'timeouts/server-fin' = 30000;
'timeouts/tunnel' = 3600 * 1000;
'config/option' = 'tcpka';

prefix 'proxys/-1';
'name' = 'webserver';
'port' = 80;
Expand All @@ -50,19 +53,19 @@ prefix 'proxys/-1';
'config/balance' = 'source';
'options' = list('tcpka', 'httplog', 'httpchk', 'forwardfor', 'httpclose');
'defaultoptions' = dict(
'inter' , 2,
'downinter' , 5,
'rise' , 3,
'fall' , 2,
'slowstart' , 60,
'maxqueue' , 128,
'weight' , 100,
);
'inter', 2,
'downinter', 5,
'rise', 3,
'fall', 2,
'slowstart', 60,
'maxqueue', 128,
'weight', 100,
);
'serveroptions/cookie' = 'control';
'servers' = dict(
'server1' , '192.168.0.11',
'server2', '192.168.0.12',
);
);

prefix 'frontends/irods-in';
"bind" = list(
Expand All @@ -73,11 +76,18 @@ prefix 'frontends/irods-in';
"ssl", true,
"crt", "/some/file",
"alpn", "h2,http/1.1",
)));
),
),
);
"default_backend" = "irods-bk";
"acl/network_allowed" = "src -f /etc/haproxy/whitelist.static";
"tcp-request" = list("connection reject if !network_allowed");
"http-request" = list("redirect scheme https unless { ssl_fc }");
"use_backend/0" = "some-bk if some_acl";
"errorfile" = append(SELF, dict(
'code', 403,
'filename', "/some/abs/path.code.http",
));

prefix 'backends/irods-bk';
"options/0" = "tcp-check";
Expand All @@ -87,14 +97,34 @@ prefix 'backends/irods-bk';
"reqrep/0" = dict(
"pattern", 'abc\ def', # need escaped space, so single quotes
"replace", '\1 \2',
);
);
"reqrep/1" = dict(
"pattern", 'ghi\ jkl',
"replace", '\3 \4',
);
"servers/0" = dict('name', 'localhost', 'ip', '127.0.0.1', 'port', 1247);
"servers/1" = dict('name', 'other.host', 'ip', '10.20.30.1', 'params', dict('ssl', true, 'ca-file', '/other/file'));
"servers/2" = dict('name', 'othername', 'ip', '10.20.30.1', 'port', 1247, 'params', dict('check', true, 'port', 1247, 'inter', 1234));
);
"servers/0" = dict(
'name', 'localhost',
'ip', '127.0.0.1',
'port', 1247,
);
"servers/1" = dict(
'name', 'other.host',
'ip', '10.20.30.1',
'params', dict(
'ssl', true,
'ca-file', '/other/file',
),
);
"servers/2" = dict(
'name', 'othername',
'ip', '10.20.30.1',
'port', 1247,
'params', dict(
'check', true,
'port', 1247,
'inter', 1234,
),
);

prefix 'backends/sshproxy';
"balance" = 'leastconn';
Expand All @@ -105,13 +135,27 @@ prefix 'backends/sshproxy';
'inverse', true,
'match', 'status',
'pattern', '404',
);
);
"sticktable" = dict(
'type', 'ip',
'size', '1m',
'peers', 'mypeers');

'servers/0' = dict('name', 'othername', 'ip', '10.20.30.1', 'port', 1247, 'params', dict('check', true, 'port', 1247));
'peers', 'mypeers',
);
'servers/0' = dict(
'name', 'othername',
'ip', '10.20.30.1',
'port', 1247,
'params', dict(
'check', true,
'port', 1247,
),
);

prefix 'peers';
'mypeers/peers' = list(dict('name', 'testhost', 'ip', '10.20.30.4', 'port', 1024));
'mypeers/peers' = list(
dict(
'name', 'testhost',
'ip', '10.20.30.4',
'port', 1024,
),
);
2 changes: 2 additions & 0 deletions ncm-metaconfig/src/main/metaconfig/haproxy/tests/regexps/config/base
View file
Expand Up @@ -60,6 +60,8 @@ Test for config
^\s{4}tcp-request\sconnection\sreject\sif\s\!network_allowed$
^\s{4}http-request\sredirect\sscheme\shttps\sunless\s\{\sssl_fc\s\}$
^\s{4}default_backend\sirods-bk$
^\s{4}use_backend some-bk if some_acl$
^\s{4}errorfile 403 /some/abs/path.code.http$
^backend\sirods-bk$
^\s{4}option\stcp-check$
^\s{4}acl\swhatif\smatch$
Expand Down

0 comments on commit 3275110

Please sign in to comment.