aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Pingle <jim@pingle.org>2009-03-01 15:59:39 -0500
committerJim Pingle <jim@pingle.org>2009-03-01 15:59:39 -0500
commitbc586f76d5aeeccdb1e5e0864675818eda6f89e2 (patch)
treec96bdc91412188dd44f2b60806b6d2deb0076b85
parent8f8121f28405be1acbc5aafa907dcdaf8c3d4e18 (diff)
downloadpfsense-packages-bc586f76d5aeeccdb1e5e0864675818eda6f89e2.tar.gz
pfsense-packages-bc586f76d5aeeccdb1e5e0864675818eda6f89e2.tar.bz2
pfsense-packages-bc586f76d5aeeccdb1e5e0864675818eda6f89e2.zip
Update Dashboard package. Fixes broken log viewing on 1.2.1+, and fixes broken IPSec status. Adds a couple features to logging.
-rw-r--r--config/dashboard/dashboard.inc11
-rw-r--r--config/dashboard/dashboard.xml2
-rw-r--r--pkg_config.7.xml6
3 files changed, 13 insertions, 6 deletions
diff --git a/config/dashboard/dashboard.inc b/config/dashboard/dashboard.inc
index b147632e..a97954ae 100644
--- a/config/dashboard/dashboard.inc
+++ b/config/dashboard/dashboard.inc
@@ -4,10 +4,11 @@ function dashboard_install() {
global $g, $config;
assign_privs();
if(!file_exists("/usr/local/www/index.php.before_dashboard")) {
- /* backup the pre-dashboard index.php file */
+ /* backup the pre-dashboard files */
mwexec("cp /usr/local/www/index.php /usr/local/www/index.php.before_dashboard");
- /* backup the pre-dashboard fbegin.inc file */
mwexec("cp /usr/local/www/fbegin.inc /usr/local/www/fbegin.inc.before_dashboard");
+ mwexec("cp /usr/local/www/diag_logs_filter.php /usr/local/www/diag_logs_filter.php.before_dashboard");
+ mwexec("cp /usr/local/www/diag_logs_filter_dynamic.php /usr/local/www/diag_logs_filter_dynamic.php.before_dashboard");
}
mwexec("tar xzvpf /usr/local/pkg/widgets.tgz -C /");
assign_privs();
@@ -20,6 +21,8 @@ function dashboard_deinstall() {
/* restore the files prior to the dashboard package installation */
mwexec("cp /usr/local/www/index.php.before_dashboard /usr/local/www/index.php");
mwexec("cp /usr/local/www/fbegin.inc.before_dashboard /usr/local/www/fbegin.inc");
+ mwexec("cp /usr/local/www/diag_logs_filter.php.before_dashboard /usr/local/www/diag_logs_filter.php");
+ mwexec("cp /usr/local/www/diag_logs_filter_dynamic.php.before_dashboard /usr/local/www/diag_logs_filter_dynamic.php");
}
assign_privs();
}
@@ -29,10 +32,14 @@ function assign_privs() {
mwexec("chown root:wheel /usr/local/www/fbegin.php");
mwexec("chown root:wheel /usr/local/www/graph_cpu.php");
mwexec("chown root:wheel /usr/local/www/stats.php");
+ mwexec("chown root:wheel /usr/local/www/diag_logs_filter.php");
+ mwexec("chown root:wheel /usr/local/www/diag_logs_filter_dynamic.php");
mwexec("chmod a+rw /usr/local/www/index.php");
mwexec("chmod a+rw /usr/local/www/fbegin.php");
mwexec("chmod a+rw /usr/local/www/graph_cpu.php");
mwexec("chmod a+rw /usr/local/www/stats.php");
+ mwexec("chmod a+rw /usr/local/www/diag_logs_filter.php");
+ mwexec("chmod a+rw /usr/local/www/diag_logs_filter_dynamic.php");
}
?> \ No newline at end of file
diff --git a/config/dashboard/dashboard.xml b/config/dashboard/dashboard.xml
index a0e1b35a..ab96e727 100644
--- a/config/dashboard/dashboard.xml
+++ b/config/dashboard/dashboard.xml
@@ -46,7 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>dashboard</name>
- <version>0.2</version>
+ <version>0.7.0</version>
<title>Dashboard</title>
<include_file>/usr/local/pkg/dashboard.inc</include_file>
<additional_files_needed>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 83e172b9..324b07ed 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -75,12 +75,12 @@
</package>
<package>
<name>Dashboard</name>
- <descr>Adds pfSense dashboard that will be included with 2.0. This requires 1.2 or newer. WARNING! Cannot be deinstalled.</descr>
+ <descr>Adds pfSense dashboard that will be included with 2.0. This requires 1.2.1 or newer. WARNING! Cannot be deinstalled.</descr>
<category>System</category>
<config_file>http://www.pfsense.com/packages/config/dashboard/dashboard.xml</config_file>
- <version>0.6.2</version>
+ <version>0.7.0</version>
<status>BETA</status>
- <required_version>1.2</required_version>
+ <required_version>1.2.1</required_version>
<maximum_version>1.9</maximum_version>
<configurationfile>dashboard.xml</configurationfile>
</package>