Stop downloading templates tarball and add each file as additional_files_needed

5 files changed, 200 insertions, 17 deletions

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 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>lightsquid</name>
-	<version>1.8.2 pkg v.2.35</version>
+	<version>2.37</version>
 	<title>Services: Proxy Reports (LightSquid, SQStat) -> Settings</title>
 	<category>Status</category>
 	<include_file>/usr/local/pkg/lightsquid.inc</include_file>
@@ -77,11 +77,6 @@
                <item>https://packages.pfsense.org/packages/config/lightsquid/lightsquid.inc</item>
         </additional_files_needed>
         <additional_files_needed>
-               <prefix>/var/tmp/</prefix>
-               <chmod>0755</chmod>
-               <item>https://files.pfsense.org/packages/All/lightsquid_tpl.tbz</item>
-        </additional_files_needed>
-        <additional_files_needed>
                <prefix>/usr/local/www/sqstat/</prefix>
                <chmod>0644</chmod>
                <item>https://packages.pfsense.org/packages/config/lightsquid/sqstat.class.php</item>
@@ -101,6 +96,201 @@
                <chmod>0644</chmod>
                <item>https://packages.pfsense.org/packages/config/lightsquid/zhabascript.js</item>
         </additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/bigfiles.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/day_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/graph.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/group_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/datetime.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/flag_red.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/graph.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/groups.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/printer.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/images/users.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/index.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/month_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/print.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/screen.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/topsites.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_month.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/user_time.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novopf</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novopf/whousesite.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/bigfiles.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/day_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/graph.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/group_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/datetime.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/flag_red.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/graph.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/groups.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/printer.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea/images</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/images/users.png</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/index.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/month_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/print.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/screen.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/topsites.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_detail.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_month.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/user_time.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl/novosea</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/novosea/whousesite.html</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/lightsquid/tpl</prefix>
+		<chmod>0444</chmod>
+		<item>https://packages.pfsense.org/packages/config/lightsquid/tpl/x</item>
+	</additional_files_needed>
         <fields>
                 <field>
                         <fielddescr>Language</fielddescr>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 661b1c42..67d3bf18 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -562,7 +562,7 @@
 		<descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr>
 		<website>http://lightsquid.sf.net/</website>
 		<category>Network Report</category>
-		<version>2.36</version>
+		<version>2.37</version>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<port_category>www</port_category>
 		<run_depends>libexec/lightsquid/ip2name.list:www/lightsquid</run_depends>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b8fb6dbb..84fcce78 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -665,7 +665,7 @@
 		<descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr>
 		<website>http://lightsquid.sf.net/</website>
 		<category>Network Report</category>
-		<version>1.8.2 pkg v.2.35</version>
+		<version>2.37</version>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>lightsquid-1.8_2.tbz</depends_on_package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 7e12d7d0..6515593b 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -652,7 +652,7 @@
 		<descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr>
 		<website>http://lightsquid.sf.net/</website>
 		<category>Network Report</category>
-		<version>1.8.2 pkg v.2.35</version>
+		<version>2.37</version>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>lightsquid-1.8_2.tbz</depends_on_package>