From b45090398fec02835d5ada9255f4b5dd97865c42 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 5 May 2015 15:13:18 -0300 Subject: Fixup template installation broken on my last changes. Bump version to 2.40 --- config/lightsquid/lightsquid.inc | 14 ++++++-- config/lightsquid/lightsquid.xml | 78 ++++++++++++++++++++-------------------- 2 files changed, 51 insertions(+), 41 deletions(-) (limited to 'config/lightsquid') diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc index 503e9cf3..60ec1fc9 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', '/usr/local/www/lightsquid/tpl'); +define('LS_TEMPLATEPATH', LS_WWWPATH . '/tpl'); define('LS_LANGPATH', LIGHTSQUID_BASE . '/share/lightsquid/lang'); define('LS_REPORTPATH', '/var/lightsquid/report'); @@ -145,11 +145,21 @@ function lightsquid_install() { if (!is_dir('/usr/local/etc/lightsquid') && is_dir(LS_CONFIGPATH)) { symlink(LS_CONFIGPATH, '/usr/local/etc/lightsquid'); } - if (!is_dir('/usr/local/www/lightsquid') && is_dir(LS_WWWPATH)) { + + if (is_dir('/usr/local/www/lightsquid')) + $_gc = exec('rm -rf /usr/local/www/lightsquid'); + + if (is_dir(LS_WWWPATH)) { symlink(LS_WWWPATH, '/usr/local/www/lightsquid'); } } + foreach (array('novopf', 'novosea') as $tpl) { + if (file_exists(LS_TEMPLATEPATH . '/' . $tpl)) + $_gc = exec('rm -rf ' . LS_TEMPLATEPATH . '/' . $tpl); + symlink('/usr/local/share/lightsquid/tpl/' . $tpl, LS_TEMPLATEPATH . '/' . $tpl); + } + update_log("lightsquid_install: stopped"); } diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml index 19ba4512..4f60997c 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 - 2.39 + 2.40 Services: Proxy Reports (LightSquid, SQStat) -> Settings Status /usr/local/pkg/lightsquid.inc @@ -97,192 +97,192 @@ https://packages.pfsense.org/packages/config/lightsquid/zhabascript.js - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/bigfiles.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/day_detail.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/graph.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/group_detail.html - /usr/local/www/lightsquid/tpl/novopf/images/ + /usr/local/share/lightsquid/tpl/novopf/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/datetime.png - /usr/local/www/lightsquid/tpl/novopf/images/ + /usr/local/share/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/ + /usr/local/share/lightsquid/tpl/novopf/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/graph.png - /usr/local/www/lightsquid/tpl/novopf/images/ + /usr/local/share/lightsquid/tpl/novopf/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/groups.png - /usr/local/www/lightsquid/tpl/novopf/images/ + /usr/local/share/lightsquid/tpl/novopf/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/printer.png - /usr/local/www/lightsquid/tpl/novopf/images/ + /usr/local/share/lightsquid/tpl/novopf/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/users.png - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/index.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/month_detail.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/print.css - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/screen.css - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/topsites.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_detail.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_month.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_time.html - /usr/local/www/lightsquid/tpl/novopf/ + /usr/local/share/lightsquid/tpl/novopf/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/whousesite.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/bigfiles.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/day_detail.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/graph.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/group_detail.html - /usr/local/www/lightsquid/tpl/novosea/images/ + /usr/local/share/lightsquid/tpl/novosea/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/datetime.png - /usr/local/www/lightsquid/tpl/novosea/images/ + /usr/local/share/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/ + /usr/local/share/lightsquid/tpl/novosea/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/graph.png - /usr/local/www/lightsquid/tpl/novosea/images/ + /usr/local/share/lightsquid/tpl/novosea/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/groups.png - /usr/local/www/lightsquid/tpl/novosea/images/ + /usr/local/share/lightsquid/tpl/novosea/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/printer.png - /usr/local/www/lightsquid/tpl/novosea/images/ + /usr/local/share/lightsquid/tpl/novosea/images/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/users.png - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/index.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/month_detail.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/print.css - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/screen.css - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/topsites.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_detail.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_month.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_time.html - /usr/local/www/lightsquid/tpl/novosea/ + /usr/local/share/lightsquid/tpl/novosea/ 0444 https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/whousesite.html -- cgit v1.2.3