From 643b068e237349f06e45ad5beafbb69f0c23908d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 24 Sep 2008 23:08:10 +0000 Subject: [PATCH] * luci/app/coovachilli: replace all chillispot names with coovachilli --- .../controller/{chillispot.lua => coovachilli.} | 0 .../luasrc/controller/coovachilli.lua | 26 +++++ .../model/cbi/{chillispot.lua => coovachilli.lua} | 2 +- .../{chillispot_auth.lua => coovachilli_auth.lua} | 2 +- ...llispot_network.lua => coovachilli_network.lua} | 2 +- ...hillispot_radius.lua => coovachilli_radius.lua} | 2 +- .../root/etc/config/{chillispot => coovachilli} | 2 +- .../uci/schema/default/{chillispot => coovachilli} | 106 ++++++++++----------- 8 files changed, 84 insertions(+), 58 deletions(-) rename applications/luci-coovachilli/luasrc/controller/{chillispot.lua => coovachilli.} (100%) create mode 100644 applications/luci-coovachilli/luasrc/controller/coovachilli.lua rename applications/luci-coovachilli/luasrc/model/cbi/{chillispot.lua => coovachilli.lua} (97%) rename applications/luci-coovachilli/luasrc/model/cbi/{chillispot_auth.lua => coovachilli_auth.lua} (98%) rename applications/luci-coovachilli/luasrc/model/cbi/{chillispot_network.lua => coovachilli_network.lua} (98%) rename applications/luci-coovachilli/luasrc/model/cbi/{chillispot_radius.lua => coovachilli_radius.lua} (98%) rename applications/luci-coovachilli/root/etc/config/{chillispot => coovachilli} (99%) rename applications/luci-coovachilli/root/lib/uci/schema/default/{chillispot => coovachilli} (74%) diff --git a/applications/luci-coovachilli/luasrc/controller/chillispot.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli. similarity index 100% rename from applications/luci-coovachilli/luasrc/controller/chillispot.lua rename to applications/luci-coovachilli/luasrc/controller/coovachilli. diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua new file mode 100644 index 000000000..beaa1b7eb --- /dev/null +++ b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua @@ -0,0 +1,26 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +$Id$ +]]-- +module("luci.controller.coovachilli", package.seeall) + +function index() + + require("luci.i18n") + local i18n = luci.i18n.translate + + entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), i18n("coovachilli", "coovachilli"), 90) + entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("coovachilli_network", "Network Configuration"), 10) + entry( { "admin", "services", "coovachilli", "radius" }, cbi("coovachilli_radius"), i18n("coovachilli_radius", "Radius Configuration"), 20) + entry( { "admin", "services", "coovachilli", "auth" }, cbi("coovachilli_auth"), i18n("coovachilli_auth", "UAM and MAC Authentication"), 30) + +end diff --git a/applications/luci-coovachilli/luasrc/model/cbi/chillispot.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua similarity index 97% rename from applications/luci-coovachilli/luasrc/model/cbi/chillispot.lua rename to applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua index 48ec797f1..49c4fe57d 100644 --- a/applications/luci-coovachilli/luasrc/model/cbi/chillispot.lua +++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli.lua @@ -14,7 +14,7 @@ $Id$ ]]-- -m = Map("chillispot") +m = Map("coovachilli") -- general s1 = m:section(TypedSection, "general") diff --git a/applications/luci-coovachilli/luasrc/model/cbi/chillispot_auth.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua similarity index 98% rename from applications/luci-coovachilli/luasrc/model/cbi/chillispot_auth.lua rename to applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua index 8f033f070..33c6efede 100644 --- a/applications/luci-coovachilli/luasrc/model/cbi/chillispot_auth.lua +++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua @@ -14,7 +14,7 @@ $Id$ ]]-- -m = Map("chillispot") +m = Map("coovachilli") -- uam config s1 = m:section(TypedSection, "uam") diff --git a/applications/luci-coovachilli/luasrc/model/cbi/chillispot_network.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua similarity index 98% rename from applications/luci-coovachilli/luasrc/model/cbi/chillispot_network.lua rename to applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua index e26f32e1a..2209a5230 100644 --- a/applications/luci-coovachilli/luasrc/model/cbi/chillispot_network.lua +++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua @@ -16,7 +16,7 @@ $Id$ require("luci.sys") require("luci.ip") -m = Map("chillispot") +m = Map("coovachilli") -- tun s1 = m:section(TypedSection, "tun") diff --git a/applications/luci-coovachilli/luasrc/model/cbi/chillispot_radius.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua similarity index 98% rename from applications/luci-coovachilli/luasrc/model/cbi/chillispot_radius.lua rename to applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua index 568c92f83..195a8cc87 100644 --- a/applications/luci-coovachilli/luasrc/model/cbi/chillispot_radius.lua +++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua @@ -14,7 +14,7 @@ $Id$ ]]-- -m = Map("chillispot") +m = Map("coovachilli") -- radius server s1 = m:section(TypedSection, "radius") diff --git a/applications/luci-coovachilli/root/etc/config/chillispot b/applications/luci-coovachilli/root/etc/config/coovachilli similarity index 99% rename from applications/luci-coovachilli/root/etc/config/chillispot rename to applications/luci-coovachilli/root/etc/config/coovachilli index fbbe22bc6..3cda08fb6 100644 --- a/applications/luci-coovachilli/root/etc/config/chillispot +++ b/applications/luci-coovachilli/root/etc/config/coovachilli @@ -1,6 +1,6 @@ ############################################################################## # -# Sample ChilliSpot configuration file +# Sample CoovaChilli configuration file # ############################################################################## diff --git a/applications/luci-coovachilli/root/lib/uci/schema/default/chillispot b/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli similarity index 74% rename from applications/luci-coovachilli/root/lib/uci/schema/default/chillispot rename to applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli index a3c613bc8..f006c7602 100644 --- a/applications/luci-coovachilli/root/lib/uci/schema/default/chillispot +++ b/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli @@ -1,330 +1,330 @@ -package chillispot +package coovachilli config section option name 'general' option title 'Section general' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'debug' option title 'Option debug' - option section 'chillispot.general' + option section 'coovachilli.general' option datatype 'boolean' config variable option name 'interval' option title 'Option interval' - option section 'chillispot.general' + option section 'coovachilli.general' option datatype 'uint' config variable option name 'pidfile' option title 'Option pidfile' - option section 'chillispot.general' + option section 'coovachilli.general' option datatype 'string' config variable option name 'statedir' option title 'Option statedir' - option section 'chillispot.general' + option section 'coovachilli.general' option datatype 'directory' config section option name 'tun' option title 'Section tun' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'net' option title 'Option net' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'ip4addr' config variable option name 'statip' option title 'Option statip' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'ip4addr' config variable option name 'dynip' option title 'Option dynip' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'ip4addr' config variable option name 'dns1' option title 'Option dns1' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'ip4addr' config variable option name 'dns2' option title 'Option dns2' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'ip4addr' config variable option name 'domain' option title 'Option domain' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'string' config variable option name 'ipdown' option title 'Option ipdown' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'file' config variable option name 'ipup' option title 'Option ipup' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'file' config variable option name 'condown' option title 'Option condown' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'file' config variable option name 'conup' option title 'Option conup' - option section 'chillispot.tun' + option section 'coovachilli.tun' option datatype 'file' config section option name 'dhcp' option title 'Section dhcp' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'dhcpif' option title 'Option dhcpif' - option section 'chillispot.dhcp' + option section 'coovachilli.dhcp' option datatype 'string' config variable option name 'dhcpmac' option title 'Option dhcpmac' - option section 'chillispot.dhcp' + option section 'coovachilli.dhcp' option datatype 'macaddr' config variable option name 'lease' option title 'Option lease' - option section 'chillispot.dhcp' + option section 'coovachilli.dhcp' option datatype 'uint' config section option name 'macauth' option title 'Section macauth' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'macauth' option title 'Option macauth' - option section 'chillispot.macauth' + option section 'coovachilli.macauth' option datatype 'boolean' config variable option name 'macallowed' option title 'Option macallowed' - option section 'chillispot.macauth' + option section 'coovachilli.macauth' option datatype 'string' option type 'lazylist' config variable option name 'macpasswd' option title 'Option macpasswd' - option section 'chillispot.macauth' + option section 'coovachilli.macauth' option datatype 'string' config variable option name 'macsuffix' option title 'Option macsuffix' - option section 'chillispot.macauth' + option section 'coovachilli.macauth' option datatype 'string' config section option name 'radius' option title 'Section radius' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'radiusacctport' option title 'Option radiusacctport' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'port' config variable option name 'radiusauthport' option title 'Option radiusauthport' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'port' config variable option name 'radiuscalled' option title 'Option radiuscalled' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'string' config variable option name 'radiuslisten' option title 'Option radiuslisten' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'ip4addr' config variable option name 'radiuslocationid' option title 'Option radiuslocationid' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'string' config variable option name 'radiuslocationname' option title 'Option radiuslocationname' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'string' config variable option name 'radiusnasid' option title 'Option radiusnasid' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'string' config variable option name 'radiusnasip' option title 'Option radiusnasip' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'ip4addr' config variable option name 'radiussecret' option title 'Option radiussecret' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'string' config variable option name 'radiusserver1' option title 'Option radiusserver1' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'host' config variable option name 'radiusserver2' option title 'Option radiusserver2' - option section 'chillispot.radius' + option section 'coovachilli.radius' option datatype 'host' config section option name 'proxy' option title 'Section proxy' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'proxyclient' option title 'Option proxyclient' - option section 'chillispot.proxy' + option section 'coovachilli.proxy' option datatype 'ip4addr' config variable option name 'proxylisten' option title 'Option proxylisten' - option section 'chillispot.proxy' + option section 'coovachilli.proxy' option datatype 'ip4addr' config variable option name 'proxyport' option title 'Option proxyport' - option section 'chillispot.proxy' + option section 'coovachilli.proxy' option datatype 'port' config variable option name 'proxysecret' option title 'Option proxysecret' - option section 'chillispot.proxy' + option section 'coovachilli.proxy' option datatype 'string' config section option name 'remoteconfig' option title 'Section remoteconfig' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'confpassword' option title 'Option confpassword' - option section 'chillispot.remoteconfig' + option section 'coovachilli.remoteconfig' option datatype 'string' config variable option name 'confusername' option title 'Option confusername' - option section 'chillispot.remoteconfig' + option section 'coovachilli.remoteconfig' option datatype 'string' config section option name 'uam' option title 'Section uam' - option package 'chillispot' + option package 'coovachilli' option unique true option required true config variable option name 'uamallowed' option title 'Option uamallowed' - option section 'chillispot.uam' + option section 'coovachilli.uam' option datatype 'host' option type 'list' config variable option name 'uamhomepage' option title 'Option uamhomepage' - option section 'chillispot.uam' + option section 'coovachilli.uam' option datatype 'string' config variable option name 'uamlisten' option title 'Option uamlisten' - option section 'chillispot.uam' + option section 'coovachilli.uam' option datatype 'ip4addr' config variable option name 'uamport' option title 'Option uamport' - option section 'chillispot.uam' + option section 'coovachilli.uam' option datatype 'port' config variable option name 'uamsecret' option title 'Option uamsecret' - option section 'chillispot.uam' + option section 'coovachilli.uam' option datatype 'string' config variable option name 'uamserver' option title 'Option uamserver' - option section 'chillispot.uam' + option section 'coovachilli.uam' option datatype 'string' -- 2.11.0