Merge branch 'tomsaleeba-patch-1' of https://github.com/tomsaleeba/d1_python into tomsaleeba-tomsaleeba-patch-1

rogerdahl · rogerdahl · commit ba40d2187b4d · 2020-08-02T22:02:21.000-06:00
diff --git a/gmn/doc/operation/authn-and-authz.rst b/gmn/doc/operation/authn-and-authz.rst
@@ -52,7 +52,7 @@ To create a whitelist with this subject, first create a file, for instance,
 ``gmn`` folder::
 
   sudo -Hu gmn bash -c '
-    cd /var/local/dataone/gmn_venv_py3/lib/python3.6/site-packages/gmn
+    cd /var/local/dataone/gmn_venv_py3/lib/python3.6/site-packages/d1_gmn
     nano whitelist.txt
   '
 
@@ -63,7 +63,7 @@ Blank lines and lines starting with "#" are ignored in the whitelist file, allow
 
 Then, add the entries in the whitelist text file to GMN's database with the following command::
 
-  $ python manage.py set_whitelist whitelist.txt
+  $ python manage.py whitelist bulk whitelist.txt
 
 Any existing subjects in the database are cleared before adding the subjects from the whitelist file. So subjects can be added or removed from the whitelist by adding or removing them in the file and then synchronizing with the database by running the command above.
 
diff --git a/gmn/doc/setup/migrate.rst b/gmn/doc/setup/migrate.rst
@@ -79,3 +79,4 @@ Notes:
   in the import. To avoid issues such as lost objects, events and system metadata
   updates, it may be necessary to restrict access to the source MN during the
   transition.
+
diff --git a/gmn/doc/setup/ubuntu/upgrade/gmn.rst b/gmn/doc/setup/ubuntu/upgrade/gmn.rst
@@ -67,6 +67,6 @@ Switch the GMN version served by Apache to v1::
 Disable v2 services for this MN in the CN Node registry::
 
     $ sudo -u gmn /var/local/dataone/gmn/bin/python \
-    /var/local/dataone/gmn/lib/python3.6/site-packages/gmn/manage.py \
+    /var/local/dataone/gmn/lib/python3.6/site-packages/d1_gmn/manage.py \
     register_node_with_dataone --update
 
