Fix all refs to old chillispot.

AUTHORS

@@ -1,4 +1,4 @@
-ChilliSpot was originally written by Jens Jakobsen. 
-This version is maintained by David Bird <david@coova.com>
+CoovaChilli was originally written by David Bird <david@coova.com>.
+This version is maintained by CoovaChilli community https://github.com/coova/coova-chilli.
 
 Also see CREDITS file.

CREDITS

@@ -1,6 +1,6 @@
-ChilliSpot CREDITS file
+CoovaChilli CREDITS file
 
-This version of ChilliSpot is being maintained by Coova. For more
+This version of CoovaChilli is being maintained by Coova. For more
 information, see http://coova.github.io/
 
 ChilliSpot was originally written by Jens Jakobsen. Many people have

README.md

@@ -1,15 +1,6 @@
-
-Welcome to Coova-Chilli! Coova-Chilli is a fork of the original ChilliSpot
-project. It is largely backward compatible with ChilliSpot 1.1, but is
-actually based on the 1.0 release plus the merging of many other features
-and fixes from both ChilliSpot 1.1 snapshots and contributions from
-PicoPoint, Coova, and others in the community. For more information on
-Coova-Chilli, see:
+CoovaChilli is a feature rich software access controller that provides a
+captive portal / walled-garden environment and uses RADIUS or a HTTP protocol
+for access provisioning and accounting.
+Released under the GNU General Public License (GPL).
 
 http://coova.github.io/
-
-To get started after cloning git repository:
-
-  sh bootstrap  
-  ./configure  
-  make

conf/defaults.in

@@ -132,13 +132,13 @@ HS_UAMHOMEPAGE=http://\$HS_UAMLISTEN:\$HS_UAMPORT/www/coova.html
 # HS_RADCONF=url	   # requires curl
 # HS_RADCONF_URL=https://coova.org/app/ap/config
 
-# HS_RADCONF=on		   # gather the ChilliSpot-Config attributes in
+# HS_RADCONF=on		   # gather the CoovaChilli-Config attributes in
 #			   # Administrative-User login
 # HS_RADCONF_SERVER=rad01.coova.org		 # RADIUS Server
 # HS_RADCONF_SECRET=coova-anonymous		 # RADIUS Shared Secret 
 # HS_RADCONF_AUTHPORT=1812			 # Auth port
-# HS_RADCONF_USER=chillispot			 # Username
-# HS_RADCONF_PWD=chillispot			 # Password
+# HS_RADCONF_USER=coovachilli			 # Username
+# HS_RADCONF_PWD=coovachilli			 # Password
 
 
 ###
@@ -154,11 +154,11 @@ HS_UAMHOMEPAGE=http://\$HS_UAMLISTEN:\$HS_UAMPORT/www/coova.html
 #   Standard configurations
 #
 HS_MODE=hotspot
-HS_TYPE=chillispot
+HS_TYPE=coovachilli
 # HS_RADAUTH=1812
 # HS_RADACCT=1813
-# HS_ADMUSR=chillispot
-# HS_ADMPWD=chillispot
+# HS_ADMUSR=coovachilli
+# HS_ADMPWD=coovachilli
 
 
 ###

conf/gui-config-default.ini

@@ -6,19 +6,19 @@ HS_UAMLISTEN=10.1.0.1
 HS_UAMPORT=3990
 HS_NASID=openmoko
 HS_UAMSECRET=
-HS_RADIUS=rad01.coova.org
-HS_RADIUS2=rad01.coova.org
+HS_RADIUS=rad01.spotcove.net
+HS_RADIUS2=rad01.spotcove.net
 HS_RADSECRET=coova-anonymous
-HS_UAMALLOW=coova.org
+HS_UAMALLOW=spotcove.net
 HS_SSID=Coova
-HS_UAMSERVER=coova.org
+HS_UAMSERVER=spotcove.net
 HS_UAMFORMAT=https://\$HS_UAMSERVER/app/uam/chilli
 HS_UAMHOMEPAGE=http://\$HS_UAMLISTEN:\$HS_UAMPORT/www/coova.html
 HS_UAMSERVICE=https://coova.org/app/uam/auth
 HS_MACAUTH=on
 HS_USELOCALUSERS=on
 HS_MODE=hotspot
-HS_TYPE=chillispot
+HS_TYPE=coovachilli
 HS_WWWDIR=/usr/local/etc/chilli/www
 HS_WWWBIN=/usr/local/etc/chilli/wwwsh
 HS_PROVIDER=Coova

config.h.in

@@ -6,7 +6,7 @@
 /* Define to enable Accounting-On and Accounting-Off */
 #undef ENABLE_ACCOUNTING_ONOFF
 
-/* Define to enable the use of the ChilliSpot-AP-Session-Id attribute */
+/* Define to enable the use of the CoovaChilli-AP-Session-Id attribute */
 #undef ENABLE_APSESSIONID
 
 /* Define to include Authenticated Garden */
@@ -30,9 +30,6 @@
 /* Define to enable chilli_script helper */
 #undef ENABLE_CHILLISCRIPT
 
-/* Define to enable the use of the ChilliSpot-Config attribute */
-#undef ENABLE_CHILLISPOTCONFIG
-
 /* Define to enable Chilli XML */
 #undef ENABLE_CHILLIXML
 
@@ -45,6 +42,9 @@
 /* none */
 #undef ENABLE_CONFIG
 
+/* Define to enable the use of the CoovaChilli-Config attribute */
+#undef ENABLE_COOVACHILLICONFIG
+
 /* Define to enable debugging */
 #undef ENABLE_DEBUG
 
@@ -159,10 +159,10 @@
 /* Define to enable Chilli session walled garden */
 #undef ENABLE_SESSGARDEN
 
-/* Define to enable the use of the ChilliSpot-Session-Id attribute */
+/* Define to enable the use of the CoovaChilli-Session-Id attribute */
 #undef ENABLE_SESSIONID
 
-/* Define to enable extended use of the ChilliSpot-Session-State attribute */
+/* Define to enable extended use of the CoovaChilli-Session-State attribute */
 #undef ENABLE_SESSIONSTATE
 
 /* Define to enable per session postauth proxy */

configure.ac

@@ -583,32 +583,32 @@ fi
 
 AM_CONDITIONAL(WITH_CLUSTER, [test x"$enable_cluster" = xyes])
 
-AC_ARG_ENABLE(sessionstate, [AC_HELP_STRING([--enable-sessionstate],[Enable extended use of the ChilliSpot-Session-State attribute])], 
+AC_ARG_ENABLE(sessionstate, [AC_HELP_STRING([--enable-sessionstate],[Enable extended use of the CoovaChilli-Session-State attribute])], 
   enable_sessionstate=$enableval, enable_sessionstate=no)
 
 if test x"$enable_sessionstate" = xyes; then
-   AC_DEFINE(ENABLE_SESSIONSTATE,1,[Define to enable extended use of the ChilliSpot-Session-State attribute])
+   AC_DEFINE(ENABLE_SESSIONSTATE,1,[Define to enable extended use of the CoovaChilli-Session-State attribute])
 fi
 
-AC_ARG_ENABLE(sessionid, [AC_HELP_STRING([--enable-sessionid],[Enable the use of the ChilliSpot-Session-Id attribute])], 
+AC_ARG_ENABLE(sessionid, [AC_HELP_STRING([--enable-sessionid],[Enable the use of the CoovaChilli-Session-Id attribute])], 
   enable_sessionid=$enableval, enable_sessionid=no)
 
 if test x"$enable_sessionid" = xyes; then
-   AC_DEFINE(ENABLE_SESSIONID,1,[Define to enable the use of the ChilliSpot-Session-Id attribute])
+   AC_DEFINE(ENABLE_SESSIONID,1,[Define to enable the use of the CoovaChilli-Session-Id attribute])
 fi
 
-AC_ARG_ENABLE(apsessionid, [AC_HELP_STRING([--enable-apsessionid],[Enable the use of the ChilliSpot-AP-Session-Id attribute])], 
+AC_ARG_ENABLE(apsessionid, [AC_HELP_STRING([--enable-apsessionid],[Enable the use of the CoovaChilli-AP-Session-Id attribute])], 
   enable_apsessionid=$enableval, enable_apsessionid=no)
 
 if test x"$enable_apsessionid" = xyes; then
-   AC_DEFINE(ENABLE_APSESSIONID,1,[Define to enable the use of the ChilliSpot-AP-Session-Id attribute])
+   AC_DEFINE(ENABLE_APSESSIONID,1,[Define to enable the use of the CoovaChilli-AP-Session-Id attribute])
 fi
 
-AC_ARG_ENABLE(chillispotconfig, [AC_HELP_STRING([--disable-chillispotconfig],[Disable the use of the ChilliSpot-Config attribute])], 
-  enable_chillispotconfig=$enableval, enable_chillispotconfig=yes)
+AC_ARG_ENABLE(coovachilliconfig, [AC_HELP_STRING([--disable-coovachilliconfig],[Disable the use of the CoovaChilli-Config attribute])], 
+  enable_coovachilliconfig=$enableval, enable_coovachilliconfig=yes)
 
-if test x"$enable_chillispotconfig" = xyes; then
-   AC_DEFINE(ENABLE_CHILLISPOTCONFIG,1,[Define to enable the use of the ChilliSpot-Config attribute])
+if test x"$enable_coovachilliconfig" = xyes; then
+   AC_DEFINE(ENABLE_COOVACHILLICONFIG,1,[Define to enable the use of the CoovaChilli-Config attribute])
 fi
 
 AC_ARG_ENABLE(mdns, [AC_HELP_STRING([--enable-mdns],[Enable support for MDNS])], 

distro/openmoko/usr/local/etc/chilli/defaults

@@ -17,7 +17,7 @@ HS_UAMSERVICE=https://coova.org/app/uam/auth
 HS_MACAUTH=on
 HS_USELOCALUSERS=on
 HS_MODE=hotspot
-HS_TYPE=chillispot
+HS_TYPE=coovachilli
 HS_WWWDIR=/usr/local/etc/chilli/www
 HS_WWWBIN=/usr/local/etc/chilli/wwwsh
 HS_PROVIDER=Coova

distro/openmoko/usr/local/etc/chilli/gui-config-default.ini

@@ -18,7 +18,7 @@ HS_UAMSERVICE=https://coova.org/app/uam/auth
 HS_MACAUTH=on
 HS_USELOCALUSERS=on
 HS_MODE=hotspot
-HS_TYPE=chillispot
+HS_TYPE=coovachilli
 HS_WWWDIR=/usr/local/etc/chilli/www
 HS_WWWBIN=/usr/local/etc/chilli/wwwsh
 HS_PROVIDER=Coova

distro/redhat/coova-chilli.spec.in

@@ -14,8 +14,8 @@ BuildRequires: openssl-devel
 
 %description 
 
-Coova-Chilli is a fork of the ChilliSpot project - an open source captive
-portal or wireless LAN access point controller. It supports web based login
+Coova-Chilli is an open source captive portal or wireless LAN access point
+controller. It supports web based login
 (Universal Access Method, or UAM), standard for public HotSpots, and it
 supports Wireless Protected Access (WPA), the standard for secure roamable
 networks. Authentication, Authorization and Accounting (AAA) is handled by

distro/suse/coova-chilli.spec.in

@@ -14,8 +14,8 @@ BuildRequires: openssl-devel
 
 %description 
 
-Coova-Chilli is a fork of the ChilliSpot project - an open source captive
-portal or wireless LAN access point controller. It supports web based login
+Coova-Chilli is an open source captive portal or wireless LAN access point
+controller. It supports web based login
 (Universal Access Method, or UAM), standard for public HotSpots, and it
 supports Wireless Protected Access (WPA), the standard for secure roamable
 networks. Authentication, Authorization and Accounting (AAA) is handled by

doc/attributes

@@ -37,18 +37,18 @@ WISPr-Redirection-URL:14122, 4:String:- : X : - : - : - : If present the client
 WISPr-Bandwidth-Max-Up:14122, 7:Integer:-:X : - : X : X : Maximum transmit rate (b/s). Limits the bandwidth of the connection. Note that this attribute is specified in bits per second.
 WISPr-Bandwidth-Max-Down:14122, 8:Integer:-:X:- : X : X : Maximum receive rate (b/s). Limits the bandwidth of the connection. Note that this attribute is specified in bits per second.
 WISPr-Session-Terminate-Time:14122, 9:String:-:X:-:X: X : The time when the user should be disconnected in ISO 8601 format (YYYY-MM-DDThh:mm:ssTZD). If TZD is not specified local time is assumed. For example a disconnect on 18 December 2001 at 7:00 PM UTC would be specified as 2001-12-18T19:00:00+00:00.
-ChilliSpot-Max-Input-Octets:14559, 1:Integer:-:X:-:X: X : Maximum number of octets the user is allowed to transmit. After this limit has been reached the user will be disconnected.
-ChilliSpot-Max-Output-Octets:14559, 2:Integer:-:X:-:X: X : Maximum number of octets the user is allowed to receive. After this limit has been reached the user will be disconnected.
-ChilliSpot-Max-Total-Octets:14559, 3:Integer:-:X:-:X: X : Maximum total octets the user is allowed to send or receive. After this limit has been reached the user will be disconnected.
-ChilliSpot-Bandwidth-Max-Up:14559, 4:Integer:-:X:-:X: X : Maximum bandwidth up
-ChilliSpot-Bandwidth-Max-Down:14559, 5:Integer:-:X:-:X: X : Maximum bandwidth down
-ChilliSpot-Config:14559, 6:String:X:X:-:X:X:Configurations passed between chilli and back-end as name value pairs
-ChilliSpot-Lang:14559, 7:String:X:-:-:-:-:Language selected in user interface
-ChilliSpot-Version:14559, 8:String:X:-:-:-:-:Contains the version of the running CoovaChilli
-ChilliSpot-DHCP-Netmask:14559, 61 : IPaddr  : - : X : - : - : - : DHCP IP netmask of the user, which is configurable during MAC authentication in the Access-Accept.
-ChilliSpot-DHCP-DNS1:14559, 62 : IPaddr  : - : X : - : - : - : DHCP DNS1 of the user, which is configurable during MAC authentication in the Access-Accept.
-ChilliSpot-DHCP-DNS2:14559, 63 : IPaddr  : - : X : - : - : - : DHCP DNS2 of the user, which is configurable during MAC authentication in the Access-Accept.
-ChilliSpot-DHCP-Gateway:14559, 64 : IPaddr  : - : X : - : - : - : DHCP Gateway of the user, which is configurable during MAC authentication in the Access-Accept.
-ChilliSpot-DHCP-Domain:14559, 65 : IPaddr  : - : X : - : - : - : DHCP Domain of the user, which is configurable during MAC authentication in the Access-Accept.
+CoovaChilli-Max-Input-Octets:14559, 1:Integer:-:X:-:X: X : Maximum number of octets the user is allowed to transmit. After this limit has been reached the user will be disconnected.
+CoovaChilli-Max-Output-Octets:14559, 2:Integer:-:X:-:X: X : Maximum number of octets the user is allowed to receive. After this limit has been reached the user will be disconnected.
+CoovaChilli-Max-Total-Octets:14559, 3:Integer:-:X:-:X: X : Maximum total octets the user is allowed to send or receive. After this limit has been reached the user will be disconnected.
+CoovaChilli-Bandwidth-Max-Up:14559, 4:Integer:-:X:-:X: X : Maximum bandwidth up
+CoovaChilli-Bandwidth-Max-Down:14559, 5:Integer:-:X:-:X: X : Maximum bandwidth down
+CoovaChilli-Config:14559, 6:String:X:X:-:X:X:Configurations passed between chilli and back-end as name value pairs
+CoovaChilli-Lang:14559, 7:String:X:-:-:-:-:Language selected in user interface
+CoovaChilli-Version:14559, 8:String:X:-:-:-:-:Contains the version of the running CoovaChilli
+CoovaChilli-DHCP-Netmask:14559, 61 : IPaddr  : - : X : - : - : - : DHCP IP netmask of the user, which is configurable during MAC authentication in the Access-Accept.
+CoovaChilli-DHCP-DNS1:14559, 62 : IPaddr  : - : X : - : - : - : DHCP DNS1 of the user, which is configurable during MAC authentication in the Access-Accept.
+CoovaChilli-DHCP-DNS2:14559, 63 : IPaddr  : - : X : - : - : - : DHCP DNS2 of the user, which is configurable during MAC authentication in the Access-Accept.
+CoovaChilli-DHCP-Gateway:14559, 64 : IPaddr  : - : X : - : - : - : DHCP Gateway of the user, which is configurable during MAC authentication in the Access-Accept.
+CoovaChilli-DHCP-Domain:14559, 65 : IPaddr  : - : X : - : - : - : DHCP Domain of the user, which is configurable during MAC authentication in the Access-Accept.
 MS-MPPE-Send-Key:311,16:String:-:X:-:-:- : Used for WPA
 MS-MPPE-Recv-Key:311,17:String:-:X:-:-:- : Used for WPA

doc/chilli.8.in

@@ -1,4 +1,4 @@
-.\" * chilli - ChilliSpot.org. A Wireless LAN Access Point Controller
+.\" * CoovaChilli - http://coova.github.io/. A Wireless LAN Access Point Controller
 .\" * Copyright (C) 2002, 2003, 2004, 2005 Mondru AB.
 .\" * Copyright (C) 2007-2012 David Bird (Coova Technologies)
 .\" *
@@ -42,7 +42,7 @@ supports of two different access methods for a Wireless LAN HotSpot:
 Universal Access Method (UAM) as well as Wireless Protected Access
 (WPA). This version of 
 .B chilli
-is called CoovaChilli, a fork of the original ChilliSpot. See
+is called CoovaChilli. See
 .I http://coova.github.io/
 for more information.
 
@@ -277,7 +277,6 @@ The above configuration options can only be changed by restarting the daemon.
 See
 .I http://coova.github.io/
 for further documentation and community support.
-The original ChilliSpot project homepage is/was at www.chillispot.org.
 
 Besides the long options documented in this man page
 .B chilli

doc/chilli.conf

@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Sample ChilliSpot configuration file
+# Sample CoovaChilli configuration file
 #
 ##############################################################################
 
@@ -69,7 +69,7 @@
 # Domain name
 # Will be suggested to the client.
 # Normally you do not need to uncomment this tag.
-#domain key.chillispot.org
+#domain key.coovachilli.org
 
 # TAG: ipup
 # Script executed after network interface has been brought up.
@@ -96,14 +96,14 @@
 # TAG: radiusserver1
 # IP address of radius server 1
 # For most installations you need to modify this tag.
-radiusserver1 rad01.chillispot.org
+radiusserver1 rad01.spotcoove.net
 
 # TAG: radiusserver2
 # IP address of radius server 2
 # If you have only one radius server you should set radiusserver2 to the
 # same value as radiusserver1.
 # For most installations you need to modify this tag.
-radiusserver2 rad02.chillispot.org
+radiusserver2 rad02.spotcoove.net
 
 # TAG: radiusauthport
 # Radius authentication port
@@ -193,7 +193,7 @@ dhcpif eth1
 
 # TAG: uamserver
 # URL of web server handling authentication.
-uamserver https://radius.chillispot.org/hotspotlogin
+uamserver https://www.spotcove.net
 
 # TAG: uamhomepage
 # URL of welcome homepage.
@@ -221,7 +221,7 @@ uamserver https://radius.chillispot.org/hotspotlogin
 # the client can access without first authenticating.
 # It is possible to specify this tag multiple times.
 # Normally you do not need to uncomment this tag.
-#uamallowed www.chillispot.org,10.11.12.0/24
+#uamallowed www.spotcove.net,10.11.12.0/24
 
 # TAG: uamanydns
 # If this flag is given unauthenticated users are allowed to use