common: add missing keywords

In commit d2f9ce0, a new keyword was
introduced : "global_timeout".

But it can't actually be specified in munin-node.conf.

This commit also adds "timeout" in the master and "spooldir" in the node

common/lib/Munin/Common/Config.pm

@@ -10,6 +10,7 @@ use English qw(-no_match_vars);
 
 # Functions here are unable to log as they don't know if they're used
 # by the node or the master which use divergent logging facilities.
+# In fact, the list in %legal is only used by the master.
 
 my %legal = map { $_ => 1 } (
 
@@ -46,6 +47,7 @@ my %legal = map { $_ => 1 } (
 	"html_rename",
 	"worker_start_delay",
 	"num_messages",
+	"timeout",
 	);
 
 my %bools = map { $_ => 1} qw(yes no true false on off 1 0);

node/lib/Munin/Node/Config.pm

@@ -91,8 +91,10 @@ sub _parse_line {
     return if $self->_handled_by_net_server($var_name);
 
     my %config_variables = map { $_ => 1 } qw(
+        global_timeout
         ignore_file
         paranoia
+        spooldir
         timeout
         tls
         tls_ca_certificate