Faidon Liambotis has submitted this change and it was merged.
Change subject: swift: extend token validity 1d -> 7d
......................................................................
swift: extend token validity 1d -> 7d
This is especially useful during the sync process but it shouldn't hurt
in general.
Change-Id: I11d18bda356a92efba2ab0c39894933d197cfc5c
---
M templates/swift/proxy-server.conf.erb
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/templates/swift/proxy-server.conf.erb
b/templates/swift/proxy-server.conf.erb
index f810ab0..feabdd2 100644
--- a/templates/swift/proxy-server.conf.erb
+++ b/templates/swift/proxy-server.conf.erb
@@ -30,12 +30,14 @@
<% if scope.lookupvar("swift::proxy::config::auth_backend") == 'swauth' -%>
[filter:swauth]
use = egg:swauth#swauth
+token_life = 604800
default_swift_cluster = local#<%=
scope.lookupvar("swift::proxy::config::proxy_address") %>/v1
set log_name = swauth
super_admin_key = <%= scope.lookupvar("swift::proxy::config::super_admin_key")
%>
<% elsif scope.lookupvar("swift::proxy::config::auth_backend") == 'tempauth'
-%>
[filter:tempauth]
use = egg:swift#tempauth
+token_life = 604800
user_admin_admin = <%=
scope.lookupvar("swift::proxy::config::super_admin_key") %> .admin
.reseller_admin <%= scope.lookupvar("swift::proxy::config::proxy_address")
%>/v1/AUTH_admin
user_mw_media = <%= scope.lookupvar("swift::proxy::config::rewrite_password")
%> .admin <%= scope.lookupvar("swift::proxy::config::proxy_address")
%>/v1/AUTH_mw
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/87621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11d18bda356a92efba2ab0c39894933d197cfc5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
