Merge pull request #410 from gravitl/develop

Develop

docs/_build/html/_sources/oauth.rst.txt

@@ -44,7 +44,7 @@ Next, Configure Netmaker with the following environment variables. If any are le
     AUTH_PROVIDER="<azure-ad|github|google>"
     CLIENT_ID="<client id of your oauth provider>"
     CLIENT_SECRET="<client secret of your oauth provider>"
-    SERVER_API_CONN_STRING="https://<your-netmaker-api-domain>"
+    SERVER_HTTP_HOST="https://<your-netmaker-api-domain>"
     FRONTEND_URL="https://<your-netmaker-dashboard-domain>"
 
 
@@ -66,12 +66,12 @@ Admins must navigate to the "Users" screen to configure permissions.
 
 For each user, an admin must specify which networks that user has access to configure. Additionally, an Admin can elevate a user to Admin permissions.
 
-.. image:: images/oauth2.png
+.. image:: images/oauth3.png
    :width: 80%
-   :alt: Edit User
+   :alt: Edit User 2
    :align: center
 
-.. image:: images/oauth3.png
+.. image:: images/oauth2.png
    :width: 80%
-   :alt: Edit User 2
+   :alt: Edit User
    :align: center

docs/_build/html/oauth.html

@@ -868,7 +868,7 @@ Instructions for Microsoft Azure AD: <a class="reference external" href="https:/
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">AUTH_PROVIDER</span><span class="o">=</span><span class="s2">"&lt;azure-ad|github|google&gt;"</span>
 <span class="n">CLIENT_ID</span><span class="o">=</span><span class="s2">"&lt;client id of your oauth provider&gt;"</span>
 <span class="n">CLIENT_SECRET</span><span class="o">=</span><span class="s2">"&lt;client secret of your oauth provider&gt;"</span>
-<span class="n">SERVER_API_CONN_STRING</span><span class="o">=</span><span class="s2">"https://&lt;your-netmaker-api-domain&gt;"</span>
+<span class="n">SERVER_HTTP_HOST</span><span class="o">=</span><span class="s2">"https://&lt;your-netmaker-api-domain&gt;"</span>
 <span class="n">FRONTEND_URL</span><span class="o">=</span><span class="s2">"https://&lt;your-netmaker-dashboard-domain&gt;"</span>
 </pre></div>
 </div>
@@ -881,8 +881,8 @@ Instructions for Microsoft Azure AD: <a class="reference external" href="https:/
 <p>All users logging in will have zero permissions on first sign-in. An admin must configure all user permissions.</p>
 <p>Admins must navigate to the “Users” screen to configure permissions.</p>
 <p>For each user, an admin must specify which networks that user has access to configure. Additionally, an Admin can elevate a user to Admin permissions.</p>
-<a class="reference internal image-reference" href="_images/oauth2.png"><img alt="Edit User" class="align-center" src="_images/oauth2.png" style="width: 80%;"/></a>
 <a class="reference internal image-reference" href="_images/oauth3.png"><img alt="Edit User 2" class="align-center" src="_images/oauth3.png" style="width: 80%;"/></a>
+<a class="reference internal image-reference" href="_images/oauth2.png"><img alt="Edit User" class="align-center" src="_images/oauth2.png" style="width: 80%;"/></a>
 
 
 

docs/oauth.rst

@@ -44,7 +44,7 @@ Next, Configure Netmaker with the following environment variables. If any are le
     AUTH_PROVIDER="<azure-ad|github|google>"
     CLIENT_ID="<client id of your oauth provider>"
     CLIENT_SECRET="<client secret of your oauth provider>"
-    SERVER_API_CONN_STRING="https://<your-netmaker-api-domain>"
+    SERVER_HTTP_HOST="https://<your-netmaker-api-domain>"
     FRONTEND_URL="https://<your-netmaker-dashboard-domain>"
 
 
@@ -66,12 +66,12 @@ Admins must navigate to the "Users" screen to configure permissions.
 
 For each user, an admin must specify which networks that user has access to configure. Additionally, an Admin can elevate a user to Admin permissions.
 
-.. image:: images/oauth2.png
+.. image:: images/oauth3.png
    :width: 80%
-   :alt: Edit User
+   :alt: Edit User 2
    :align: center
 
-.. image:: images/oauth3.png
+.. image:: images/oauth2.png
    :width: 80%
-   :alt: Edit User 2
+   :alt: Edit User
    :align: center