diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-08 18:18:42 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-08 18:18:42 +0100 |
| commit | 43a9441cb80a14fff791bbd89e88a3c2ac99e3ab (patch) | |
| tree | 2bf9c09fab5c95efa73fc2f7601890466fa9b99f /interface-definitions/service_webproxy.xml.in | |
| parent | 13a58d38b3dc8065a8ba71904e143e3d69aab638 (diff) | |
| parent | 23f55c4bcbe5475ed98d57cf54b645ef0c2cc1a8 (diff) | |
| download | vyos-1x-43a9441cb80a14fff791bbd89e88a3c2ac99e3ab.tar.gz vyos-1x-43a9441cb80a14fff791bbd89e88a3c2ac99e3ab.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: (30 commits)
smoketest: dummy: fix indent
smoketest: bridge: bond: enable ip subsystem tests
smoketest: interfaces: dhcpv6pd final fix
smoketest: ethernet: fix link-speed loop test
Debian: add build-dependency on python3-jinja2
smoketest: ethernet: verify() speed/duplex must both be auto or discrete
smoketest: interfaces: report skipped tests
smoketest: ethernet: bugfixes for dhcpc6 and unknown interfaces
Debian: add python3-psutil build dependency
smoketest: ethernet: check for error on non existing interface
vyos.configverify: provide generic helper to check for interface existence
smoketest: interfaces: fix dhcpv6 pd testcase when using multiple interfaces
login: radius: T3192: migrate to get_config_dict()
ssh: T2635: harden Jinja2 template and daemon startup
ssh: T2635: change sshd_config path to /run/sshd
login: radius: T3192: support IPv6 server(s) and source-address
xml: include: provide generic include for disable node
xml: radius: T3192: split individual nodes to discrete includes
bgp: T2174: verify() existence of route-map and prefix-list
smoketest: interfaces: test dhcpv6 pd sla-id auto increment
...
Diffstat (limited to 'interface-definitions/service_webproxy.xml.in')
| -rw-r--r-- | interface-definitions/service_webproxy.xml.in | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/interface-definitions/service_webproxy.xml.in b/interface-definitions/service_webproxy.xml.in index 4cd8138ec..7cb0f7ece 100644 --- a/interface-definitions/service_webproxy.xml.in +++ b/interface-definitions/service_webproxy.xml.in @@ -394,12 +394,7 @@ <help>URL filtering settings</help> </properties> <children> - <leafNode name="disable"> - <properties> - <help>Disable URL filtering</help> - <valueless/> - </properties> - </leafNode> + #include <include/generic-disable-node.xml.i> <node name="squidguard"> <properties> <help>URL filtering via squidGuard redirector</help> |