dani/vroom
1
0
Fork 0
mirror of https://github.com/dani/vroom.git synced 2024-06-23 18:19:12 +02:00
Code Issues Projects Releases Wiki Activity

Fix inactivity timeouts

Browse Source 
which are now expressed in minutes, not seconds
This commit is contained in:
Daniel Berteaud 2014-10-19 13:02:01 +02:00
parent 18d76a597f
commit 45794f4127
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/settings.ini.dist
View File

@ -40,9 +40,9 @@
[rooms]
; After this amount of time in minutes, rooms without any activity will be purged
;inactivity_timeout = '3600'
;inactivity_timeout = '60'
; You can also purge reserved rooms
;reserved_inactivity_imeout = '5184000'
;reserved_inactivity_timeout = '86400'
; A comma separated list of room names you don't want to be reservable
;common_names = 'test,test1,test123,0,1,2,3,4,5,6,7,8,9,123,1234,12345,a,aa,abc,azerty,qwerty,vroom,foo,bar,baz'

4
templates/default/owner_password_modal.html.ep
View File

@ -15,12 +15,12 @@
<%=l 'SET_OWNER_PASS' %>
<ul>
<li>
<%= sprintf($self->l('A_STANDARD_ROOM_EXPIRES_AFTER_d'), int($config->{'rooms.inactivity_timeout'}/3600)) %>
<%= sprintf($self->l('A_STANDARD_ROOM_EXPIRES_AFTER_d'), int($config->{'rooms.inactivity_timeout'}/60)) %>
</li>
<li>
<%=l 'A_RESERVED_ROOM' %>
<% if ($config->{'rooms.reserved_inactivity_timeout'} > 0){ %>
<%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{'reserved_inactivity_timeout'}/(3600*24))) %>
<%= sprintf($self->l('EXPIRE_AFTER_d'), int($config->{'rooms.reserved_inactivity_timeout'}/(60*24))) %>
<% } else{ %>
<%=l 'WILL_NEVER_EXPIRE' %>
<% } %>

4
vroom.pl
View File

@ -39,8 +39,8 @@ $config->{'interface.template'} ||= 'default';
$config->{'interface.chrome_extension_id'} ||= 'ecicdpoejfllflombfanbhfpgcimjddn';
$config->{'cookie.secret'} ||= 'secret';
$config->{'cookie.name'} ||= 'vroom';
$config->{'rooms.inactivity_timeout'} ||= 3600;
$config->{'rooms.reserved_inactivity_timeout'} ||= 5184000;
$config->{'rooms.inactivity_timeout'} ||= 60;
$config->{'rooms.reserved_inactivity_timeout'} ||= 86400;
$config->{'rooms.common_names'} ||= '';
$config->{'log.level'} ||= 'info';
$config->{'etherpad.uri'} ||= '';