move tokens_validity_period in service section

bin/access-check-manager.pl.in

@@ -320,7 +320,7 @@ sub add_token {
     }
 
     # compute a new token
-    my $validity_period = $configuration->{_}->{tokens_validity_period};
+    my $validity_period = $configuration->{service}->{tokens_validity_period};
     my $token = AccountManager::Token->new(
         db              => $db,
         email_address   => $options{email_address},

conf/manager.conf.in

-
-# Token validity period, in hours
-tokens_validity_period = 2
-
 [app]
 support_email = support@my.fqdn
 
@@ -35,8 +31,10 @@ displayname = eduGAIN Access Check
 
 # default parameters for all services
 [service]
-# validity period of test accounts, in days
+# test accounts validity period, in days
 account_validity_period = 7
+# token validity period, in hours
+tokens_validity_period = 2
 # valid account profiles
 account_profiles = fullset1, limitedset1, generic1, student1, student2, teacher1, teacher2, alumni1, librarywalkin1, employee1, researcher1
 # override contacts defined in metadata if defined

lib/AccountManager/App.pm

@@ -398,7 +398,7 @@ sub req_complete_challenge {
 
     # compute a new token
     my $validity_period =
-        $self->{configuration}->{_}->{tokens_validity_period};
+        $self->{configuration}->{service}->{tokens_validity_period};
     my $token = AccountManager::Token->new(
         db              => $self->{db},
         email_address   => $self->{in}->{email},