net/luci-app-*: move luci apps to luci repo 4013/head
authordanrl <mail@danrl.com>
Wed, 15 Feb 2017 12:40:12 +0000 (13:40 +0100)
committerdanrl <mail@danrl.com>
Wed, 15 Feb 2017 12:40:12 +0000 (13:40 +0100)
This is a long-needed clean-up.
These applications are not gone! They live in the
luci repo now, where all their friends already are.

Signed-off-by: Dan Luedtke <mail@danrl.com>
13 files changed:
net/luci-app-bcp38/Makefile [deleted file]
net/luci-app-bcp38/files/bcp38-cbi.lua [deleted file]
net/luci-app-bcp38/files/bcp38-controller.lua [deleted file]
net/luci-app-bcp38/files/uci-defaults-bcp38 [deleted file]
net/luci-app-clamav/Makefile [deleted file]
net/luci-app-clamav/files/controller/clamav-controller.lua [deleted file]
net/luci-app-clamav/files/model/cbi/clamav-cbi.lua [deleted file]
net/luci-app-e2guardian/Makefile [deleted file]
net/luci-app-e2guardian/files/e2guardian-cbi.lua [deleted file]
net/luci-app-e2guardian/files/e2guardian-controller.lua [deleted file]
net/luci-app-squid/Makefile [deleted file]
net/luci-app-squid/files/squid-cbi.lua [deleted file]
net/luci-app-squid/files/squid-controller.lua [deleted file]

diff --git a/net/luci-app-bcp38/Makefile b/net/luci-app-bcp38/Makefile
deleted file mode 100644 (file)
index ecf84fd..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-bcp38
-PKG_VERSION:=2
-PKG_RELEASE:=2
-PKG_LICENSE:=Apache-2.0
-LUCI_DIR:=/usr/lib/lua/luci
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-bcp38
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=BCP38 LuCI interface
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-  PKGARCH:=all
-  DEPENDS:= lua luci-base +bcp38
-  SUBMENU:=3. Applications
-endef
-
-define Package/luci-app-bcp38/description
-       Control BCP38 subnet blocking
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/luci-app-bcp38/install
-       $(INSTALL_DIR) $(1)$(LUCI_DIR)/controller $(1)$(LUCI_DIR)/model/cbi
-       $(INSTALL_DATA) ./files/bcp38-controller.lua $(1)$(LUCI_DIR)/controller/bcp38.lua
-       $(INSTALL_DATA) ./files/bcp38-cbi.lua $(1)$(LUCI_DIR)/model/cbi/bcp38.lua
-       $(INSTALL_DIR) $(1)/etc/uci-defaults
-       $(INSTALL_BIN) ./files/uci-defaults-bcp38 $(1)/etc/uci-defaults/luci-bcp38
-endef
-
-define Package/luci-app-bcp38/postinst
-#!/bin/sh
-[ -x /etc/uci-defaults/luci-bcp38 ] && /etc/uci-defaults/luci-bcp38 || exit 0
-endef
-
-define Package/luci-app-bcp38/postrm
-#!/bin/sh
-uci delete ucitrack.@bcp38[0]
-uci commit
-endef
-
-$(eval $(call BuildPackage,luci-app-bcp38))
diff --git a/net/luci-app-bcp38/files/bcp38-cbi.lua b/net/luci-app-bcp38/files/bcp38-cbi.lua
deleted file mode 100644 (file)
index 632074a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2014 Toke Høiland-Jørgensen <toke@toke.dk>
-
-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$
-]]--
-
-local wa = require "luci.tools.webadmin"
-local net = require "luci.model.network".init()
-local ifaces = net:get_interfaces()
-
-m = Map("bcp38", translate("BCP38"),
-       translate("This function blocks packets with private address destinations " ..
-               "from going out onto the internet as per " ..
-               "<a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>. " ..
-               "For IPv6, only source specific default routes are installed, so " ..
-               "no BCP38 firewall routes are needed."))
-
-s = m:section(TypedSection, "bcp38", translate("BCP38 config"))
-s.anonymous = true
--- BASIC
-e = s:option(Flag, "enabled", translate("Enable"))
-e.rmempty = false
-
-a = s:option(Flag, "detect_upstream", translate("Auto-detect upstream IP"),
-                               translate("Attempt to automatically detect if the upstream IP " ..
-                                       "will be blocked by the configuration, and add an exception if it will. " ..
-                                       "If this does not work correctly, you can add exceptions manually below."))
-a.rmempty = false
-
-n = s:option(ListValue, "interface", translate("Interface name"), translate("Interface to apply the blocking to " ..
-                                                       "(should be the upstream WAN interface)."))
-for _, iface in ipairs(ifaces) do
-     if iface:is_up() then
-       n:value(iface:name())
-     end
-end
-n.rmempty = false
-
-ma = s:option(DynamicList, "match",
-       translate("Blocked IP ranges"))
-
-ma.datatype = "ip4addr"
-
-nm = s:option(DynamicList, "nomatch",
-       translate("Allowed IP ranges"), translate("Takes precedence over blocked ranges. "..
-                                                 "Use to whitelist your upstream network if you're behind a double NAT " ..
-                                                 "and the auto-detection doesn't work."))
-
-nm.datatype = "ip4addr"
-
-
-return m
diff --git a/net/luci-app-bcp38/files/bcp38-controller.lua b/net/luci-app-bcp38/files/bcp38-controller.lua
deleted file mode 100644 (file)
index 7ea2283..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-module("luci.controller.bcp38", package.seeall)
-
-function index()
-       entry({"admin", "network", "firewall", "bcp38"},
-               cbi("bcp38"),
-               _("BCP38"), 50).dependent = false
-end
diff --git a/net/luci-app-bcp38/files/uci-defaults-bcp38 b/net/luci-app-bcp38/files/uci-defaults-bcp38
deleted file mode 100755 (executable)
index c204236..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-       delete ucitrack.@bcp38[-1]
-       add ucitrack bcp38
-        add_list ucitrack.@bcp38[0].affects=firewall
-       commit ucitrack
-EOF
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/net/luci-app-clamav/Makefile b/net/luci-app-clamav/Makefile
deleted file mode 100644 (file)
index fed8e63..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-clamav
-PKG_RELEASE:=20150520
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-PKG_LICENSE:=Apache-2.0
-PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-clamav
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:=ClamAV Web UI
-  DEPENDS:=+luci-mod-admin-full +clamav
-endef
-
-define Package/luci-app-clamav/description
- This package will install ClamAV Web UI.
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-clamav/install
-       $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/
-       $(INSTALL_BIN) \
-               ./files/controller/clamav-controller.lua \
-               $(1)/usr/lib/lua/luci/controller/clamav.lua
-
-       $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/
-       $(INSTALL_BIN) \
-               ./files/model/cbi/clamav-cbi.lua \
-               $(1)/usr/lib/lua/luci/model/cbi/clamav.lua
-endef
-
-$(eval $(call BuildPackage,luci-app-clamav))
diff --git a/net/luci-app-clamav/files/controller/clamav-controller.lua b/net/luci-app-clamav/files/controller/clamav-controller.lua
deleted file mode 100644 (file)
index 02f3bfc..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---[[
-
-LuCI ClamAV module
-
-Copyright (C) 2015, Itus Networks, Inc.
-
-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
-
-Author: Marko Ratkaj <marko.ratkaj@sartura.hr>
-       Luka Perkov <luka.perkov@sartura.hr>
-
-]]--
-
-module("luci.controller.clamav", package.seeall)
-
-function index()
-       entry({"admin", "services", "clamav"}, cbi("clamav"), _("ClamAV"))
-end
diff --git a/net/luci-app-clamav/files/model/cbi/clamav-cbi.lua b/net/luci-app-clamav/files/model/cbi/clamav-cbi.lua
deleted file mode 100644 (file)
index ff98139..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
---[[
-
-LuCI ClamAV module
-
-Copyright (C) 2015, Itus Networks, Inc.
-
-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
-
-Author: Marko Ratkaj <marko.ratkaj@sartura.hr>
-       Luka Perkov <luka.perkov@sartura.hr>
-
-]]--
-
-local fs = require "nixio.fs"
-local sys = require "luci.sys"
-require "ubus"
-
-m = Map("clamav", translate("ClamAV"))
-m.on_after_commit = function() luci.sys.call("/etc/init.d/clamav restart") end
-
-s = m:section(TypedSection, "clamav")
-s.anonymous = true
-s.addremove = false
-
-s:tab("tab_advanced", translate("Settings"))
-s:tab("tab_logs", translate("Log"))
-
---------------- Settings --------------
-
-LogFileMaxSize = s:taboption("tab_advanced", Value, "LogFileMaxSize", translate("Max size of log file"))
-LogFileMaxSize:value("512K",  translate("512K"))
-LogFileMaxSize:value("1M",  translate("1M"))
-LogFileMaxSize:value("2M",  translate("2M"))
-LogFileMaxSize.default = "1M"
-
-LogTime = s:taboption("tab_advanced", ListValue, "LogTime", translate("Log time with each message"))
-LogTime:value("no",  translate("No"))
-LogTime:value("yes",  translate("Yes"))
-LogTime.default = "no"
-
-LogVerbose = s:taboption("tab_advanced", ListValue, "LogVerbose", translate("Enable verbose logging"))
-LogVerbose:value("no",  translate("No"))
-LogVerbose:value("yes",  translate("Yes"))
-LogVerbose.default = "no"
-
-ExtendedDetectionInfo = s:taboption("tab_advanced", ListValue, "ExtendedDetectionInfo", translate("Log additional infection info"))
-ExtendedDetectionInfo:value("no",  translate("No"))
-ExtendedDetectionInfo:value("yes",  translate("Yes"))
-ExtendedDetectionInfo.default = "no"
-
-dummy3 = s:taboption("tab_advanced", DummyValue, "")
-dummy4 = s:taboption("tab_advanced", DummyValue, "")
-
-MaxDirectoryRecursion = s:taboption("tab_advanced", Value, "MaxDirectoryRecursion", translate("Max directory scan depth"))
-MaxDirectoryRecursion:value("15",  translate("15"))
-MaxDirectoryRecursion:value("20",  translate("20"))
-MaxDirectoryRecursion.default = "15"
-
-FollowDirectorySymlink = s:taboption("tab_advanced", ListValue, "FollowDirectorySymlink", translate("Follow directory symlinks"))
-FollowDirectorySymlink:value("no",  translate("No"))
-FollowDirectorySymlink:value("yes",  translate("Yes"))
-FollowDirectorySymlink.default = "no"
-
-FollowFileSymlinks = s:taboption("tab_advanced", ListValue, "FollowFileSymlinks", translate("Follow file symlinks"))
-FollowFileSymlinks:value("no",  translate("No"))
-FollowFileSymlinks:value("yes",  translate("Yes"))
-FollowFileSymlinks.default = "no"
-
-DetectPUA = s:taboption("tab_advanced", ListValue, "DetectPUA", translate("Detect possibly unwanted apps"))
-DetectPUA:value("no",  translate("No"))
-DetectPUA:value("yes",  translate("Yes"))
-DetectPUA.default = "no"
-
-ScanPE = s:taboption("tab_advanced", ListValue, "ScanPE", translate("Scan portable executables"))
-ScanPE:value("no",  translate("No"))
-ScanPE:value("yes",  translate("Yes"))
-ScanPE.default = "yes"
-
-ScanELF = s:taboption("tab_advanced", ListValue, "ScanELF", translate("Scan ELF files"))
-ScanELF:value("no",  translate("No"))
-ScanELF:value("yes",  translate("Yes"))
-ScanELF.default = "yes"
-
-DetectBrokenExecutables = s:taboption("tab_advanced", ListValue, "DetectBrokenExecutables", translate("Detect broken executables"))
-DetectBrokenExecutables:value("no",  translate("No"))
-DetectBrokenExecutables:value("yes",  translate("Yes"))
-DetectBrokenExecutables.default = "no"
-
-ScanOLE2 = s:taboption("tab_advanced", ListValue, "ScanOLE2", translate("Scan MS Office and .msi files"))
-ScanOLE2:value("no",  translate("No"))
-ScanOLE2:value("yes",  translate("Yes"))
-ScanOLE2.default = "yes"
-
-ScanPDF = s:taboption("tab_advanced", ListValue, "ScanPDF", translate("Scan pdf files"))
-ScanPDF:value("no",  translate("No"))
-ScanPDF:value("yes",  translate("Yes"))
-ScanPDF.default = "yes"
-
-ScanSWF = s:taboption("tab_advanced", ListValue, "ScanSWF", translate("Scan swf files"))
-ScanSWF:value("no",  translate("No"))
-ScanSWF:value("yes",  translate("Yes"))
-ScanSWF.default = "yes"
-
-ScanMail = s:taboption("tab_advanced", ListValue, "ScanMail", translate("Scan emails"))
-ScanMail:value("no",  translate("No"))
-ScanMail:value("yes",  translate("Yes"))
-ScanMail.default = "yes"
-
-ScanPartialMessages = s:taboption("tab_advanced", ListValue, "ScanPartialMessages", translate("Scan RFC1341 messages split over many emails"))
-ScanPartialMessages:value("no",  translate("No"))
-ScanPartialMessages:value("yes",  translate("Yes"))
-ScanPartialMessages.default = "no"
-
-ScanArchive = s:taboption("tab_advanced", ListValue, "ScanArchive", translate("Scan archives"))
-ScanArchive:value("no",  translate("No"))
-ScanArchive:value("yes",  translate("Yes"))
-ScanArchive.default = "yes"
-
-ArchiveBlockEncrypted = s:taboption("tab_advanced", ListValue, "ArchiveBlockEncrypted", translate("Block encrypted archives"))
-ArchiveBlockEncrypted:value("no",  translate("No"))
-ArchiveBlockEncrypted:value("yes",  translate("Yes"))
-ArchiveBlockEncrypted.default = "no"
-
-dummy5 = s:taboption("tab_advanced", DummyValue, "")
-dummy6 = s:taboption("tab_advanced", DummyValue, "")
-
-StreamMinPort = s:taboption("tab_advanced", Value, "StreamMinPort", translate("Port range, lowest port"))
-StreamMinPort.datatype = "portrange"
-StreamMinPort:value("1024",translate("1024"))
-StreamMinPort.default = "1024"
-
-StreamMaxPort = s:taboption("tab_advanced", Value, "StreamMaxPort", translate("Port range, highest port"))
-StreamMaxPort.datatype = "portrange"
-StreamMaxPort:value("2048",translate("2048"))
-StreamMaxPort.default = "2048"
-
-MaxThreads = s:taboption("tab_advanced", Value, "MaxThreads", translate("Max number of threads"))
-MaxThreads.datatype = "and(uinteger,min(1))"
-MaxThreads:value("10",translate("10"))
-MaxThreads:value("20",translate("20"))
-MaxThreads.default = "10"
-
-SelfCheck = s:taboption("tab_advanced", Value, "SelfCheck", translate("Database check every N sec"))
-SelfCheck.datatype = "and(uinteger,min(1))"
-SelfCheck:value("600",translate("600"))
-SelfCheck.default = "600"
-
-MaxFileSize = s:taboption("tab_advanced", Value, "MaxFileSize", translate("Max size of scanned file"))
-MaxFileSize.datatype = "string"
-MaxFileSize:value("150M",translate("150M"))
-MaxFileSize:value("50M",translate("50M"))
-MaxFileSize.default = "150M"
-
------------------- Log --------------------
-
-clamav_logfile = s:taboption("tab_logs", TextValue, "lines", "")
-clamav_logfile.wrap = "off"
-clamav_logfile.rows = 25
-clamav_logfile.rmempty = true
-
-function clamav_logfile.cfgvalue()
-       local uci = require "luci.model.uci".cursor_state()
-       local file = "/tmp/clamd.log"
-       if file then
-               return fs.readfile(file) or ""
-       else
-               return ""
-       end
-end
-
-function clamav_logfile.write()
-end
-
-return m
diff --git a/net/luci-app-e2guardian/Makefile b/net/luci-app-e2guardian/Makefile
deleted file mode 100644 (file)
index 880f373..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-e2guardian
-PKG_RELEASE:=20150520
-
-PKG_LICENSE:=Apache-2.0
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-e2guardian
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:=E2Guardian Web UI
-  DEPENDS:=+luci-mod-admin-full +e2guardian
-  MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
-endef
-
-define Package/luci-app-e2guardian/description
- This package will install E2Guardian Web UI.
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-e2guardian/install
-       $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/
-       $(INSTALL_BIN) \
-               ./files/e2guardian-controller.lua \
-               $(1)/usr/lib/lua/luci/controller/e2guardian.lua
-
-       $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/
-       $(INSTALL_BIN) \
-               ./files//e2guardian-cbi.lua \
-               $(1)/usr/lib/lua/luci/model/cbi/e2guardian.lua
-endef
-
-$(eval $(call BuildPackage,luci-app-e2guardian))
diff --git a/net/luci-app-e2guardian/files/e2guardian-cbi.lua b/net/luci-app-e2guardian/files/e2guardian-cbi.lua
deleted file mode 100644 (file)
index b621321..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
---[[
-
-LuCI E2Guardian module
-
-Copyright (C) 2015, Itus Networks, Inc.
-
-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
-
-Author: Marko Ratkaj <marko.ratkaj@sartura.hr>
-       Luka Perkov <luka.perkov@sartura.hr>
-
-]]--
-
-local fs = require "nixio.fs"
-local sys = require "luci.sys"
-
-m = Map("e2guardian", translate("E2Guardian"))
-m.on_after_commit = function() luci.sys.call("/etc/init.d/e2guardian restart") end
-
-s = m:section(TypedSection, "e2guardian")
-s.anonymous = true
-s.addremove = false
-
-s:tab("tab_general", translate("General Settings"))
-s:tab("tab_additional", translate("Additional Settings"))
-s:tab("tab_logs", translate("Logs"))
-
-
------------------ General Settings Tab -----------------------
-
-filterip = s:taboption("tab_general", Value, "filterip", translate("IP that E2Guardian listens"))
-filterip.datatype = "ip4addr"
-
-filterports = s:taboption("tab_general", Value, "filterports", translate("Port that E2Guardian listens"))
-filterports.datatype = "portrange"
-filterports.placeholder = "0-65535"
-
-proxyip = s:taboption("tab_general", Value, "proxyip", translate("IP address of the proxy"))
-proxyip.datatype = "ip4addr"
-proxyip.default = "127.0.0.1"
-
-proxyport = s:taboption("tab_general", Value, "proxyport", translate("Port of the proxy"))
-proxyport.datatype = "portrange"
-proxyport.placeholder = "0-65535"
-
-languagedir = s:taboption("tab_general", Value, "languagedir", translate("Language dir"))
-languagedir.datatype = "string"
-languagedir.default = "/usr/share/e2guardian/languages"
-
-language = s:taboption("tab_general", Value, "language", translate("Language to use"))
-language.datatype = "string"
-language.default = "ukenglish"
-
-loglevel = s:taboption("tab_general", ListValue, "loglevel", translate("Logging Settings"))
-loglevel:value("0",  translate("none"))
-loglevel:value("1",  translate("just denied"))
-loglevel:value("2",  translate("all text based"))
-loglevel:value("3",  translate("all requests"))
-loglevel.default = "2"
-
-logexceptionhits = s:taboption("tab_general", ListValue, "logexceptionhits", translate("Log Exception Hits"))
-logexceptionhits:value("0",  translate("never"))
-logexceptionhits:value("1",  translate("log, but don't mark as exceptions"))
-logexceptionhits:value("2",  translate("log and mark"))
-logexceptionhits.default = "2"
-
-logfileformat = s:taboption("tab_general", ListValue, "logfileformat", translate("Log File Format"))
-logfileformat:value("1",  translate("DansgGuardian format, space delimited"))
-logfileformat:value("2",  translate("CSV-style format"))
-logfileformat:value("3",  translate("Squid Log File Format"))
-logfileformat:value("4",  translate("Tab delimited"))
-logfileformat:value("5",  translate("Protex format"))
-logfileformat:value("6",  translate("Protex format with server field blanked"))
-logfileformat.default = "1"
-
-accessdeniedaddress = s:taboption("tab_general", Value, "accessdeniedaddress", translate("Access denied address"),
-translate("Server to which the cgi e2guardian reporting script was copied. Reporting levels 1 and 2 only"))
-accessdeniedaddress.datatype = "string"
-accessdeniedaddress.default = "http://YOURSERVER.YOURDOMAIN/cgi-bin/e2guardian.pl"
-
-usecustombannedimage = s:taboption("tab_general", ListValue, "usecustombannedimage", translate("Banned image replacement"))
-usecustombannedimage:value("on",  translate("Yes"))
-usecustombannedimage:value("off",  translate("No"))
-usecustombannedimage.default = "on"
-
-custombannedimagefile = s:taboption("tab_general", Value, "custombannedimagefile", translate("Custom banned image file"))
-custombannedimagefile.datatype = "string"
-custombannedimagefile.default = "/usr/share/e2guardian/transparent1x1.gif"
-
-usecustombannedflash = s:taboption("tab_general", ListValue, "usecustombannedflash", translate("Banned flash replacement"))
-usecustombannedflash:value("on",  translate("Yes"))
-usecustombannedflash:value("off",  translate("No"))
-usecustombannedflash.default = "on"
-
-custombannedflashfile = s:taboption("tab_general", Value, "custombannedflashfile", translate("Custom banned flash file"))
-custombannedflashfile.datatype = "string"
-custombannedflashfile.default = "/usr/share/e2guardian/blockedflash.swf"
-
-filtergroups = s:taboption("tab_general", Value, "filtergroups", translate("Number of filter groups"))
-filtergroups.datatype = "and(uinteger,min(1))"
-filtergroups.default = "1"
-
-filtergroupslist = s:taboption("tab_general", Value, "filtergroupslist", translate("List of filter groups"))
-filtergroupslist.datatype = "string"
-filtergroupslist.default = "/etc/e2guardian/lists/filtergroupslist"
-
-bannediplist = s:taboption("tab_general", Value, "bannediplist", translate("List of banned IPs"))
-bannediplist.datatype = "string"
-bannediplist.default = "/etc/e2guardian/lists/bannediplist"
-
-exceptioniplist = s:taboption("tab_general", Value, "exceptioniplist", translate("List of IP exceptions"))
-exceptioniplist.datatype = "string"
-exceptioniplist.default = "/etc/e2guardian/lists/exceptioniplist"
-
-perroomblockingdirectory = s:taboption("tab_general", Value, "perroomblockingdirectory", translate("Per-Room blocking definition directory"))
-perroomblockingdirectory.datatype = "string"
-perroomblockingdirectory.default = "/etc/e2guardian/lists/bannedrooms/"
-
-showweightedfound = s:taboption("tab_general", ListValue, "showweightedfound", translate("Show weighted phrases found"))
-showweightedfound:value("on",  translate("Yes"))
-showweightedfound:value("off",  translate("No"))
-showweightedfound.default = "on"
-
-weightedphrasemode = s:taboption("tab_general", ListValue, "weightedphrasemode", translate("Weighted phrase mode"))
-weightedphrasemode:value("0",  translate("off"))
-weightedphrasemode:value("1",  translate("on, normal operation"))
-weightedphrasemode:value("2",  translate("on, phrase found only counts once on a page"))
-weightedphrasemode.default = "2"
-
-urlcachenumber = s:taboption("tab_general", Value, "urlcachenumber", translate("Clean result caching for URLs"))
-urlcachenumber.datatype = "and(uinteger,min(0))"
-urlcachenumber.default = "1000"
-
-urlcacheage = s:taboption("tab_general", Value, "urlcacheage", translate("Age before they should be ignored in seconds"))
-urlcacheage.datatype = "and(uinteger,min(0))"
-urlcacheage.default = "900"
-
-scancleancache = s:taboption("tab_general", ListValue, "scancleancache", translate("Cache for content (AV) scans as 'clean'"))
-scancleancache:value("on",  translate("Yes"))
-scancleancache:value("off",  translate("No"))
-scancleancache.default = "on"
-
-phrasefiltermode = s:taboption("tab_general", ListValue, "phrasefiltermode", translate("Filtering options"))
-phrasefiltermode:value("0",  translate("raw"))
-phrasefiltermode:value("1",  translate("smart"))
-phrasefiltermode:value("2",  translate("both raw and smart"))
-phrasefiltermode:value("3",  translate("meta/title"))
-phrasefiltermode.default = "2"
-
-preservecase = s:taboption("tab_general", ListValue, "perservecase", translate("Lower caseing options"))
-preservecase:value("0",  translate("force lower case"))
-preservecase:value("1",  translate("don't change"))
-preservecase:value("2",  translate("scan fist in lower, then in original"))
-preservecase.default = "0"
-
-hexdecodecontent = s:taboption("tab_general", ListValue, "hexdecodecontent", translate("Hex decoding options"))
-hexdecodecontent:value("on",  translate("Yes"))
-hexdecodecontent:value("off",  translate("No"))
-hexdecodecontent.default = "off"
-
-forcequicksearch = s:taboption("tab_general", ListValue, "forcequicksearch", translate("Quick search"))
-forcequicksearch:value("on",  translate("Yes"))
-forcequicksearch:value("off",  translate("No"))
-forcequicksearch.default = "off"
-
-reverseaddresslookups= s:taboption("tab_general", ListValue, "reverseaddresslookups", translate("Reverse lookups for banned site and URLs"))
-reverseaddresslookups:value("on",  translate("Yes"))
-reverseaddresslookups:value("off",  translate("No"))
-reverseaddresslookups.default = "off"
-
-reverseclientiplookups = s:taboption("tab_general", ListValue, "reverseclientiplookups", translate("Reverse lookups for banned and exception IP lists"))
-reverseclientiplookups:value("on",  translate("Yes"))
-reverseclientiplookups:value("off",  translate("No"))
-reverseclientiplookups.default = "off"
-
-logclienthostnames = s:taboption("tab_general", ListValue, "logclienthostnames", translate("Perform reverse lookups on client IPs for successful requests"))
-logclienthostnames:value("on",  translate("Yes"))
-logclienthostnames:value("off",  translate("No"))
-logclienthostnames.default = "off"
-
-createlistcachefiles = s:taboption("tab_general", ListValue, "createlistcachefiles", translate("Build bannedsitelist and bannedurllist cache files"))
-createlistcachefiles:value("on",translate("Yes"))
-createlistcachefiles:value("off",translate("No"))
-createlistcachefiles.default = "on"
-
-prefercachedlists = s:taboption("tab_general", ListValue, "prefercachedlists", translate("Prefer cached list files"))
-prefercachedlists:value("on",  translate("Yes"))
-prefercachedlists:value("off",  translate("No"))
-prefercachedlists.default = "off"
-
-maxuploadsize = s:taboption("tab_general", Value, "maxuploadsize", translate("Max upload size (in Kbytes)"))
-maxuploadsize:value("-1",  translate("no blocking"))
-maxuploadsize:value("0",  translate("complete block"))
-maxuploadsize.default = "-1"
-
-maxcontentfiltersize = s:taboption("tab_general", Value, "maxcontentfiltersize", translate("Max content filter size"),
-translate("The value must not be higher than max content ram cache scan size or 0 to match it"))
-maxcontentfiltersize.datatype = "and(uinteger,min(0))"
-maxcontentfiltersize.default = "256"
-
-maxcontentramcachescansize = s:taboption("tab_general", Value, "maxcontentramcachescansize", translate("Max content ram cache scan size"),
-translate("This is the max size of file that DG will download and cache in RAM"))
-maxcontentramcachescansize.datatype = "and(uinteger,min(0))"
-maxcontentramcachescansize.default = "2000"
-
-maxcontentfilecachescansize = s:taboption("tab_general", Value, "maxcontentfilecachescansize", translate("Max content file cache scan size"))
-maxcontentfilecachescansize.datatype = "and(uinteger,min(0))"
-maxcontentfilecachescansize.default = "20000"
-
-proxytimeout = s:taboption("tab_general", Value, "proxytimeout", translate("Proxy timeout (5-100)"))
-proxytimeout.datatype = "range(5,100)"
-proxytimeout.default = "20"
-
-proxyexchange = s:taboption("tab_general", Value, "proxyexchange", translate("Proxy header excahnge (20-300)"))
-proxyexchange.datatype = "range(20,300)"
-proxyexchange.default = "20"
-
-pcontimeout = s:taboption("tab_general", Value, "pcontimeout", translate("Pconn timeout"),
-translate("How long a persistent connection will wait for other requests"))
-pcontimeout.datatype = "range(5,300)"
-pcontimeout.default = "55"
-
-filecachedir = s:taboption("tab_general", Value, "filecachedir", translate("File cache directory"))
-filecachedir.datatype = "string"
-filecachedir.default = "/tmp"
-
-deletedownloadedtempfiles = s:taboption("tab_general", ListValue, "deletedownloadedtempfiles", translate("Delete file cache after user completes download"))
-deletedownloadedtempfiles:value("on",  translate("Yes"))
-deletedownloadedtempfiles:value("off", translate("No"))
-deletedownloadedtempfiles.default = "on"
-
-initialtrickledelay = s:taboption("tab_general", Value, "initialtrickledelay", translate("Initial Trickle delay"),
-translate("Number of seconds a browser connection is left waiting before first being sent *something* to keep it alive"))
-initialtrickledelay.datatype = "and(uinteger,min(0))"
-initialtrickledelay.default = "20"
-
-trickledelay = s:taboption("tab_general", Value, "trickledelay", translate("Trickle delay"),
-translate("Number of seconds a browser connection is left waiting before being sent more *something* to keep it alive"))
-trickledelay.datatype = "and(uinteger,min(0))"
-trickledelay.default = "10"
-
-downloadmanager = s:taboption("tab_general", Value, "downloadmanager", translate("Download manager"))
-downloadmanager.datatype = "string"
-downloadmanager.default = "/etc/e2guardian/downloadmanagers/default.conf"
-
-contentscannertimeout = s:taboption("tab_general", Value, "contentscannertimeout", translate("Content scanner timeout"))
-contentscannertimeout.datatype = "and(uinteger,min(0))"
-contentscannertimeout.default = "60"
-
-contentscanexceptions = s:taboption("tab_general", ListValue, "contentscanexceptions", translate("Content scan exceptions"))
-contentscanexceptions:value("on",  translate("Yes"))
-contentscanexceptions:value("off", translate("No"))
-contentscanexceptions.default = "off"
-
-recheckreplacedurls = s:taboption("tab_general", ListValue, "recheckreplacedurls", translate("e-check replaced URLs"))
-recheckreplacedurls:value("on",  translate("Yes"))
-recheckreplacedurls:value("off", translate("No"))
-recheckreplacedurls.default = "off"
-
-forwardedfor = s:taboption("tab_general", ListValue, "forwardedfor", translate("Misc setting: forwardedfor"),
-translate("If on, it may help solve some problem sites that need to know the source ip."))
-forwardedfor:value("on",  translate("Yes"))
-forwardedfor:value("off", translate("No"))
-forwardedfor.default = "off"
-
-usexforwardedfor = s:taboption("tab_general", ListValue, "usexforwardedfor", translate("Misc setting: usexforwardedfor"),
-translate("This is for when you have squid between the clients and E2Guardian"))
-usexforwardedfor:value("on",  translate("Yes"))
-usexforwardedfor:value("off", translate("No"))
-usexforwardedfor.default = "off"
-
-logconnectionhandlingerrors = s:taboption("tab_general", ListValue, "logconnectionhandlingerrors", translate("Log debug info about log()ing and accept()ing"))
-logconnectionhandlingerrors:value("on",  translate("Yes"))
-logconnectionhandlingerrors:value("off", translate("No"))
-logconnectionhandlingerrors.default = "on"
-
-logchildprocesshandling = s:taboption("tab_general", ListValue, "logchildprocesshandling", translate("Log child process handling"))
-logchildprocesshandling:value("on",  translate("Yes"))
-logchildprocesshandling:value("off", translate("No"))
-logchildprocesshandling.default = "off"
-
-maxchildren = s:taboption("tab_general", Value, "maxchildren", translate("Max number of processes to spawn"))
-maxchildren.datatype = "and(uinteger,min(0))"
-maxchildren.default = "180"
-
-minchildren = s:taboption("tab_general", Value, "minchildren", translate("Min number of processes to spawn"))
-minchildren.datatype = "and(uinteger,min(0))"
-minchildren.default = "20"
-
-minsparechildren = s:taboption("tab_general", Value, "minsparechildren", translate("Min number of processes to keep ready"))
-minsparechildren.datatype = "and(uinteger,min(0))"
-minsparechildren.default = "16"
-
-preforkchildren = s:taboption("tab_general", Value, "preforkchildren", translate("Sets minimum nuber of processes when it runs out"))
-preforkchildren.datatype = "and(uinteger,min(0))"
-preforkchildren.default = "10"
-
-maxsparechildren = s:taboption("tab_general", Value, "maxsparechildren", translate("Sets the maximum number of processes to have doing nothing"))
-maxsparechildren.datatype = "and(uinteger,min(0))"
-maxsparechildren.default = "32"
-
-maxagechildren = s:taboption("tab_general", Value, "maxagechildren", translate("Max age of child process"))
-maxagechildren.datatype = "and(uinteger,min(0))"
-maxagechildren.default = "500"
-
-maxips = s:taboption("tab_general", Value, "maxips", translate("Max number of clinets allowed to connect"))
-maxips:value("0",  translate("no limit"))
-maxips.default = "0"
-
-ipipcfilename = s:taboption("tab_general", Value, "ipipcfilename", translate("IP list IPC server directory and filename"))
-ipipcfilename.datatype = "string"
-ipipcfilename.default = "/tmp/.dguardianipc"
-
-urlipcfilename = s:taboption("tab_general", Value, "urlipcfilename", translate("Defines URL list IPC server directory and filename used to communicate with the URL cache process"))
-urlipcfilename.datatype = "string"
-urlipcfilename.default = "/tmp/.dguardianurlipc"
-
-ipcfilename = s:taboption("tab_general", Value, "ipcfilename", translate("Defines URL list IPC server directory and filename used to communicate with the URL cache process"))
-ipcfilename.datatype = "string"
-ipcfilename.default = "/tmp/.dguardianipipc"
-
-nodeamon = s:taboption("tab_general", ListValue, "nodeamon", translate("Disable deamoning"))
-nodeamon:value("on",  translate("Yes"))
-nodeamon:value("off", translate("No"))
-nodeamon.default = "off"
-
-nologger = s:taboption("tab_general", ListValue, "nologger", translate("Disable logger"))
-nologger:value("on",  translate("Yes"))
-nologger:value("off", translate("No"))
-nologger.default = "off"
-
-logadblock = s:taboption("tab_general", ListValue, "logadblock", translate("Enable logging of ADs"))
-logadblock:value("on",  translate("Yes"))
-logadblock:value("off", translate("No"))
-logadblock.default = "off"
-
-loguseragent = s:taboption("tab_general", ListValue, "loguseragent", translate("Enable logging of client user agent"))
-loguseragent:value("on",  translate("Yes"))
-loguseragent:value("off", translate("No"))
-loguseragent.default = "off"
-
-softrestart = s:taboption("tab_general", ListValue, "softrestart", translate("Enable soft restart"))
-softrestart:value("on",  translate("Yes"))
-softrestart:value("off", translate("No"))
-softrestart.default = "off"
-
-
------------------------- Additional Settings Tab ----------------------------
-
-e2guardian_config_file = s:taboption("tab_additional", TextValue, "_data", "")
-e2guardian_config_file.wrap = "off"
-e2guardian_config_file.rows = 25
-e2guardian_config_file.rmempty = false
-
-function e2guardian_config_file.cfgvalue()
-       local uci = require "luci.model.uci".cursor_state()
-       file = "/etc/e2guardian/e2guardianf1.conf"
-       if file then
-               return fs.readfile(file) or ""
-       else
-               return ""
-       end
-end
-
-function e2guardian_config_file.write(self, section, value)
-       if value then
-               local uci = require "luci.model.uci".cursor_state()
-               file = "/etc/e2guardian/e2guardianf1.conf"
-               fs.writefile(file, value:gsub("\r\n", "\n"))
-       end
-end
-
-
----------------------------- Logs Tab -----------------------------
-
-e2guardian_logfile = s:taboption("tab_logs", TextValue, "lines", "")
-e2guardian_logfile.wrap = "off"
-e2guardian_logfile.rows = 25
-e2guardian_logfile.rmempty = true
-
-function e2guardian_logfile.cfgvalue()
-       local uci = require "luci.model.uci".cursor_state()
-       file = "/tmp/e2guardian/access.log"
-       if file then
-               return fs.readfile(file) or ""
-       else
-               return "Can't read log file"
-       end
-end
-
-function e2guardian_logfile.write()
-        return ""
-end
-
-return m
diff --git a/net/luci-app-e2guardian/files/e2guardian-controller.lua b/net/luci-app-e2guardian/files/e2guardian-controller.lua
deleted file mode 100644 (file)
index dd545f5..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---[[
-
-LuCI E2Guardian module
-
-Copyright (C) 2015, Itus Networks, Inc.
-
-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
-
-Author: Marko Ratkaj <marko.ratkaj@sartura.hr>
-       Luka Perkov <luka.perkov@sartura.hr>
-
-]]--
-
-module("luci.controller.e2guardian", package.seeall)
-
-function index()
-       entry({"admin", "services", "e2guardian"}, cbi("e2guardian"), _("E2Guardian"))
-end
diff --git a/net/luci-app-squid/Makefile b/net/luci-app-squid/Makefile
deleted file mode 100644 (file)
index 91ce724..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luci-app-squid
-PKG_RELEASE:=20150608
-
-PKG_LICENSE:=Apache-2.0
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-squid
-  SECTION:=luci
-  CATEGORY:=LuCI
-  SUBMENU:=3. Applications
-  TITLE:=Squid Web UI
-  DEPENDS:=+luci-mod-admin-full +squid
-  MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
-endef
-
-define Package/luci-app-squid/description
- This package will install Squid Web UI.
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-squid/install
-       $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/
-       $(INSTALL_BIN) \
-               ./files/squid-controller.lua \
-               $(1)/usr/lib/lua/luci/controller/squid.lua
-
-       $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/
-       $(INSTALL_BIN) \
-               ./files//squid-cbi.lua \
-               $(1)/usr/lib/lua/luci/model/cbi/squid.lua
-endef
-
-$(eval $(call BuildPackage,luci-app-squid))
diff --git a/net/luci-app-squid/files/squid-cbi.lua b/net/luci-app-squid/files/squid-cbi.lua
deleted file mode 100644 (file)
index 0ac554a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
---[[
-
-LuCI Squid module
-
-Copyright (C) 2015, OpenWrt.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
-
-Author: Marko Ratkaj <marko.ratkaj@sartura.hr>
-
-]]--
-
-local fs = require "nixio.fs"
-local sys = require "luci.sys"
-require "ubus"
-
-m = Map("squid", translate("Squid"))
-m.on_after_commit = function() luci.sys.call("/etc/init.d/squid restart") end
-
-s = m:section(TypedSection, "squid")
-s.anonymous = true
-s.addremove = false
-
-s:tab("general", translate("General Settings"))
-
-http_port = s:taboption("general", Value, "http_port", translate("Port"))
-http_port.datatype = "portrange"
-http_port.placeholder = "0-65535"
-
-visible_hostname = s:taboption("general", Value, "visible_hostname", translate("Visible Hostname"))
-visible_hostname.datatype="string"
-visible_hostname.placeholder = "OpenWrt"
-
-coredump_dir = s:taboption("general", Value, "coredump_dir", translate("Coredump files directory"))
-coredump_dir.datatype="string"
-coredump_dir.placeholder = "/tmp/squid"
-
-s:tab("advanced", translate("Advanced Settings"))
-
-squid_config_file = s:taboption("advanced", TextValue, "_data", "")
-squid_config_file.wrap = "off"
-squid_config_file.rows = 25
-squid_config_file.rmempty = false
-
-function squid_config_file.cfgvalue()
-       local uci = require "luci.model.uci".cursor_state()
-       local file = uci:get("squid", "squid", "config_file")
-       if file then
-               return fs.readfile(file) or ""
-       else
-               return ""
-       end
-end
-
-function squid_config_file.write(self, section, value)
-    if value then
-               local uci = require "luci.model.uci".cursor_state()
-               local file = uci:get("squid", "squid", "config_file")
-       fs.writefile(file, value:gsub("\r\n", "\n"))
-    end
-end
-
-return m
diff --git a/net/luci-app-squid/files/squid-controller.lua b/net/luci-app-squid/files/squid-controller.lua
deleted file mode 100644 (file)
index 09946a1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---[[
-
-LuCI Squid module
-
-Copyright (C) 2015, OpenWrt.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
-
-Author: Marko Ratkaj <marko.ratkaj@sartura.hr>
-
-]]--
-
-module("luci.controller.squid", package.seeall)
-
-function index()
-       entry({"admin", "services", "squid"}, cbi("squid"), _("Squid"))
-end