aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/vhosts/vhosts.inc20
-rw-r--r--config/vhosts/vhosts.xml13
2 files changed, 17 insertions, 16 deletions
diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index 6cea0c04..ad85f439 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -673,6 +673,7 @@ function vhosts_sync_package_php()
unset($tmp);
fclose($fout);
+ if (!function_exists('write_rcfile')) { require("/etc/inc/service-utils.inc"); }
write_rcfile(array(
"file" => "vhosts-".$ipaddress."-".$port."-ssl.sh",
"start" => "/usr/local/sbin/lighttpd -f /var/etc/lighty-vhosts-".$ipaddress."-".$port."-ssl.conf",
@@ -733,6 +734,11 @@ function php_install_command() {
}
if(stristr(php_uname('r'), '7.2') == TRUE) {
+ if (!file_exists('/usr/local/php5')) {
+ chdir('/usr/local/');
+ exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/php5.tar.gz");
+ exec("tar zxvf /usr/local/php5.tar.gz -C /usr/local/");
+ }
if (!file_exists('/usr/local/lib/libxml2.so.5')) {
chdir('/usr/local/lib/');
exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/usr.local.lib/libxml2.so.5");
@@ -750,6 +756,13 @@ function php_install_command() {
exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/usr.local.lib/lib/libxml2.a");
}
}
+ if(stristr(php_uname('r'), '8.0') == TRUE) {
+ if (!file_exists('/usr/local/php5')) {
+ chdir('/usr/local/');
+ exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd8.0/php5.tar.gz");
+ exec("tar zxvf /usr/local/php5.tar.gz -C /usr/local/");
+ }
+ }
//rename PHP files from .tmp to .php
exec("cp /tmp/vhosts_php.tmp /usr/local/www/packages/vhosts/vhosts_php.php");
@@ -758,16 +771,15 @@ function php_install_command() {
exec("cp /tmp/vhosts_php_edit.tmp /usr/local/www/packages/vhosts/vhosts_php_edit.php");
unlink_if_exists("/tmp/vhosts_php_edit.tmp");
+ chdir('/tmp/');
+ exec ("fetch http://www.pfsense.com/packages/config/vhosts/system_advanced_create_certs.tmp");
exec("cp /tmp/system_advanced_create_certs.tmp /usr/local/www/packages/vhosts/system_advanced_create_certs.php");
unlink_if_exists("/tmp/system_advanced_create_certs.tmp");
- //extract php5
- chdir('/tmp');
- exec("tar zxvf /tmp/php5.tar.gz -C /usr/local/");
- unlink_if_exists("/tmp/php5.tar.gz");
//write_config();
+ if (!function_exists('write_rcfile')) { require("/etc/inc/service-utils.inc"); }
write_rcfile(array(
"file" => "vhosts-http.sh",
"start" => "/usr/local/sbin/lighttpd -f /var/etc/lighty-vhosts-http.conf",
diff --git a/config/vhosts/vhosts.xml b/config/vhosts/vhosts.xml
index 14141044..eb8bf878 100644
--- a/config/vhosts/vhosts.xml
+++ b/config/vhosts/vhosts.xml
@@ -41,7 +41,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>vHosts Settings</name>
- <version>0.7</version>
+ <version>0.7.1</version>
<title>Settings</title>
<include_file>/usr/local/pkg/vhosts.inc</include_file>
<menu>
@@ -95,17 +95,6 @@
<chmod>0755</chmod>
<item>http://www.pfsense.com/packages/config/vhosts/lighty-vhosts.conf</item>
</additional_files_needed>
- <additional_files_needed>
- <prefix>/var/etc/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/vhosts/system_advanced_create_certs.tmp</item>
- </additional_files_needed>
- <additional_files_needed>
- <prefix>/tmp/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/vhosts/php5.tar.gz</item>
- </additional_files_needed>
-
<fields>
<field>
<fielddescr>Variable One</fielddescr>