Skip to content

Commit

Permalink
[#1943] Inactive by default (non-expiring)
Browse files Browse the repository at this point in the history
  • Loading branch information
brew committed Oct 30, 2014
1 parent 3ba87f8 commit 70ca1e6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions ckan/config/deployment.ini_tmpl
Expand Up @@ -40,8 +40,9 @@ app_instance_uuid = ${app_instance_uuid}
who.config_file = %(here)s/who.ini
who.log_level = warning
who.log_file = %(cache_dir)s/who_log.ini
# Session timeout (user logged out after period of inactivity, in seconds)
who.timeout = 3600
# Session timeout (user logged out after period of inactivity, in seconds).
# Inactive by default, so the session doesn't expire.
# who.timeout = 86400

## Database Settings
sqlalchemy.url = postgresql://ckan_default:pass@localhost/ckan_default
Expand Down
4 changes: 2 additions & 2 deletions ckan/config/who.ini
Expand Up @@ -6,10 +6,10 @@ use = ckan.config.middleware:ckan_auth_tkt_make_app
# If no timeout or reissue_time is defined here, who.timeout and
# who.reissue_time will be used.
# Timeout set in seconds before a non-active session expires (optional).
#timeout = 3600 ;One hour
#timeout = 86400 ;One day
# Time before a session ticket is reissued (optional). If not defined,
# this will be set to 1/10th the timeout value.
#reissue_time = 360
#reissue_time = 8640

[plugin:friendlyform]
use = repoze.who.plugins.friendlyform:FriendlyFormPlugin
Expand Down
6 changes: 3 additions & 3 deletions doc/maintaining/configuration.rst
Expand Up @@ -72,11 +72,11 @@ Example::

who.timeout = 3600

Default value: 3600
Default value: None

This defines how long (in seconds) until a user is logged out after a period
of inactivity. If this isn't defined, the session doesn't expire. Default
value is 3600 seconds (1 hour).
of inactivity. If the setting isn't defined, the session doesn't expire. Not
active by default.


Database Settings
Expand Down

0 comments on commit 70ca1e6

Please sign in to comment.