packages: wifidog: update to 20130917 version
This update: -adds a ProxyPort option (to use a local transparent proxy) -changes http return code to 302 (was 307, but wifidog speaks http 1.0, and we really need 303, it was causing some trouble with, for exemple, opera) -switch to github repo -correct a small typo -add drop, log, ulog target for FirewallRule This is only compile tested, but 3 people are asking for it https://github.com/wifidog/wifidog-gateway/issues/8 Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/packages@38472 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
parent
25ba3549fc
commit
4ddc5700f8
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (C) 2006,2012 OpenWrt.org
|
# Copyright (C) 2006,2013 OpenWrt.org
|
||||||
#
|
#
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
# This is free software, licensed under the GNU General Public License v2.
|
||||||
# See /LICENSE for more information.
|
# See /LICENSE for more information.
|
||||||
@ -8,16 +8,14 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=wifidog
|
PKG_NAME:=wifidog
|
||||||
PKG_REV:=1464
|
PKG_VERSION:=20130917
|
||||||
PKG_VERSION:=r$(PKG_REV)
|
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||||
PKG_RELEASE:=1
|
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=https://dev.wifidog.org/svn/trunk/wifidog
|
PKG_SOURCE_URL:=git://github.com/wifidog/wifidog-gateway.git
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
PKG_SOURCE_VERSION:=440445db60b0c3aff528ea703a828b0567293387
|
||||||
PKG_SOURCE_PROTO:=svn
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||||
PKG_SOURCE_MIRROR:=0
|
|
||||||
|
|
||||||
PKG_FIXUP:=autoreconf
|
PKG_FIXUP:=autoreconf
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
@ -28,7 +26,7 @@ define Package/wifidog
|
|||||||
SUBMENU:=Captive Portals
|
SUBMENU:=Captive Portals
|
||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
DEPENDS:=+iptables-mod-extra +iptables-mod-ipopt +kmod-ipt-nat +iptables-mod-nat-extra +libpthread
|
DEPENDS:=+iptables-mod-extra +iptables-mod-ipopt +iptables-mod-nat-extra +libpthread
|
||||||
TITLE:=A wireless captive portal solution
|
TITLE:=A wireless captive portal solution
|
||||||
URL:=http://www.wifidog.org
|
URL:=http://www.wifidog.org
|
||||||
endef
|
endef
|
||||||
@ -52,10 +50,10 @@ define Package/wifidog/install
|
|||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/
|
||||||
$(INSTALL_DIR) $(1)/etc
|
$(INSTALL_DIR) $(1)/etc
|
||||||
$(INSTALL_DATA) ./files/wifidog.conf $(1)/etc/
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog.conf $(1)/etc/
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-msg.html $(1)/etc/
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-msg.html $(1)/etc/
|
||||||
$(INSTALL_DIR) $(1)/etc/init.d
|
$(INSTALL_DIR) $(1)/etc/init.d
|
||||||
$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/wifidog
|
$(INSTALL_BIN) ./files/wifidog.init $(1)/etc/init.d/wifidog
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,wifidog))
|
$(eval $(call BuildPackage,wifidog))
|
||||||
|
|||||||
@ -1,193 +0,0 @@
|
|||||||
# WiFiDog Configuration file
|
|
||||||
|
|
||||||
# Parameter: GatewayID
|
|
||||||
# Default: default
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Set this to the node ID on the auth server
|
|
||||||
# this is used to give a customized login page to the clients and for
|
|
||||||
# monitoring/statistics purpose
|
|
||||||
# If none is supplied, the mac address of the GatewayInterface interface will be used,
|
|
||||||
# without the : separators
|
|
||||||
|
|
||||||
GatewayID default
|
|
||||||
|
|
||||||
# Parameter: ExternalInterface
|
|
||||||
# Default: NONE
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Set this to the external interface (the one going out to the Inernet or your larger LAN).
|
|
||||||
# Typically vlan1 for OpenWrt, and eth0 or ppp0 otherwise,
|
|
||||||
# Normally autodetected
|
|
||||||
|
|
||||||
# ExternalInterface eth0
|
|
||||||
|
|
||||||
# Parameter: GatewayInterface
|
|
||||||
# Default: NONE
|
|
||||||
# Mandatory
|
|
||||||
#
|
|
||||||
# Set this to the internal interface (typically your wifi interface).
|
|
||||||
# Typically br-lan for OpenWrt, and eth1, wlan0, ath0, etc. otherwise
|
|
||||||
|
|
||||||
GatewayInterface br-lan
|
|
||||||
|
|
||||||
# Parameter: GatewayAddress
|
|
||||||
# Default: Find it from GatewayInterface
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Set this to the internal IP address of the gateway. Not normally required.
|
|
||||||
|
|
||||||
# GatewayAddress 192.168.1.1
|
|
||||||
|
|
||||||
# Parameter: AuthServer
|
|
||||||
# Default: NONE
|
|
||||||
# Mandatory, repeatable
|
|
||||||
#
|
|
||||||
# This allows you to configure your auth server(s). Each one will be tried in order, untill one responds.
|
|
||||||
# Set this to the hostname or IP of your auth server(s), the path where
|
|
||||||
# WiFiDog-auth resides in and the port it listens on.
|
|
||||||
#AuthServer {
|
|
||||||
# Hostname (Mandatory; Default: NONE)
|
|
||||||
# SSLAvailable (Optional; Default: no; Possible values: yes, no)
|
|
||||||
# SSLPort (Optional; Default: 443)
|
|
||||||
# HTTPPort (Optional; Default: 80)
|
|
||||||
# Path (Optional; Default: /wifidog/ Note: The path must be both prefixed and suffixed by /. Use a single / for server root.)
|
|
||||||
# LoginScriptPathFragment (Optional; Default: login/? Note: This is the script the user will be sent to for login.)
|
|
||||||
# PortalScriptPathFragment (Optional; Default: portal/? Note: This is the script the user will be sent to after a successfull login.)
|
|
||||||
# MsgScriptPathFragment (Optional; Default: gw_message.php? Note: This is the script the user will be sent to upon error to read a readable message.)
|
|
||||||
# PingScriptPathFragment (Optional; Default: ping/? Note: This is the script the user will be sent to upon error to read a readable message.)
|
|
||||||
# AuthScriptPathFragment (Optional; Default: auth/? Note: This is the script the user will be sent to upon error to read a readable message.)
|
|
||||||
#}
|
|
||||||
|
|
||||||
#AuthServer {
|
|
||||||
# Hostname auth.ilesansfil.org
|
|
||||||
# SSLAvailable yes
|
|
||||||
# Path /
|
|
||||||
#}
|
|
||||||
|
|
||||||
#AuthServer {
|
|
||||||
# Hostname auth2.ilesansfil.org
|
|
||||||
# SSLAvailable yes
|
|
||||||
# Path /
|
|
||||||
#}
|
|
||||||
|
|
||||||
# Parameter: Daemon
|
|
||||||
# Default: 1
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Set this to true if you want to run as a daemon
|
|
||||||
# Daemon 1
|
|
||||||
|
|
||||||
# Parameter: GatewayPort
|
|
||||||
# Default: 2060
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Listen on this port
|
|
||||||
# GatewayPort 2060
|
|
||||||
|
|
||||||
# Parameter: HTTPDName
|
|
||||||
# Default: WiFiDog
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Define what name the HTTPD server will respond
|
|
||||||
# HTTPDName WiFiDog
|
|
||||||
|
|
||||||
# Parameter: HTTPDMaxConn
|
|
||||||
# Default: 10
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# How many sockets to listen to
|
|
||||||
# HTTPDMaxConn 10
|
|
||||||
|
|
||||||
# Parameter: CheckInterval
|
|
||||||
# Default: 60
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# How many seconds should we wait between timeout checks. This is also
|
|
||||||
# how often the gateway will ping the auth server and how often it will
|
|
||||||
# update the traffic counters on the auth server. Setting this too low
|
|
||||||
# wastes bandwidth, setting this too high will cause the gateway to take
|
|
||||||
# a long time to switch to it's backup auth server(s).
|
|
||||||
|
|
||||||
CheckInterval 60
|
|
||||||
|
|
||||||
# Parameter: ClientTimeout
|
|
||||||
# Default: 5
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Set this to the desired of number of CheckInterval of inactivity before a client is logged out
|
|
||||||
# The timeout will be INTERVAL * TIMEOUT
|
|
||||||
ClientTimeout 5
|
|
||||||
|
|
||||||
# Parameter: TrustedMACList
|
|
||||||
# Default: none
|
|
||||||
# Optional
|
|
||||||
#
|
|
||||||
# Comma separated list of MAC addresses who are allowed to pass
|
|
||||||
# through without authentication
|
|
||||||
#TrustedMACList 00:00:DE:AD:BE:AF,00:00:C0:1D:F0:0D
|
|
||||||
|
|
||||||
# Parameter: FirewallRuleSet
|
|
||||||
# Default: none
|
|
||||||
# Mandatory
|
|
||||||
#
|
|
||||||
# Groups a number of FirewallRule statements together.
|
|
||||||
|
|
||||||
# Parameter: FirewallRule
|
|
||||||
# Default: none
|
|
||||||
#
|
|
||||||
# Define one firewall rule in a rule set.
|
|
||||||
|
|
||||||
# Rule Set: global
|
|
||||||
#
|
|
||||||
# Used for rules to be applied to all other rulesets except locked.
|
|
||||||
FirewallRuleSet global {
|
|
||||||
## To block SMTP out, as it's a tech support nightmare, and a legal liability
|
|
||||||
#FirewallRule block tcp port 25
|
|
||||||
|
|
||||||
## Use the following if you don't want clients to be able to access machines on
|
|
||||||
## the private LAN that gives internet access to wifidog. Note that this is not
|
|
||||||
## client isolation; The laptops will still be able to talk to one another, as
|
|
||||||
## well as to any machine bridged to the wifi of the router.
|
|
||||||
# FirewallRule block to 192.168.0.0/16
|
|
||||||
# FirewallRule block to 172.16.0.0/12
|
|
||||||
# FirewallRule block to 10.0.0.0/8
|
|
||||||
|
|
||||||
## This is an example ruleset for the Teliphone service.
|
|
||||||
#FirewallRule allow udp to 69.90.89.192/27
|
|
||||||
#FirewallRule allow udp to 69.90.85.0/27
|
|
||||||
#FirewallRule allow tcp port 80 to 69.90.89.205
|
|
||||||
}
|
|
||||||
|
|
||||||
# Rule Set: validating-users
|
|
||||||
#
|
|
||||||
# Used for new users validating their account
|
|
||||||
FirewallRuleSet validating-users {
|
|
||||||
FirewallRule allow to 0.0.0.0/0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Rule Set: known-users
|
|
||||||
#
|
|
||||||
# Used for normal validated users.
|
|
||||||
FirewallRuleSet known-users {
|
|
||||||
FirewallRule allow to 0.0.0.0/0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Rule Set: unknown-users
|
|
||||||
#
|
|
||||||
# Used for unvalidated users, this is the ruleset that gets redirected.
|
|
||||||
#
|
|
||||||
# XXX The redirect code adds the Default DROP clause.
|
|
||||||
FirewallRuleSet unknown-users {
|
|
||||||
FirewallRule allow udp port 53
|
|
||||||
FirewallRule allow tcp port 53
|
|
||||||
FirewallRule allow udp port 67
|
|
||||||
FirewallRule allow tcp port 67
|
|
||||||
}
|
|
||||||
|
|
||||||
# Rule Set: locked-users
|
|
||||||
#
|
|
||||||
# Not currently used
|
|
||||||
FirewallRuleSet locked-users {
|
|
||||||
FirewallRule block to 0.0.0.0/0
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user