aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcrane <mctch@yahoo.com>2009-12-21 21:19:57 -0700
committermcrane <mctch@yahoo.com>2009-12-21 21:19:57 -0700
commit6e9ad5b02b3825a3e7e2821c7bd2893ba19b7969 (patch)
treeeb4fd9a8c464ff5fc168f8acde3c549030fd4fc3
parent98b50f46c2d617766024c5b0941cdf12c8c8937d (diff)
downloadpfsense-packages-6e9ad5b02b3825a3e7e2821c7bd2893ba19b7969.tar.gz
pfsense-packages-6e9ad5b02b3825a3e7e2821c7bd2893ba19b7969.tar.bz2
pfsense-packages-6e9ad5b02b3825a3e7e2821c7bd2893ba19b7969.zip
vHosts adjust the naming convention of the files for so that the main http service doesn't show started when the ssl service is running unless it is actually running.
-rw-r--r--config/vhosts/vhosts.inc10
-rwxr-xr-xpkg_config.7.xml9
2 files changed, 9 insertions, 10 deletions
diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index 9282824f..e9a1a6ec 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -389,7 +389,7 @@ function vhosts_sync_package_php()
$tmp .= "#server.error-handler-404 = \"/error-handler.php\"\n";
$tmp .= "\n";
$tmp .= "## to help the rc.scripts\n";
- $tmp .= "server.pid-file = \"/var/run/lighty-vhosts.pid\"\n";
+ $tmp .= "server.pid-file = \"/var/run/lighty-vhosts-http.pid\"\n";
$tmp .= "\n";
$tmp .= "## virtual directory listings\n";
$tmp .= "server.dir-listing = \"disable\"\n";
@@ -429,7 +429,7 @@ function vhosts_sync_package_php()
$tmp .= "#### CGI module\n";
$tmp .= "cgi.assign = ( \".cgi\" => \"\" )\n";
- $fout = fopen("/var/etc/lighty-vhosts.conf","w");
+ $fout = fopen("/var/etc/lighty-vhosts-http.conf","w");
fwrite($fout, $tmp);
unset($tmp);
fclose($fout);
@@ -750,9 +750,9 @@ function php_install_command() {
//write_config();
write_rcfile(array(
- "file" => "vhosts.sh",
- "start" => "/usr/local/sbin/lighttpd -f /var/etc/lighty-vhosts.conf",
- "stop" => "kill `cat /var/run/lighty-vhosts.pid`"
+ "file" => "vhosts-http.sh",
+ "start" => "/usr/local/sbin/lighttpd -f /var/etc/lighty-vhosts-http.conf",
+ "stop" => "kill `cat /var/run/lighty-vhosts-http.pid`"
)
);
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 492b03bf..b98ecc39 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -297,7 +297,7 @@
<pkginfolink>http://doc.pfsense.org/index.php/vhosts</pkginfolink>
<config_file>http://www.pfsense.com/packages/config/vhosts/vhosts.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
- <version>0.3</version>
+ <version>0.4</version>
<status>Beta</status>
<required_version>1.2.3</required_version>
<maintainer>markjcrane@gmail.com</maintainer>
@@ -433,12 +433,11 @@
<package>
<name>Fit123</name>
<website>http://pfsense.comuf.com</website>
- <descr>With Fit123 a small set of features can be added to pfSense 1.2.3 (Date)Adds current date to front page (LTSP)Adds 3th network boot option (After Filter Change) Clear states after filter reload (DNS Servers)Adds option for a 3th and 4th DNS Server (DDNS)A more customize way to update dynamic dns (CASS) Clear states for 1 voip client after dynamic ip update on wan.</descr>
+ <descr>With Fit123 a small set of features can be added to pfSense 1.2.3 (Date)Adds current date to front page (LTSP)Adds 3th network boot option (After Filter Change) Clear states after filter reload (DNS Servers)Adds option for a 3th and 4th DNS Server (DDNS)A more customize way to update dynamic dns (Themes)On install Code-red and the pfsense ng theme are added to the list of avalible themes.</descr>
<category>System</category>
- <version>1.0</version>
- <status>Beta</status>
+ <version>0.0.5</version>
+ <status>ALPHA</status>
<required_version>1.2.3</required_version>
- <maximum_version>1.2.3</maximum_version>
<maintainer>crazypark2@yahoo.dk</maintainer>
<config_file>http://www.pfsense.com/packages/config/Fit123/fit123.xml</config_file>
<configurationfile>fit123.xml</configurationfile>