summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-05-03 21:48:57 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-05-03 21:48:57 +0000
commitc8f8dec0e31f536e2e69b485a0f999f6c1e94210 (patch)
treedbf85b6a09601a4bb113f008f6cf4c41fd40bbcc
parent69f8196472142549c549e014c3ff17e5c400610a (diff)
modules/admin-full: remove support for httpd and lucittpd configuration, it just takes space
-rw-r--r--modules/admin-full/luasrc/controller/admin/services.lua14
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua31
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua25
3 files changed, 0 insertions, 70 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua
index 38e3448f0..81c4426ba 100644
--- a/modules/admin-full/luasrc/controller/admin/services.lua
+++ b/modules/admin-full/luasrc/controller/admin/services.lua
@@ -28,20 +28,6 @@ function index()
page.order = 40
page.index = true
- if nixio.fs.access("/etc/config/lucittpd") then
- local page = node("admin", "services", "lucittpd")
- page.target = cbi("admin_services/lucittpd")
- page.title = "LuCIttpd"
- page.order = 10
- end
-
- if nixio.fs.access("/etc/config/httpd") then
- local page = node("admin", "services", "httpd")
- page.target = cbi("admin_services/httpd")
- page.title = "Busybox HTTPd"
- page.order = 11
- end
-
if nixio.fs.access("/etc/config/dhcp") then
local page = node("admin", "services", "dnsmasq")
page.target = cbi("admin_services/dnsmasq")
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
deleted file mode 100644
index 5cd1ae9db..000000000
--- a/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
+++ /dev/null
@@ -1,31 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-
-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$
-]]--
-m = Map("httpd", "Busybox HTTPd", translate("A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."))
-
-s = m:section(TypedSection, "httpd", "")
-s.anonymous = true
-s.addremove = true
-
-port = s:option(Value, "port", translate("Port"))
-port.isinteger = true
-
-s:option(Value, "home", translate("Document root"))
-
-config = s:option(Value, "c_file", translate("Configuration file"), translate("defaults to <code>/etc/httpd.conf</code>"))
-config.rmempty = true
-
-realm = s:option(Value, "realm", translate("Authentication Realm"), translate("The realm which will be displayed at the authentication prompt for protected pages."))
-realm.rmempty = true
-
-return m
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
deleted file mode 100644
index f0b15a4ca..000000000
--- a/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
+++ /dev/null
@@ -1,25 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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$
-]]--
-m = Map("lucittpd", "LuCIttpd", translate("A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"))
-
-s = m:section(NamedSection, "lucittpd", "lucittpd", "")
-
-s:option(Value, "port", translate("Port"))
-s:option(Value, "root", translate("Document root"))
-s:option(Value, "path", translate("Plugin path"))
-s:option(Flag, "keepalive", translate("Enable Keep-Alive"))
-s:option(Value, "timeout", translate("Connection timeout"))
-
-return m