summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/etc/inc/system.inc8
-rwxr-xr-xsrc/etc/rc1
-rw-r--r--src/usr/local/www/license.php8
-rw-r--r--tools/conf/pfPorts/make.conf2
4 files changed, 4 insertions, 15 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 2108edb..66b0c91 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1237,14 +1237,6 @@ function system_generate_nginx_config($filename,
}
}
- if (!isset($config['syslog']['nologlighttpd'])) {
- $nginx_use_syslog = <<<EOD
-## where to send error-messages to
-server.errorlog-use-syslog="enable"
-EOD;
- }
-
-
if ($captive_portal !== false) {
$fast_cgi_path = "{$g['tmp_path']}/php-fastcgi-{$captive_portal}.socket";
$fastcgi_config = <<<EOD
diff --git a/src/etc/rc b/src/etc/rc
index 6b36401..301741f 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -388,7 +388,6 @@ export fcgipath=/var/run/php-fpm.socket
# let the PHP-based configuration subsystem set up the system now
echo -n "Launching the init system..."
/bin/rm -f /cf/conf/backup/backup.cache
-/bin/rm -f /root/lighttpd*
/usr/bin/touch $varrunpath/booting
if [ "${PLATFORM}" = "nanobsd" ]; then
diff --git a/src/usr/local/www/license.php b/src/usr/local/www/license.php
index 255f0ed..8a25e9d 100644
--- a/src/usr/local/www/license.php
+++ b/src/usr/local/www/license.php
@@ -118,11 +118,11 @@ include("head.inc");
FreeBSD (<a href="http://www.freebsd.org" target="_blank">http://www.freebsd.org</a>)<br />
<?=gettext("Copyright")?> &copy;<?=gettext("1992-2015 The FreeBSD Project. All rights reserved")?>.<br />
<br />
- <?=gettext("This product includes PHP, freely available from")?><a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br />
- <?=gettext("Copyright"); ?> &copy; <?=gettext("1999-2015 The PHP Group. All rights reserved.")?>.<br />
+ <?=gettext("This product includes PHP, freely available from")?> <a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br />
+ <?=gettext("Copyright"); ?> &copy; <?=gettext("1999-2015 The PHP Group. All rights reserved.")?><br />
<br />
- <?=gettext("LightTPD"); ?> (<a href="http://www.lighttpd.net" target="_blank">http://www.lighttpd.net)</a><br />
- <?=gettext("Copyright"); ?> &copy;<?=gettext("2004, Jan Knescke, incremental")?><jan@kneschke.de>
+ <?=gettext("nginx"); ?> (<a href="http://www.nginx.org" target="_blank">http://www.nginx.org)</a><br />
+ <?=gettext("Copyright"); ?> &copy;<?=gettext("2011-2015 Nginx, Inc.")?>
<?=gettext("All rights reserved.")?><br />
<br />
<?=gettext("ISC DHCP server ")?>(<a href="http://www.isc.org/products/DHCP/" target="_blank">http://www.isc.org/products/DHCP</a>)<br />
diff --git a/tools/conf/pfPorts/make.conf b/tools/conf/pfPorts/make.conf
index 9272ea3..10b79fb 100644
--- a/tools/conf/pfPorts/make.conf
+++ b/tools/conf/pfPorts/make.conf
@@ -4,8 +4,6 @@ OPTIONS_UNSET_FORCE= X11 DOCS EXAMPLES MAN INFO MANPAGES
# Individual ports options
www_elinks_UNSET_FORCE= FASTMEM
-www_lighttpd_SET_FORCE= NODELAY
-
net_miniupnpd_SET_FORCE= PF_ENABLE_FILTER_RULES IPV6 UPNP_IGDV2 CHECK_PORTINUSE
security_openssl_SET_FORCE= PADLOCK
OpenPOWER on IntegriCloud