Browse Source

Nuke http captive portal detection; something better is coming.

OK otto
OPENBSD_6_7
florian 5 years ago
parent
commit
256c1c68fb
2 changed files with 2 additions and 37 deletions
  1. +2
    -2
      src/etc/Makefile
  2. +0
    -35
      src/etc/examples/unwind.conf

+ 2
- 2
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.471 2019/08/12 09:49:21 claudio Exp $
# $OpenBSD: Makefile,v 1.472 2019/11/27 17:09:12 florian Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -48,7 +48,7 @@ MUTABLE=changelist daily etc.${MACHINE}/disktab \
EXAMPLES=acme-client.conf chio.conf dhclient.conf dhcpd.conf exports \ EXAMPLES=acme-client.conf chio.conf dhclient.conf dhcpd.conf exports \
httpd.conf ifstated.conf inetd.conf man.conf mixerctl.conf \ httpd.conf ifstated.conf inetd.conf man.conf mixerctl.conf \
mrouted.conf ntpd.conf printcap rad.conf rbootd.conf \ mrouted.conf ntpd.conf printcap rad.conf rbootd.conf \
remote unwind.conf sensorsd.conf wsconsctl.conf
remote sensorsd.conf wsconsctl.conf
# -rw------- # -rw-------
EXAMPLES_600=bgpd.conf doas.conf dvmrpd.conf eigrpd.conf hostapd.conf \ EXAMPLES_600=bgpd.conf doas.conf dvmrpd.conf eigrpd.conf hostapd.conf \


+ 0
- 35
src/etc/examples/unwind.conf View File

@ -1,35 +0,0 @@
# $OpenBSD: unwind.conf,v 1.1 2019/02/05 16:23:58 florian Exp $
#
# unwind(8) works without a configuration file in most cases.
# See unwind.conf(5) for configuration options.
# Non-exhaustive list of connectivity test providers.
# To only occasionally run a captive portal check manually from unwindctl(8)
# add "auto no" to the block.
#captive portal {
# url "http://captive.apple.com/"
# expected response "<HTML><HEAD><TITLE>Success</TITLE></HEAD><BODY>Success</BODY></HTML>\n"
# # auto no # uncomment to run manually from unwindctl(8)
#}
#captive portal {
# url "http://clients3.google.com/generate_204"
# expected status 204
# # auto no # uncomment to run manually from unwindctl(8)
#}
#captive portal {
# url "http://detectportal.firefox.com/"
# expected response "success\n"
# # auto no # uncomment to run manually from unwindctl(8)
#}
# Running a connectivity test provider with httpd(8).
# httpd.conf
#server "c.YOUR-DOMAIN.com" {
# listen on * port 80
# location "*" { block return 204 }
#}
# unwind.conf
#captive portal {
# url "http://c.YOUR-DOMAIN.com/"
# expected status 204
#}

Loading…
Cancel
Save