Configure timeout for configuration reload (#1553)

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -193,6 +193,7 @@ sub defaultValues {
         'registerDB'               => 'Null',
         'registerTimeout'          => 0,
         'registerUrl'              => 'http://auth.example.com/register',
+        'reloadTimeout'            => 5,
         'remoteGlobalStorage' => 'Lemonldap::NG::Common::Apache::Session::SOAP',
         'remoteGlobalStorageOptions' => {
             'ns' =>

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -2367,6 +2367,10 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'default' => 'http://auth.example.com/register',
             'type'    => 'text'
         },
+        'reloadTimeout' => {
+            'default' => 5,
+            'type'    => 'int'
+        },
         'reloadUrls' => {
             'keyTest' =>
 qr/^(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-9]*[a-zA-Z0-9]|[a-zA-Z])[.]?)|(?:[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+))(?::\d+)?$/,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -366,6 +366,12 @@ sub attributes {
             default       => 'get',
             documentation => 'HTTP method for redirect page form',
         },
+        reloadTimeout => {
+            type          => 'int',
+            default       => 5,
+            documentation => 'Configuration reload timeout',
+            flags         => 'm',
+        },
         reloadUrls => {
             type          => 'keyTextContainer',
             help          => 'configlocation.html#configuration_reload',
@@ -627,7 +633,8 @@ sub attributes {
         cspFormAction => {
             type    => 'text',
             default => "'self'",
-            documentation => 'Form action destination for Content-Security-Policy',
+            documentation =>
+              'Form action destination for Content-Security-Policy',
         },
         cspImg => {
             type          => 'text',

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@@ -544,7 +544,10 @@ sub tree {
                         }
                     ]
                 },
-                'reloadUrls',
+                {
+                    title => 'reloadParams',
+                    nodes => [ 'reloadUrls', 'reloadTimeout', ]
+                },
                 {
                     title => 'plugins',
                     help  => 'start.html#plugins',

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm

@@ -332,7 +332,7 @@ sub applyConf {
     }
     return {} unless (%reloadUrls);
 
-    $self->ua->timeout(3);
+    $self->ua->timeout( $newConf->{reloadTimeout} );
 
     # Parse apply values
     while ( my ( $host, $request ) = each %reloadUrls ) {

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -635,7 +635,9 @@
 "registerDoneSubject":"عنوان البريد الذي تم القيام به",
 "registerTimeout":"مدة صلاحية طلب التسجيل",
 "registerUrl":"Page URL",
-"reloadUrls":"إعادة تحميل الإعدادات",
+"reloadParams":"إعادة تحميل الإعدادات",
+"reloadTimeout":"Reload timeout",
+"reloadUrls":"Reload URLs",
 "remoteCookieName":"اسم ملف تعريف الارتباط",
 "remoteGlobalStorage":"وحدة الجلسات",
 "remoteGlobalStorageOptions":"خيارات وحدة الجلسات",

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -635,7 +635,9 @@
 "registerDoneSubject":"Subject for done mail",
 "registerTimeout":"Validity time of a register request",
 "registerUrl":"Page URL",
-"reloadUrls":"Configuration reload",
+"reloadParams":"Configuration reload",
+"reloadTimeout":"Reload timeout",
+"reloadUrls":"Reload URLs",
 "remoteCookieName":"Cookie name",
 "remoteGlobalStorage":"Sessions module",
 "remoteGlobalStorageOptions":"Sessions module options",

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -635,7 +635,9 @@
 "registerDoneSubject":"Sujet du mail de prise en compte",
 "registerTimeout":"Durée de validité de la requête",
 "registerUrl":"URL de la page",
-"reloadUrls":"Mise à jour de la configuration",
+"reloadParams":"Mise à jour de la configuration",
+"reloadTimeout":"Délai de mise à jour",
+"reloadUrls":"URLs de mise à jour",
 "remoteCookieName":"Nom du cookie",
 "remoteGlobalStorage":"Module des sessions",
 "remoteGlobalStorageOptions":"Options du module des sessions",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -635,7 +635,9 @@
 "registerDoneSubject":"Oggetto per la mail inviata",
 "registerTimeout":"Tempo di validità di una richiesta di registrazione",
 "registerUrl":"Page URL",
-"reloadUrls":"Ricarica di configurazione",
+"reloadParams":"Ricarica di configurazione",
+"reloadTimeout":"Reload timeout",
+"reloadUrls":"Reload URLs",
 "remoteCookieName":"Nome del cookie",
 "remoteGlobalStorage":"Modulo di sessioni",
 "remoteGlobalStorageOptions":"Opzioni del modulo Sessioni",

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -635,7 +635,9 @@
 "registerDoneSubject":"Tiêu đề cho thư đã hoàn tất",
 "registerTimeout":"Thời hạn hiệu lực của yêu cầu đăng ký",
 "registerUrl":"Page URL",
-"reloadUrls":"Tải lại cấu hình",
+"reloadParams":"Tải lại cấu hình",
+"reloadTimeout":"Reload timeout",
+"reloadUrls":"Reload URLs",
 "remoteCookieName":"Tên cookie",
 "remoteGlobalStorage":"Mô-đun phiên",
 "remoteGlobalStorageOptions":"Tùy chọn mô-đun phiên",