diff options
| author | Kristian Lyngstøl <kly@kly.no> | 2019-04-02 21:16:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 21:16:30 +0200 |
| commit | ecb267e43a5958c747998e833b78fbd49935b03c (patch) | |
| tree | 282be9f5c7d95a4ef1970d85a9d9bb60985fc105 | |
| parent | 1e2b66012e62a45d461ae0d8dbb0094788908c8b (diff) | |
| parent | 5737d833a64b6a54d56a53c5d3cb79e34efbcd20 (diff) | |
Merge pull request #209 from slinderud/master
Templating: New filter getIp, fixed errors in dhcp filters
| -rw-r--r-- | ansible/roles/web/files/varnish.vcl | 5 | ||||
| -rw-r--r-- | extras/misc/varnish.vcl | 5 | ||||
| -rwxr-xr-x | templating/templating.py | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ansible/roles/web/files/varnish.vcl b/ansible/roles/web/files/varnish.vcl index c0dc8b6..00a3325 100644 --- a/ansible/roles/web/files/varnish.vcl +++ b/ansible/roles/web/files/varnish.vcl @@ -108,6 +108,11 @@ sub vcl_recv { return (pass); } + # exclude listing of template files + if (req.url ~ "/api/read/template-list" ) { + return (pass); + } + # We don't use cookies - so get rid of them so we don't mess up the cache # by accident. unset req.http.Cookie; diff --git a/extras/misc/varnish.vcl b/extras/misc/varnish.vcl index c47c3e6..e99181c 100644 --- a/extras/misc/varnish.vcl +++ b/extras/misc/varnish.vcl @@ -107,6 +107,11 @@ sub vcl_recv { return (pass); } + # exclude listing of template files + if (req.url ~ "/api/read/template-list" ) { + return (pass); + } + # We don't use cookies - so get rid of them so we don't mess up the cache # by accident. unset req.http.Cookie; diff --git a/templating/templating.py b/templating/templating.py index 03b7dc9..87853b6 100755 --- a/templating/templating.py +++ b/templating/templating.py @@ -32,8 +32,9 @@ env = Environment(loader=FileSystemLoader([]), trim_blocks=True) env.filters["netmask"] = lambda ip: netaddr.IPNetwork(ip).netmask env.filters["cidr"] = lambda ip: netaddr.IPNetwork(ip).prefixlen env.filters["networkId"] = lambda ip: netaddr.IPNetwork(ip).ip -env.filters["getFirstDhcpIp"] = lambda ip: netaddr.IPNetwork(ip)[3] -env.filters["getLastDhcpIp"] = lambda ip: netaddr.IPNetwork(ip)[-1] +env.filters["getFirstDhcpIp"] = lambda ip: netaddr.IPNetwork(ip)[2] +env.filters["getLastDhcpIp"] = lambda ip: netaddr.IPNetwork(ip)[-2] +env.filters["getIp"] = lambda ip,num: netaddr.IPNetwork(ip)[num] env.filters["agentDistro"] = lambda src: src.split(":")[0] env.filters["agentPort"] = lambda src: src.split(":")[1] env.filters["getFirstFapIP"] = lambda ip: netaddr.IPNetwork(ip)[netaddr.IPNetwork(ip).size / 2] |