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 c8a886554f1b55264b26d7bd46c2dbd5f2ea7650..7d16048bf81a29d8a806caa5904e2870a42fbf6e 100644 (file)
--- 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 429a7e01b29b517e8757427412654e0d18dada67..2a4b28b2cf0345d92f3f178d9891142382611f24 100644 (file)
--- 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(