aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Paradis <bryan.paradis@gmail.com>2014-02-21 10:45:02 -0500
committerBryan Paradis <bryan.paradis@gmail.com>2014-02-21 10:45:09 -0500
commit324c82e37900b3681c6bcff4df91bfc22e8dc493 (patch)
tree8e4355365a1ef392c837cbe26804671ec4be6cc6
parent2dc81505264000fcb7728225220c991f5162239b (diff)
downloadpfsense-packages-324c82e37900b3681c6bcff4df91bfc22e8dc493.tar.gz
pfsense-packages-324c82e37900b3681c6bcff4df91bfc22e8dc493.tar.bz2
pfsense-packages-324c82e37900b3681c6bcff4df91bfc22e8dc493.zip
Moved php files into additional files
bin folder renamed to www abc files renamed to php removed delete lines in vnstat2.inc for php files removed install lines in vnstat2.inc for php files
-rw-r--r--config/vnstat2/vnstat2.inc9
-rw-r--r--config/vnstat2/www/diag_vnstat.php (renamed from config/vnstat2/bin/diag_vnstat.abc)0
-rw-r--r--config/vnstat2/www/diag_vnstat2.php (renamed from config/vnstat2/bin/diag_vnstat2.abc)0
-rw-r--r--config/vnstat2/www/vnstat2_img.php (renamed from config/vnstat2/bin/vnstat2_img.abc)0
-rw-r--r--config/vnstat2/www/vnstati.php (renamed from config/vnstat2/bin/vnstati.abc)0
5 files changed, 0 insertions, 9 deletions
diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index c37314c3..9a684aa1 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -5,10 +5,6 @@ function vnstat_install_deinstall() {
// Remove Vnstat package and files
exec("rm -d -R /usr/local/www/vnstat2");
exec("rm -d -R /usr/local/www/vnstati");
- exec("rm /usr/local/www/diag_vnstat.php");
- exec("rm /usr/local/www/diag_vnstat2.php");
- exec("rm /usr/local/www/vnstati.php");
- exec("rm /usr/local/www/vnstat2_img.php");
exec("rm -d -R /usr/local/pkg/vnstat2");
exec("rm /usr/local/etc/vnstat.conf");
@@ -153,11 +149,6 @@ function vnstat_install_config() {
// Check for pbi install and arch type then create symlinks
if (file_exists('/usr/pbi/vnstat-i386')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-i386/etc/vnstat.conf"); }
if (file_exists('/usr/pbi/vnstat-amd64')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-amd64/etc/vnstat.conf"); }
-// Copy files to web dir
- exec("[ ! -f /usr/local/www/diag_vnstat2.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat2.abc /usr/local/www/diag_vnstat2.php");
- exec("[ ! -f /usr/local/www/diag_vnstat.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat.abc /usr/local/www/diag_vnstat.php");
- exec("[ ! -f /usr/local/www/vnstati.php ] && cp /usr/local/pkg/vnstat2/vnstati.abc /usr/local/www/vnstati.php");
- exec("[ ! -f /usr/local/www/vnstat2_img.php ] && cp /usr/local/pkg/vnstat2/vnstat2_img.abc /usr/local/www/vnstat2_img.php");
// Add MonthRotate value to config.xml and write /usr/local/etc/vnstat.conf
$no_monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate'];
if ($no_monthrotate == ""){
diff --git a/config/vnstat2/bin/diag_vnstat.abc b/config/vnstat2/www/diag_vnstat.php
index afef3849..afef3849 100644
--- a/config/vnstat2/bin/diag_vnstat.abc
+++ b/config/vnstat2/www/diag_vnstat.php
diff --git a/config/vnstat2/bin/diag_vnstat2.abc b/config/vnstat2/www/diag_vnstat2.php
index ec19a0b2..ec19a0b2 100644
--- a/config/vnstat2/bin/diag_vnstat2.abc
+++ b/config/vnstat2/www/diag_vnstat2.php
diff --git a/config/vnstat2/bin/vnstat2_img.abc b/config/vnstat2/www/vnstat2_img.php
index 85644309..85644309 100644
--- a/config/vnstat2/bin/vnstat2_img.abc
+++ b/config/vnstat2/www/vnstat2_img.php
diff --git a/config/vnstat2/bin/vnstati.abc b/config/vnstat2/www/vnstati.php
index e5ddcd21..e5ddcd21 100644
--- a/config/vnstat2/bin/vnstati.abc
+++ b/config/vnstat2/www/vnstati.php