deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-05-12 04:07:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updated branding (#1261)

Browse Source 
* Update branding

* Update branding

* Update branding

* Update branding

* Update branding

* Update var.py
This commit is contained in:
Max Mathieu 2020-10-09 10:32:37 -04:00 committed by GitHub
parent 07c57d4197
commit bf29a56aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
GAM is a command line tool for Google G Suite Administrators to manage domain and user settings quickly and easily. [![Build Status](https://travis-ci.org/jay0lee/GAM.svg?branch=master)](https://travis-ci.org/jay0lee/GAM) GAM is a command line tool for Google Workspace (fka G Suite) Administrators to manage domain and user settings quickly and easily. [![Build Status](https://travis-ci.org/jay0lee/GAM.svg?branch=master)](https://travis-ci.org/jay0lee/GAM)
# Quick Start # Quick Start
## Linux / MacOS ## Linux / MacOS
Open a terminal and run: Open a terminal and run:

8
src/gam-install.sh
View File

@ -288,7 +288,7 @@ while true; do
case $yn in case $yn in
[Yy]*) [Yy]*)
if [ "$adminuser" == "" ]; then if [ "$adminuser" == "" ]; then
read -p "Please enter your G Suite admin email address: " adminuser read -p "Please enter your Google Workspace admin email address: " adminuser
fi fi
"$target_dir/gam/gam" create project $adminuser "$target_dir/gam/gam" create project $adminuser
rc=$? rc=$?
@ -312,7 +312,7 @@ done
admin_authorized=false admin_authorized=false
while $project_created; do while $project_created; do
read -p "Are you ready to authorize GAM to perform G Suite management operations as your admin account? (yes or no) " yn read -p "Are you ready to authorize GAM to perform Google Workspace management operations as your admin account? (yes or no) " yn
case $yn in case $yn in
[Yy]*) [Yy]*)
"$target_dir/gam/gam" oauth create $adminuser "$target_dir/gam/gam" oauth create $adminuser
@ -337,11 +337,11 @@ done
service_account_authorized=false service_account_authorized=false
while $project_created; do while $project_created; do
read -p "Are you ready to authorize GAM to manage G Suite user data and settings? (yes or no) " yn read -p "Are you ready to authorize GAM to manage Google Workspace user data and settings? (yes or no) " yn
case $yn in case $yn in
[Yy]*) [Yy]*)
if [ "$regularuser" == "" ]; then if [ "$regularuser" == "" ]; then
read -p "Please enter the email address of a regular G Suite user: " regularuser read -p "Please enter the email address of a regular Google Workspace user: " regularuser
fi fi
echo_yellow "Great! Checking service account scopes.This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console." echo_yellow "Great! Checking service account scopes.This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console."
"$target_dir/gam/gam" user $adminuser check serviceaccount "$target_dir/gam/gam" user $adminuser check serviceaccount

8
src/gam-setup.bat
View File

@ -27,7 +27,7 @@
@ goto createproject @ goto createproject
) )
@echo( @echo(
@set /p adminemail= "Please enter your G Suite admin email address: " @set /p adminemail= "Please enter your Google Workspace admin email address: "
@gam create project %adminemail% @gam create project %adminemail%
@if not ERRORLEVEL 1 goto projectdone @if not ERRORLEVEL 1 goto projectdone
@echo( @echo(
@ -37,7 +37,7 @@
:adminauth :adminauth
@echo( @echo(
@set /p yn= "Are you ready to authorize GAM to perform G Suite management operations as your admin account? [y or n] " @set /p yn= "Are you ready to authorize GAM to perform Google Workspace management operations as your admin account? [y or n] "
@if /I "%yn%"=="n" ( @if /I "%yn%"=="n" (
@ echo( @ echo(
@ echo You can authorize an admin later by running: @ echo You can authorize an admin later by running:
@ -59,7 +59,7 @@
:saauth :saauth
@echo( @echo(
@set /p yn= "Are you ready to authorize GAM to manage G Suite user data and settings? [y or n] " @set /p yn= "Are you ready to authorize GAM to manage Google Workspace user data and settings? [y or n] "
@if /I "%yn%"=="n" ( @if /I "%yn%"=="n" (
@ echo( @ echo(
@ echo You can authorize a service account later by running: @ echo You can authorize a service account later by running:
@ -73,7 +73,7 @@
@ goto saauth @ goto saauth
) )
@echo( @echo(
@set /p regularuser= "Please enter the email address of a regular G Suite user: " @set /p regularuser= "Please enter the email address of a regular Google Workspace user: "
@echo Great! Checking service account scopes. This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console. @echo Great! Checking service account scopes. This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console.
@gam user %regularuser% check serviceaccount @gam user %regularuser% check serviceaccount
@if not ERRORLEVEL 1 goto sadone @if not ERRORLEVEL 1 goto sadone

2
src/gam/__main__.py
View File

@ -16,7 +16,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
"""GAM is a command line tool which allows Administrators to control their G Suite domain and accounts. """GAM is a command line tool which allows Administrators to control their Google Workspace domain and accounts.
With GAM you can programmatically create users, turn on/off services for users like POP and Forwarding and much more. With GAM you can programmatically create users, turn on/off services for users like POP and Forwarding and much more.
For more information, see https://git.io/gam For more information, see https://git.io/gam

2
src/gam/gapi/siteverification.py
View File

@ -184,5 +184,5 @@ def update():
pass pass
print() print()
print( print(
f'You can now add {a_domain} or it\'s subdomains as secondary or domain aliases of the {GC_Values[GC_DOMAIN]} G Suite Account.' f'You can now add {a_domain} or it\'s subdomains as secondary or domain aliases of the {GC_Values[GC_DOMAIN]} Google Workspace Account.'
) )

8
src/gam/var.py
View File

@ -117,7 +117,7 @@ SKUS = {
'1010020020': { '1010020020': {
'product': 'Google-Apps', 'product': 'Google-Apps',
'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise'], 'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise'],
'displayName': 'G Suite Enterprise' 'displayName': 'Google Workspace Enterprise Plus (fka G Suite Enterprise)'
}, },
'1010340002': { '1010340002': {
'product': '101034', 'product': '101034',
@ -127,7 +127,7 @@ SKUS = {
'1010340001': { '1010340001': {
'product': '101034', 'product': '101034',
'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'],
'displayName': 'G Suite Enterprise Archived' 'displayName': 'Google Workspace Enterprise Plus Archived'
}, },
'1010060001': { '1010060001': {
'product': '101006', 'product': '101006',
@ -135,7 +135,7 @@ SKUS = {
'gsuiteessentials', 'essentials', 'd4e', 'driveenterprise', 'gsuiteessentials', 'essentials', 'd4e', 'driveenterprise',
'drive4enterprise' 'drive4enterprise'
], ],
'displayName': 'G Suite Essentials' 'displayName': 'Google Workspace Essentials'
}, },
'Google-Drive-storage-20GB': { 'Google-Drive-storage-20GB': {
'product': 'Google-Drive-storage', 'product': 'Google-Drive-storage',
@ -210,7 +210,7 @@ PRODUCTID_NAME_MAPPINGS = {
'101031': 'G Suite Enterprise for Education', '101031': 'G Suite Enterprise for Education',
'101033': 'Google Voice', '101033': 'Google Voice',
'101034': 'G Suite Archived', '101034': 'G Suite Archived',
'Google-Apps': 'G Suite', 'Google-Apps': 'Google Workspace',
'Google-Chrome-Device-Management': 'Google Chrome Device Management', 'Google-Chrome-Device-Management': 'Google Chrome Device Management',
'Google-Coordinate': 'Google Coordinate', 'Google-Coordinate': 'Google Coordinate',
'Google-Drive-storage': 'Google Drive Storage', 'Google-Drive-storage': 'Google Drive Storage',