[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cd812106b19a146d175fc2e13efcdc68ad04754e - IPFire-SCM

29 Nov 2016

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  cd812106b19a146d175fc2e13efcdc68ad04754e (commit)
       via  adb11e90dfe701fa0e29bcc80aeb998719d99797 (commit)
      from  b7f2fe819b1ecf0e0c04e0059b64b67127073d44 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cd812106b19a146d175fc2e13efcdc68ad04754e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Nov 29 12:26:34 2016 +0000
unbound: Do not try removing forwarders when unbound is not running
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit adb11e90dfe701fa0e29bcc80aeb998719d99797
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Nov 29 12:18:41 2016 +0000
Always enable asynchronous logging
This patch always enables asynchronous logging which slows
    down the system a lot on slow storage and some virtual environments.
It also removes the configuration options in the web
    user interface, since this is not configurable any more.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/etc/syslog.conf                    |  6 +++---
 config/rootfiles/core/108/filelists/files |  2 ++
 config/rootfiles/core/108/update.sh       |  1 +
 doc/language_issues.de                    |  3 +++
 doc/language_issues.en                    |  3 +++
 doc/language_issues.es                    |  3 ++-
 doc/language_issues.fr                    |  3 +++
 doc/language_issues.it                    |  3 +++
 doc/language_issues.nl                    |  3 +++
 doc/language_issues.pl                    |  3 ++-
 doc/language_issues.ru                    |  3 +++
 doc/language_issues.tr                    |  3 +++
 html/cgi-bin/logs.cgi/config.dat          | 20 --------------------
 src/initscripts/init.d/unbound            |  5 +++++
 src/misc-progs/syslogdctrl.c              | 23 -----------------------
 15 files changed, 36 insertions(+), 48 deletions(-)
Difference in files:

diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf
index b1b7ec8..cdef756 100644
--- a/config/etc/syslog.conf
+++ b/config/etc/syslog.conf
@@ -5,10 +5,10 @@
 # Log anything (except mail) of level info or higher.
 # Don't log private authentication messages!
 # local0.* any dhcpcd log (even debug) in messages
-cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*	/var/log/messages
+cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*	-/var/log/messages
# Log crons
-#cron.*										/var/log/cron.log
+#cron.*										-/var/log/cron.log
# Everybody gets emergency messages
 *.emerg										*
@@ -20,4 +20,4 @@ cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*	/var/log/messag
 #*.*											@hostname.domain
# Postfix logs
-mail.*										/var/log/mail
+mail.*										-/var/log/mail
diff --git a/config/rootfiles/core/108/filelists/files b/config/rootfiles/core/108/filelists/files
index 9fc9dbd..7ef09c4 100644
--- a/config/rootfiles/core/108/filelists/files
+++ b/config/rootfiles/core/108/filelists/files
@@ -1,4 +1,6 @@
 etc/system-release
 etc/issue
+etc/syslog.conf
 etc/unbound/unbound.conf
 srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/config.dat
diff --git a/config/rootfiles/core/108/update.sh b/config/rootfiles/core/108/update.sh
index 045f7e7..3874a6e 100644
--- a/config/rootfiles/core/108/update.sh
+++ b/config/rootfiles/core/108/update.sh
@@ -44,6 +44,7 @@ ldconfig
 #/usr/local/bin/update-lang-cache
# Start services
+/etc/init.d/sysklogd restart
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
    /etc/init.d/ipsec start
 fi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 101411e..48d7f6a 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -335,6 +336,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -361,6 +363,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 596cf71..0362802 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -361,6 +362,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -387,6 +389,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/doc/language_issues.es b/doc/language_issues.es
index ad64380..60ba499 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -305,6 +305,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -331,6 +332,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
@@ -616,7 +618,6 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: ConnSched dial
 WARNING: untranslated string: ConnSched hangup
 WARNING: untranslated string: ConnSched reboot
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 28e80c9..863b529 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -302,6 +303,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -328,6 +330,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/doc/language_issues.it b/doc/language_issues.it
index d221534..6efef40 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -353,6 +354,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -379,6 +381,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 1dfc968..c9b10dc 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -352,6 +353,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -378,6 +380,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ad64380..60ba499 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -305,6 +305,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -331,6 +332,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
@@ -616,7 +618,6 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: ConnSched dial
 WARNING: untranslated string: ConnSched hangup
 WARNING: untranslated string: ConnSched reboot
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 31855fa..255df2f 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -297,6 +298,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -323,6 +325,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6629cd6..8cf2dfe 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Async logging enabled
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -361,6 +362,7 @@ WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
 WARNING: translation string unused: log enabled
+WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
 WARNING: translation string unused: logging
 WARNING: translation string unused: loosedirectorychecking
@@ -387,6 +389,7 @@ WARNING: translation string unused: mbmon fan in
 WARNING: translation string unused: mbmon graphs
 WARNING: translation string unused: mbmon temp in
 WARNING: translation string unused: mbmon value
+WARNING: translation string unused: messages logging
 WARNING: translation string unused: min size
 WARNING: translation string unused: missing dat
 WARNING: translation string unused: missing gz
diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat
index 1f97a17..789341d 100644
--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -32,9 +32,7 @@ $logsettings{'LOGWATCH_LEVEL'} = 'Low';
 $logsettings{'LOGWATCH_KEEP'} = '56';
 my @VS = ('15','50','100','150','250','500');
 $logsettings{'ENABLE_REMOTELOG'} = 'off';
-$logsettings{'ENABLE_ASYNCLOG'} = 'off';
 $logsettings{'REMOTELOG_ADDR'} = '';
-$logsettings{'VARMESSAGES'} = 'cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*';
 $logsettings{'ACTION'} = '';
 &Header::getcgihash(%logsettings);
@@ -67,10 +65,6 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})
&General::readhash("${General::swroot}/logging/settings", %logsettings);
-$checked{'ENABLE_ASYNCLOG'}{'off'} = '';
-$checked{'ENABLE_ASYNCLOG'}{'on'} = '';
-$checked{'ENABLE_ASYNCLOG'}{$logsettings{'ENABLE_ASYNCLOG'}} = "checked='checked'";
-
 $checked{'ENABLE_REMOTELOG'}{'off'} = '';
 $checked{'ENABLE_REMOTELOG'}{'on'} = '';
 $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'";
@@ -151,20 +145,6 @@ END
 ;
 &Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'messages logging'});
-print <<END
-<table width='100%'>
-<tr>
-  <td class='base' colspan='2'><input type='checkbox' name='ENABLE_ASYNCLOG' $checked{'ENABLE_ASYNCLOG'}{'on'} />$Lang::tr{'Async logging enabled'}</td>
-<tr>
-</tr>
-  <td>$Lang::tr{'log var messages'}</td><td><input type='text' name='VARMESSAGES' size='50' value='$logsettings{'VARMESSAGES'}' /></td>
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
 print <<END
 <div align='center'>
 <table width='60%'>
diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index 01a560d..1ecbf22 100644
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -366,6 +366,11 @@ case "$1" in
    	;;
update-forwarders)
+		# Do not try updating forwarders when unbound is not running
+		if ! pgrep unbound &>/dev/null; then
+			exit 0
+		fi
+
    	update_forwarders
    	;;
diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 8111c84..5271902 100644
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -67,19 +67,6 @@ int main(void)
       exit(ERR_SETTINGS);
    }
-   if (!findkey(kv, "ENABLE_ASYNCLOG", asynclog))
-   {
-      fprintf(stderr, "Cannot read ENABLE_ASYNCLOG\n");
-      exit(ERR_SETTINGS);
-   }
-
-   
-   if (!findkey(kv, "VARMESSAGES", varmessages))
-   {
-      fprintf(stderr, "Cannot read VARMESSAGES\n");
-      exit(ERR_SETTINGS);
-   }
-
    if (strspn(hostname, VALID_FQDN) != strlen(hostname))
    {
       fprintf(stderr, "Bad REMOTELOG_ADDR: %s\n", hostname);
@@ -133,16 +120,6 @@ int main(void)
    }
    close(config_fd);
-   /* Replace the logging option*/
-     safe_system("grep -v '/var/log/messages' < /etc/syslog.conf.new > /etc/syslog.conf.tmp && mv /etc/syslog.conf.tmp /etc/syslog.conf.new");
-   
-   if (!strcmp(asynclog,"on"))
-     snprintf(command, STRING_SIZE - 1, "printf '%s     -/var/log/messages' >> /etc/syslog.conf.new", varmessages );
-   else
-     snprintf(command, STRING_SIZE - 1, "printf '%s     /var/log/messages' >> /etc/syslog.conf.new", varmessages );
-
-     safe_system(command);
-
    if (rename("/etc/syslog.conf.new", "/etc/syslog.conf") == -1)
    {
       perror("Unable to replace old config file");
hooks/post-receive
--
IPFire 2.x development tree

    