From 859a5ba4e341d4ed7c7051b0ce5fce92be212e02 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 27 Apr 2015 12:59:17 -0300 Subject: Stop downloading templates tarball and add each file as additional_files_needed --- config/lightsquid/lightsquid.inc | 9 +- config/lightsquid/lightsquid.xml | 202 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 197 insertions(+), 14 deletions(-) (limited to 'config') diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc index 9e51913f..c505b401 100644 --- a/config/lightsquid/lightsquid.inc +++ b/config/lightsquid/lightsquid.inc @@ -63,7 +63,7 @@ define('LS_CONFIGPATH', LIGHTSQUID_BASE . '/etc/lightsquid'); define('LS_CONFIGFILE', 'lightsquid.cfg'); define('LS_CONFIGFILE_DIST', 'lightsquid.cfg.dist'); define('LS_WWWPATH', LIGHTSQUID_BASE . '/www/lightsquid'); -define('LS_TEMPLATEPATH', LIGHTSQUID_BASE . '/www/lightsquid/tpl'); +define('LS_TEMPLATEPATH', '/usr/local/www/lightsquid/tpl'); define('LS_LANGPATH', LIGHTSQUID_BASE . '/share/lightsquid/lang'); define('LS_REPORTPATH', '/var/lightsquid/report'); @@ -123,13 +123,6 @@ function lightsquid_install() { mwexec("/bin/mkdir -p " . LS_REPORTPATH); } - // install templates - $lstpl_file = "/var/tmp/lightsquid_tpl.tbz"; - if (file_exists($lstpl_file)) { - mwexec("/usr/bin/tar zxvf $lstpl_file -C " . LS_TEMPLATEPATH); - update_log("lightsquid_install: Install templates from $lstpl_file"); - } - # check perl $perl_path = '/usr/bin/perl'; diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml index 63eaabe4..03f2a982 100644 --- a/config/lightsquid/lightsquid.xml +++ b/config/lightsquid/lightsquid.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. lightsquid - 1.8.2 pkg v.2.35 + 2.37 Services: Proxy Reports (LightSquid, SQStat) -> Settings Status /usr/local/pkg/lightsquid.inc @@ -76,11 +76,6 @@ 0755 https://packages.pfsense.org/packages/config/lightsquid/lightsquid.inc - - /var/tmp/ - 0755 - https://files.pfsense.org/packages/All/lightsquid_tpl.tbz - /usr/local/www/sqstat/ 0644 @@ -101,6 +96,201 @@ 0644 https://packages.pfsense.org/packages/config/lightsquid/zhabascript.js + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/bigfiles.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/day_detail.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/graph.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/group_detail.html + + + /usr/local/www/lightsquid/tpl/novopf/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/datetime.png + + + /usr/local/www/lightsquid/tpl/novopf/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/flag_red.png + + + /usr/local/www/lightsquid/tpl/novopf/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/graph.png + + + /usr/local/www/lightsquid/tpl/novopf/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/groups.png + + + /usr/local/www/lightsquid/tpl/novopf/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/printer.png + + + /usr/local/www/lightsquid/tpl/novopf/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/users.png + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/index.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/month_detail.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/print.css + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/screen.css + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/topsites.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_detail.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_month.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_time.html + + + /usr/local/www/lightsquid/tpl/novopf + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/whousesite.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/bigfiles.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/day_detail.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/graph.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/group_detail.html + + + /usr/local/www/lightsquid/tpl/novosea/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/datetime.png + + + /usr/local/www/lightsquid/tpl/novosea/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/flag_red.png + + + /usr/local/www/lightsquid/tpl/novosea/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/graph.png + + + /usr/local/www/lightsquid/tpl/novosea/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/groups.png + + + /usr/local/www/lightsquid/tpl/novosea/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/printer.png + + + /usr/local/www/lightsquid/tpl/novosea/images + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/users.png + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/index.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/month_detail.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/print.css + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/screen.css + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/topsites.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_detail.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_month.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_time.html + + + /usr/local/www/lightsquid/tpl/novosea + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/whousesite.html + + + /usr/local/www/lightsquid/tpl + 0444 + https://packages.pfsense.org/packages/config/lightsquid/tpl/x + Language -- cgit v1.2.3