diff options
author | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
commit | a357e5b284ed5b752864e4570cb179f3f2d88229 (patch) | |
tree | e811ea2288b5dfa069908f25f696f795a268cb53 /config/config.sample.php | |
parent | 832779804d36d27c47325d1dcce09e566c8cee60 (diff) | |
parent | 5387e5c354440b264040816ea7fcaf6783a2ebdc (diff) | |
download | nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.tar.gz nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.zip |
merge conflicts ...
Diffstat (limited to 'config/config.sample.php')
-rw-r--r-- | config/config.sample.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 2812d848133..cacca78e970 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -145,6 +145,9 @@ $CONFIG = array( /* Lifetime of the remember login cookie, default is 15 days */ "remember_login_cookie_lifetime" => 60*60*24*15, +/* Life time of a session after inactivity */ +"session_lifetime" => 60 * 60 * 24, + /* Custom CSP policy, changing this will overwrite the standard policy */ "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *", |