diff options
author | Chris Buechler <cmb@pfsense.org> | 2015-12-30 20:55:23 -0600 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-01-05 09:08:10 -0200 |
commit | 84a7c17d88da676c1fb0f9c2f9264870b25404ed (patch) | |
tree | 7b603c2e3399a62af47164817439543c732622cf /src | |
parent | 33d69e816f95340c9344d0c9d37a519b59049960 (diff) | |
download | pfsense-84a7c17d88da676c1fb0f9c2f9264870b25404ed.zip pfsense-84a7c17d88da676c1fb0f9c2f9264870b25404ed.tar.gz |
clean up lighttpd bits
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/system.inc | 8 | ||||
-rwxr-xr-x | src/etc/rc | 1 | ||||
-rw-r--r-- | src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | 10 | ||||
-rw-r--r-- | src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po | 4 | ||||
-rw-r--r-- | src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po | 12 | ||||
-rw-r--r-- | src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po | 14 | ||||
-rw-r--r-- | src/usr/local/www/license.php | 8 | ||||
-rwxr-xr-x | src/usr/local/www/status_logs.php | 38 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_filter.php | 39 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_settings.php | 18 |
10 files changed, 8 insertions, 144 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 @@ -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/share/locale/en/LC_MESSAGES/pfSense.pot b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 7342e22..339be98 100644 --- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -8258,12 +8258,6 @@ msgstr "" msgid "Log errors from the web server process." msgstr "" -#: usr/local/www/diag_logs_settings.php:333 -msgid "" -"Hint: If this is checked, errors from the lighttpd web server process for " -"the GUI or Captive Portal will appear in the main system log." -msgstr "" - #: usr/local/www/diag_logs_settings.php:338 msgid "Show raw filter logs" msgstr "" @@ -16466,10 +16460,6 @@ msgstr "" msgid "1999-2014 The PHP Group. All rights reserved." msgstr "" -#: usr/local/www/license.php:96 -msgid "LightTPD" -msgstr "" - #: usr/local/www/license.php:97 msgid "2004, Jan Knescke, incremental" msgstr "" diff --git a/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po index b9d66c6..8539301 100644 --- a/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po +++ b/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po @@ -24029,10 +24029,6 @@ msgstr "本製品は、から無料で入手PHPを含み" msgid "1999 - 2003 The PHP Group. All rights reserved" msgstr "1999 - 2003ザ· PHPのグループ。無断複写·転載を禁じます" -#: usr/local/www/license.php:163 usr/local/www/license.php:163 -msgid "LightTPD" -msgstr "lighttpdの" - #: usr/local/www/license.php:164 msgid " 2004 by Jan Kneschke " msgstr "2004ヤンKneschkeによる" diff --git a/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po b/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po index b013681..53c7d0b 100644 --- a/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po +++ b/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po @@ -2843,8 +2843,8 @@ msgstr "configuração ssl" #: etc/inc/system.inc:1161 etc/inc/system.inc:1213 etc/inc/system.inc:1193 #: etc/inc/system.inc:1142 etc/inc/system.inc:1169 #, php-format -msgid "Error: cannot open %s in system_generate_lighty_config().%s" -msgstr "Erro: não pôde abrir %s em system_generate_lighty_config().%s" +msgid "Error: cannot open %s in system_generate_nginx_config().%s" +msgstr "Erro: não pôde abrir %s em system_generate_nginx_config().%s" #: etc/inc/system.inc:1181 etc/inc/system.inc:1233 etc/inc/system.inc:1213 #: etc/inc/system.inc:1162 etc/inc/system.inc:1189 @@ -20496,10 +20496,6 @@ msgstr "Esse produto inclui PHP, disponível de graça por" msgid "1999 - 2003 The PHP Group. All rights reserved" msgstr "1999 - 2003 The PHP Group. Todos os direitos reservados" -#: usr/local/www/license.php:163 -msgid "LightTPD" -msgstr "LightTPD" - #: usr/local/www/license.php:164 msgid " 2004 by Jan Kneschke " msgstr " 2004 por Jan Kneschke " @@ -40784,10 +40780,6 @@ msgstr "" msgid "Log errors from the web server process." msgstr "" -#: usr/local/www/diag_logs_settings.php:291 -msgid "Hint: If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log." -msgstr "" - #: usr/local/www/interfaces_gre_edit.php:216 msgid "Check this box for WCCP encapsulation version 2, or leave unchecked for version 1." msgstr "" diff --git a/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po index 07b6eac..aef0667 100644 --- a/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po +++ b/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po @@ -5293,8 +5293,8 @@ msgstr "ssl yapılandırması" #: etc/inc/system.inc:1360 #, php-format -msgid "Error: cannot open %s in system_generate_lighty_config().%s" -msgstr "Hata: system_generate_lighty_config().%s içindeki %s açılamadı" +msgid "Error: cannot open %s in system_generate_nginx_config().%s" +msgstr "Hata: system_generate_nginx_config().%s içindeki %s açılamadı" #: etc/inc/system.inc:1380 msgid "Setting timezone..." @@ -8529,12 +8529,6 @@ msgstr "" msgid "Log errors from the web server process." msgstr "" -#: usr/local/www/diag_logs_settings.php:333 -msgid "" -"Hint: If this is checked, errors from the lighttpd web server process for " -"the GUI or Captive Portal will appear in the main system log." -msgstr "" - #: usr/local/www/diag_logs_settings.php:338 msgid "Show raw filter logs" msgstr "Ham filtreleme günlüklerini göster" @@ -17311,10 +17305,6 @@ msgstr "Bu ürün PHP içerir, ücretsiz olarak" msgid "1999-2014 The PHP Group. All rights reserved." msgstr "" -#: usr/local/www/license.php:96 -msgid "LightTPD" -msgstr "LightTPD" - #: usr/local/www/license.php:97 msgid "2004, Jan Knescke, incremental" msgstr "2004, Jan Knescke, incremental" 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")?> ©<?=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"); ?> © <?=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"); ?> © <?=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"); ?> ©<?=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"); ?> ©<?=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/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index adf5ecc..5a30753 100755 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -156,8 +156,6 @@ $pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize']; $pconfig['format'] = $config['syslog'][$specific_log]['format']; # System General (main) Specific -$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); - $save_settings = getGETPOSTsettingvalue('save_settings', null); if ($save_settings) { @@ -168,9 +166,6 @@ if ($save_settings) { $logfilesize = getGETPOSTsettingvalue('logfilesize', null); $format = getGETPOSTsettingvalue('format', null); - # System General (main) Specific - $loglighttpd = getGETPOSTsettingvalue('loglighttpd', null); - unset($input_errors); $pconfig = $_POST; @@ -212,17 +207,6 @@ if ($save_settings) { $config['syslog'][$specific_log]['format'] = $format; } - # System General (main) Specific - if ($logfile == 'system') { - $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); - $config['syslog']['nologlighttpd'] = $loglighttpd ? false : true; - - if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) { - $logging_changed = $lighttpd_logging_changed = true; - } - } - - // If any of the logging settings were changed then backup and sync (standard write_config). Otherwise only write config (don't backup, don't sync). if ($logging_changed) { write_config($desc = "Log Display Settings Saved: " . gettext($allowed_logs[$logfile]["name"]), $backup = true, $write_config_only = false); @@ -234,16 +218,6 @@ if ($save_settings) { $savemsg = gettext("The changes have been applied successfully."); - # System General (main) Specific - if ($logfile == 'system') { - if ($lighttpd_logging_changed) { - ob_flush(); - flush(); - log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); - send_event("service restart webgui"); - $savemsg .= "<br />" . gettext("WebGUI process is restarting."); - } - } } } @@ -633,18 +607,6 @@ $group->add(new Form_Checkbox( $group->setHelp('Show the log entries as formatted or raw output as generated by the service. The raw output will reveal more detailed information, but it is more difficult to read.'); $section->add($group); - -# System General (main) Specific -if ($logfile == 'system') { - $section->addInput(new Form_Checkbox( - 'loglighttpd', - 'Web Server Log', - 'Log errors from the web server process', - $pconfig['loglighttpd'] - ))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the system log.'); -} - - $group = new Form_Group('Action'); $btnsavesettings = new Form_Button( diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index cd3117e..7ff5efb 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -164,9 +164,6 @@ $pconfig['nentries'] = $config['syslog'][$specific_log]['nentries']; $pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize']; $pconfig['format'] = $config['syslog'][$specific_log]['format']; -# System General (main) Specific -$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); - # Firewall Specific $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']); $pconfig['logdefaultpass'] = isset($config['syslog']['nologdefaultpass']); @@ -184,9 +181,6 @@ if ($save_settings) { $logfilesize = getGETPOSTsettingvalue('logfilesize', null); $format = getGETPOSTsettingvalue('format', null); - # System General (main) Specific - $loglighttpd = getGETPOSTsettingvalue('loglighttpd', null); - # Firewall Specific $logdefaultblock = getGETPOSTsettingvalue('logdefaultblock', null); $logdefaultpass = getGETPOSTsettingvalue('logdefaultpass', null); @@ -234,16 +228,6 @@ if ($save_settings) { $config['syslog'][$specific_log]['format'] = $format; } - # System General (main) Specific - if ($logfile == 'system') { - $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); - $config['syslog']['nologlighttpd'] = $loglighttpd ? false : true; - - if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) { - $logging_changed = $lighttpd_logging_changed = true; - } - } - # Firewall Specific if ($logfile == 'filter') { $oldnologdefaultblock = isset($config['syslog']['nologdefaultblock']); @@ -283,17 +267,6 @@ if ($save_settings) { $savemsg = gettext("The changes have been applied successfully."); - # System General (main) Specific - if ($logfile == 'system') { - if ($lighttpd_logging_changed) { - ob_flush(); - flush(); - log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); - send_event("service restart webgui"); - $savemsg .= "<br />" . gettext("WebGUI process is restarting."); - } - } - # Firewall Specific if ($logfile == 'filter') { if ($firewall_logging_changed) { @@ -886,18 +859,6 @@ $group->add(new Form_Checkbox( $group->setHelp('Show the log entries as formatted or raw output as generated by the service. The raw output will reveal more detailed information, but it is more difficult to read.'); $section->add($group); - -# System General (main) Specific -if ($logfile == 'system') { - $section->addInput(new Form_Checkbox( - 'loglighttpd', - 'Web Server Log', - 'Log errors from the web server process', - $pconfig['loglighttpd'] - ))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the system log.'); -} - - # Firewall Specific if ($logfile == 'filter') { $section->addInput(new Form_Checkbox( diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index 8fa193a..384917f 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -89,7 +89,6 @@ $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']); $pconfig['logdefaultpass'] = isset($config['syslog']['nologdefaultpass']); $pconfig['logbogons'] = !isset($config['syslog']['nologbogons']); $pconfig['logprivatenets'] = !isset($config['syslog']['nologprivatenets']); -$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); $pconfig['rawfilter'] = isset($config['syslog']['rawfilter']); $pconfig['filterdescriptions'] = $config['syslog']['filterdescriptions']; $pconfig['disablelocallogging'] = isset($config['syslog']['disablelocallogging']); @@ -163,12 +162,10 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { $oldnologdefaultpass = isset($config['syslog']['nologdefaultpass']); $oldnologbogons = isset($config['syslog']['nologbogons']); $oldnologprivatenets = isset($config['syslog']['nologprivatenets']); - $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); $config['syslog']['nologdefaultblock'] = $_POST['logdefaultblock'] ? false : true; $config['syslog']['nologdefaultpass'] = $_POST['logdefaultpass'] ? true : false; $config['syslog']['nologbogons'] = $_POST['logbogons'] ? false : true; $config['syslog']['nologprivatenets'] = $_POST['logprivatenets'] ? false : true; - $config['syslog']['nologlighttpd'] = $_POST['loglighttpd'] ? false : true; $config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false; if (is_numeric($_POST['filterdescriptions']) && $_POST['filterdescriptions'] > 0) { $config['syslog']['filterdescriptions'] = $_POST['filterdescriptions']; @@ -194,14 +191,6 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { $savemsg = get_std_save_message($retval); - if ($oldnologlighttpd !== isset($config['syslog']['nologlighttpd'])) { - ob_flush(); - flush(); - log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); - send_event("service restart webgui"); - $savemsg .= "<br />" . gettext("WebGUI process is restarting."); - } - filter_pflog_start(true); } } @@ -299,13 +288,6 @@ $section->addInput(new Form_Checkbox( )); $section->addInput(new Form_Checkbox( - 'loglighttpd', - 'Web Server Log', - 'Log errors from the web server process', - $pconfig['loglighttpd'] -))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log'); - -$section->addInput(new Form_Checkbox( 'rawfilter', 'Raw Logs', 'Show raw filter logs', |