mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keeping the disable logging option. Revert "clean up lighttpd bits"

Browse Source 
This reverts commit 9de0332dec955ec513b74be9361de72d12aa7245.
This commit is contained in:
Chris Buechler 2015-12-30 21:06:23 -06:00 committed by Renato Botelho
parent 84a7c17d88
commit 8811dfc38b
11 changed files with 146 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/inc/system.inc
View File

@ -1237,6 +1237,14 @@ 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

1
src/etc/rc
View File

@ -388,6 +388,7 @@ 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

10
src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
View File

@ -8258,6 +8258,12 @@ 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 ""
@ -16460,6 +16466,10 @@ 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 ""

4
src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
View File

@ -24029,6 +24029,10 @@ 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による"

12
src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po
View File

@ -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_nginx_config().%s"
msgstr "Erro: não pôde abrir %s em system_generate_nginx_config().%s"
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"
#: 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,6 +20496,10 @@ 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 "
@ -40780,6 +40784,10 @@ 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 ""

14
src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
View File

@ -5293,8 +5293,8 @@ msgstr "ssl yapılandırması"
#: etc/inc/system.inc:1360
#, php-format
msgid "Error: cannot open %s in system_generate_nginx_config().%s"
msgstr "Hata: system_generate_nginx_config().%s içindeki %s açılamadı"
msgid "Error: cannot open %s in system_generate_lighty_config().%s"
msgstr "Hata: system_generate_lighty_config().%s içindeki %s açılamadı"
#: etc/inc/system.inc:1380
msgid "Setting timezone..."
@ -8529,6 +8529,12 @@ 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"
@ -17305,6 +17311,10 @@ 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"

8
src/usr/local/www/license.php
View File

@ -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("nginx"); ?> (<a href="http://www.nginx.org" target="_blank">http://www.nginx.org)</a><br />
<?=gettext("Copyright"); ?> &copy;<?=gettext("2011-2015 Nginx, Inc.")?>
<?=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("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 />

38
src/usr/local/www/status_logs.php
View File

@ -156,6 +156,8 @@ $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) {
@ -166,6 +168,9 @@ if ($save_settings) {
$logfilesize = getGETPOSTsettingvalue('logfilesize', null);
$format = getGETPOSTsettingvalue('format', null);
# System General (main) Specific
$loglighttpd = getGETPOSTsettingvalue('loglighttpd', null);
unset($input_errors);
$pconfig = $_POST;
@ -207,6 +212,17 @@ 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);
@ -218,6 +234,16 @@ 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.");
}
}
}
}
@ -607,6 +633,18 @@ $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(

39
src/usr/local/www/status_logs_filter.php
View File

@ -164,6 +164,9 @@ $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']);
@ -181,6 +184,9 @@ 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);
@ -228,6 +234,16 @@ 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']);
@ -267,6 +283,17 @@ 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) {
@ -859,6 +886,18 @@ $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(

18
src/usr/local/www/status_logs_settings.php
View File

@ -89,6 +89,7 @@ $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']);
@ -162,10 +163,12 @@ 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'];
@ -191,6 +194,14 @@ 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);
}
}
@ -287,6 +298,13 @@ $section->addInput(new Form_Checkbox(
$pconfig['logprivatenets']
));
$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',

2
tools/conf/pfPorts/make.conf
View File

@ -4,6 +4,8 @@ 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