Note: The default ITS GitLab runner is a shared resource and is subject to slowdowns during heavy usage.
You can run your own GitLab runner that is dedicated just to your group if you need to avoid processing delays.

Commit 176f9b6f authored by Rob Carleski's avatar Rob Carleski 🇮🇸
Browse files

Merge branch 'master' of gitlab.umich.edu:carleski/collab-admin-kit

parents 07cf901b f088c648
......@@ -88,19 +88,15 @@ class SharedAccount:
self.box_text = '''
Box-Specific Information:
- The ability to use Box Sync with shared accounts is disabled by default,
but allowed in certain circumstances; if you need this, please reply to this
message to discuss. Syncing the shared folder in your individual account is
always allowed.
- The ability to use Box Sync with shared accounts is disabled by default, but allowed in certain circumstances; if you need this, please reply to this message to discuss. Syncing the shared folder in your individual account is always allowed.
- Files placed in shared account folders are owned by the shared account.
- To learn more about using your shared account, visit the Shared U-M Box
Accounts section of the M+Box support site.
- To learn more about using your shared account, visit the Shared U-M Box Accounts section of the M+Box support site.
(http://www.itcs.umich.edu/storage/box/shared-accounts.php)
'''
''' # noqa: E501
if self.secure:
self.shared_box_folder.update_info({
'can_non_owners_invite': False,
......@@ -144,14 +140,14 @@ Accounts section of the M+Box support site.
content = '''
The folder "{}" is owned by the shared account "{}".
The initial co-owners on this folder are based on the owners listed on the
request form at the time this folder was created.
The initial co-owners on this folder are based on the owners listed on the request form at the time this folder was created.
The co-owners and members will NOT be kept in sync with MCommunity.
f you have any questions please contact the ITS Service Center:
http://its.umich.edu/help/'''.format(self.full_name, self.email)
http://its.umich.edu/help/'''.format( # noqa: E501
self.full_name, self.email)
stream.write(content)
self.shared_box_folder.upload(readme)
os.remove(readme)
......@@ -352,16 +348,15 @@ https://documentation.its.umich.edu/node/339/
exp_time = datetime.today() + timedelta(days=10)
with open(passFilePath, 'w') as passwordFile:
passwordFile.write('''
For security, this file will expire automatically on {}. Please store
this password somewhere safe. ITS has best practice recommendations for
doing so at the following URL:
For security, this file will expire automatically on {}. Please store this password somewhere safe. ITS has best practice recommendations for doing so at the following URL:
https://safecomputing.umich.edu/protect-yourself/manage-your-passwords
The password for your requested shared account is:
{}
'''.format(exp_time.strftime('%Y-%m-%d'), self.password))
'''.format( # noqa: E501
exp_time.strftime('%Y-%m-%d'), self.password))
upload_output = cmd([
self.config['google']['gam_command'],
......@@ -610,20 +605,17 @@ def main():
header_text = '''
Hello,
Your request has been completed. The password for your shared account
can be found at the following link:
Your request has been completed. The password for your shared account can be found at the following link:
https://docs.google.com/a/{}/file/d/{}
We recommend using a Chrome incognito window or separate browser to log
into your shared account. Please see below for more information about the
shared account created per your request:
We recommend using a Chrome incognito window or separate browser to log into your shared account. Please see below for more information about the shared account created per your request:
General Account Information:
- Display Name: {}
- Username: {}
- Email Address: {}
'''.format(
'''.format( # noqa: E501
config['google']['domain'],
pass_file_id,
sa.full_name,
......@@ -632,16 +624,12 @@ General Account Information:
)
footer_text = '''
Single-Sign On is used for both Box and Google, and the method of changing
the password is the same for both. For information on changing the password,
please check the documentation found here:
Single-Sign On is used for both Box and Google, and the method of changing the password is the same for both. For information on changing the password, please check the documentation found here:
https://documentation.its.umich.edu/node/339/#password
I will be closing this ticket now, as your request has been completed, but
feel free to reply back to this email if you have any questions or concerns
about your new account and the ticket will be re-opened.
'''
I will be closing this ticket now, as your request has been completed, but feel free to reply back to this email if you have any questions or concerns about your new account and the ticket will be re-opened.
''' # noqa: E501
print(
'========== CANNED TEXT ==========',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment