Merge pull request #257 from UPC/246_timeout

246 timeout
UPC · May 31, 2017 · da21bcc · da21bcc
2 parents 085dd8a + 37fd2f6
commit da21bcc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bin/rvd_back.pl b/bin/rvd_back.pl
@@ -165,7 +165,8 @@ sub change_password {
     chomp $login;
     return if !$login;
 
-    my $ravada = Ravada->new(config => $FILE_CONFIG);
+    my $ravada = Ravada->new( config => $FILE_CONFIG );
+
     my $user = Ravada::Auth::SQL->new(name => $login);
     die "ERROR: Unknown user '$login'\n" if !$user->id;
 

diff --git a/etc/rvd_front.conf.example b/etc/rvd_front.conf.example
@@ -11,4 +11,6 @@
   ,group => 'ravada'
   ,secrets => ['changeme1','changeme2']
   ,login_custom => ''
+  ,session_timeout => 5*60
+  ,session_timeout_admin => 15*60
 };
diff --git a/rvd_front.pl b/rvd_front.pl
@@ -85,9 +85,9 @@
 our $DOCUMENT_ROOT = "/var/www";
 
 # session times out in 5 minutes
-our $SESSION_TIMEOUT = 5 * 60;
+our $SESSION_TIMEOUT = ($CONFIG_FRONT->{session_timeout} or 5 * 60);
 # session times out in 15 minutes for admin users
-our $SESSION_TIMEOUT_ADMIN = 15 * 60;
+our $SESSION_TIMEOUT_ADMIN = ($CONFIG_FRONT->{session_timeout_admin} or 15 * 60);
 
 init();
 ############################################################################3
@@ -805,7 +805,6 @@ sub quick_start_domain {
 
     return show_failure($c, $domain_name) if !$domain;
 
-    $c->session(expiration => 60) if !$USER->is_admin;
     return show_link($c,$domain);
 
 }