[ARVADOS] created: da4c5f6695602d612b657f209f705d04fae5eb38

[git at public.curoverse.com]

        at  da4c5f6695602d612b657f209f705d04fae5eb38 (commit)


commit da4c5f6695602d612b657f209f705d04fae5eb38
Author: Tim Pierce <twp at curoverse.com>
Date:   Wed Jul 2 14:02:56 2014 -0400

    3151: use 2-week default permission TTL
    
    Fixes #3151.

diff --git a/services/api/app/models/blob.rb b/services/api/app/models/blob.rb
index c8a8865..7d16048 100644
--- a/services/api/app/models/blob.rb
+++ b/services/api/app/models/blob.rb
@@ -43,7 +43,7 @@ class Blob
       end
       timestamp = opts[:expire]
     else
-      timestamp = Time.now.to_i + (opts[:ttl] || 600)
+      timestamp = Time.now.to_i + (opts[:ttl] || 1209600)
     end
     timestamp_hex = timestamp.to_s(16)
     # => "53163cb4"
diff --git a/services/keep/src/keep/keep.go b/services/keep/src/keep/keep.go
index 429a7e0..2a4b28b 100644
--- a/services/keep/src/keep/keep.go
+++ b/services/keep/src/keep/keep.go
@@ -149,7 +149,7 @@ func main() {
 	flag.IntVar(
 		&permission_ttl_sec,
 		"permission-ttl",
-		300,
+		1209600,
 		"Expiration time (in seconds) for newly generated permission "+
 			"signatures.")
 	flag.BoolVar(

-----------------------------------------------------------------------


hooks/post-receive
--