Merge pull request #150 from ikedas/issue-145

Restore default_ttl #145 by Ikedas

Author: ikedas

src/lib/Sympa/ConfDef.pm

@@ -1754,6 +1754,13 @@ our @params = (
         'file'    => 'sympa.conf',
         'default' => '300',
     },
+    {   'name'       => 'default_ttl',
+        'gettext_id' => 'Default of inclusion timeout',
+        'gettext_comment' =>
+            'Default timeout between two scheduled synchronizations of list members with data sources.',
+        'file'    => 'sympa.conf',
+        'default' => '3600',
+    },
 
     {   'gettext_id' => 'DKIM',
         'gettext_comment' =>
@@ -2012,12 +2019,6 @@ our @params = (
         'file'     => 'sympa.conf',
         'optional' => '1',
     },
-    {   'name' => 'default_ttl',    #FIXME: maybe not used
-        'gettext_id' =>
-            'Default timeout between two scheduled synchronizations of list members with data sources.',
-        'file'    => 'sympa.conf',
-        'default' => '3600',
-    },
     {   'name' => 'default_distribution_ttl',    #FIXME: maybe not used
         'gettext_id' =>
             'Default timeout between two action-triggered synchronizations of list members with data sources.',

src/lib/Sympa/ListDef.pm

@@ -1688,7 +1688,7 @@ our %pinfo = (
             'Sympa caches user data extracted using the include parameter. Their TTL (time-to-live) within Sympa can be controlled using this parameter. The default value is 3600',
         'gettext_unit' => 'seconds',
         'format'       => '\d+',
-        'default'      => 3600,
+        'default'      => {'conf' => 'default_ttl'},
         'length'       => 6
     },