|
@@ -150,7 +150,7 @@ def get_key_expiry():
|
|
|
return 86400
|
|
return 86400
|
|
|
|
|
|
|
|
|
|
|
|
|
-HAS_IAM_DETECTION=Config(
|
|
|
|
|
|
|
+HAS_IAM_DETECTION = Config(
|
|
|
help=_('Enable the detection of an IAM role providing the credentials automatically. It can take a few seconds.'),
|
|
help=_('Enable the detection of an IAM role providing the credentials automatically. It can take a few seconds.'),
|
|
|
key='has_iam_detection',
|
|
key='has_iam_detection',
|
|
|
default=False,
|
|
default=False,
|
|
@@ -245,7 +245,9 @@ AWS_ACCOUNTS = UnspecifiedConfigSection(
|
|
|
type=coerce_bool
|
|
type=coerce_bool
|
|
|
),
|
|
),
|
|
|
KEY_EXPIRY=Config(
|
|
KEY_EXPIRY=Config(
|
|
|
- help=_('The time in seconds before a delegate key is expired. Used when filebrowser/redirect_download is used. Default to 4 Hours.'),
|
|
|
|
|
|
|
+ help=_(
|
|
|
|
|
+ 'The time in seconds before a delegate key is expired. Used when filebrowser/redirect'
|
|
|
|
|
+ 'download is used. Default to 4 Hours.'),
|
|
|
key='key_expiry',
|
|
key='key_expiry',
|
|
|
default=14400,
|
|
default=14400,
|
|
|
type=int
|
|
type=int
|
|
@@ -257,7 +259,7 @@ AWS_ACCOUNTS = UnspecifiedConfigSection(
|
|
|
|
|
|
|
|
def is_enabled():
|
|
def is_enabled():
|
|
|
return ('default' in list(AWS_ACCOUNTS.keys()) and AWS_ACCOUNTS['default'].get_raw() and AWS_ACCOUNTS['default'].ACCESS_KEY_ID.get()) or \
|
|
return ('default' in list(AWS_ACCOUNTS.keys()) and AWS_ACCOUNTS['default'].get_raw() and AWS_ACCOUNTS['default'].ACCESS_KEY_ID.get()) or \
|
|
|
- has_iam_metadata()
|
|
|
|
|
|
|
+ has_iam_metadata() or conf_idbroker.is_idbroker_enabled('s3a')
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_ec2_instance():
|
|
def is_ec2_instance():
|