Skip to content

Commit 3ac1d89

Browse files
author
Max Ma
committed
misc updates for doc structure
1 parent 5ffccc8 commit 3ac1d89

10 files changed

+66
-134
lines changed

features.rst

+10-12
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,32 @@
22
Features
33
=========
44

5-
User Management
6-
===============
7-
85
.. toctree::
96
:maxdepth: 1
107

118
user-management
9+
egress-gateway
10+
external-clients
11+
acls
12+
pro/index
13+
14+
**User Management**
1215

16+
:ref:`user-manage`
1317

14-
Egress Gateway
15-
===============
18+
**Egress Gateway**
1619

1720
Allows clients (nodes and ext clients) to reach external networks.
1821

1922
:ref:`egress`
2023

21-
22-
Remote Access Gateways & Clients
23-
=================================
24+
**Remote Access Gateways & Clients**
2425

2526
A remote access gateway enables "external" clients to connect to the network. External clients refer to clients that are not part of the mesh network, but need to connect to it. This could be a laptop, mobile device, or even a server that is not part of the network.
2627

2728
:ref:`remote-access`
2829

29-
30-
31-
Access Control Lists
32-
======================
30+
**Access Control Lists**
3331

3432
ACLs control communications between nodes on a network
3533

how-to-guides.rst

+15-29
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,40 @@
22
How-to-Guides
33
==============
44

5+
.. toctree::
6+
:maxdepth: 1
7+
8+
integrating-non-native-devices
9+
usage
510

6-
Egress Gateway
7-
===============
11+
**Egress Gateway**
812

913

1014
Netmaker allows your clients to reach external networks via an Egress Gateway. The Egress Gateway is a netclient which has been deployed to a server or router with access to a given subnet.
1115

1216
In the Netmaker UI, that node is set as an "egress gateway." Range(s) are specified which this node has access to. Once created, all clients (and all new ext clients) in the network will be able to reach those ranges via the gateway.
1317

14-
.. toctree::
15-
:maxdepth: 2
16-
17-
egress-gateway
18+
:ref:`egress`
1819

19-
Remote Access Gateway/External Clients
20-
======================================
20+
**Remote Access Gateway/External Clients**
2121

2222
Netmaker allows for "external clients" to reach into a network and access services via an Remote Access Gateway. So what is an "external client"? An external client is any machine which cannot or should not be meshed. This can include:
2323
- Phones
2424
- Laptops
2525
- Desktops
2626

27-
.. toctree::
28-
:maxdepth: 2
27+
:ref:`remote-access`
2928

30-
external-clients
29+
**Access Control Lists**
3130

32-
Access Control Lists
33-
======================
3431
By default, Netmaker creates a "full mesh," meaning every node in your network can talk to every other node. You don't always want this to be the case. Sometimes, only some connections should be valid. That's why Netmaker has ACLs. By using Netmaker's ACL feature, you can enable/disable any peer-to-peer connection in your network to remove its ability to communicate.
3532

36-
.. toctree::
37-
:maxdepth: 2
33+
:ref:`acls`
3834

39-
acls
35+
**Integrating Non-native Devices**
4036

41-
Integrating Non-native Devices
42-
===============================
37+
:ref:`integrating-non-native-devices`
4338

44-
.. toctree::
45-
:maxdepth: 1
46-
47-
integrating-non-native-devices
39+
**External Guides**
4840

49-
External Guides
50-
================
51-
52-
.. toctree::
53-
:maxdepth: 2
54-
55-
usage
41+
:ref:`usage`

netclient.rst

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _netclient:
2+
13
==========
24
Netclient
35
==========

pro/index.rst

+16-72
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,28 @@
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.
55
6+
=====================
7+
Netmaker Professional
8+
=====================
9+
10+
.. toctree::
11+
:maxdepth: 1
12+
13+
pro-setup
14+
pro-users
15+
pro-relay-server
16+
pro-metrics
17+
pro-branding
18+
rac
19+
pro-failovers
20+
internet-gateways
21+
622

723
.. image:: ../images/netmaker.png
824
:width: 100%
925
:alt: Netmaker WireGuard
1026
:align: center
1127

12-
Netmaker Professional
13-
======================
14-
1528
Netmaker Professional is our advanced Netmaker offering for business use cases. It offers all the features of community edition plus:
1629

1730
- **Metrics:** Nodes collect networking metrics such as latency, transfer, and connectivity status. These are displayed in the Netmaker UI, and also exported to Grafana via Prometheus.
@@ -26,72 +39,3 @@ Netmaker Professional is our advanced Netmaker offering for business use cases.
2639

2740
- **Internet Gateways:** These work similar to traditional VPNs, and can work with netclients (hosts in the mesh network) as well as with remote devices connected to the network via client configs.
2841

29-
30-
Setup
31-
--------
32-
33-
How to set up Netmaker Professional
34-
35-
.. toctree::
36-
:maxdepth: 2
37-
38-
pro-setup
39-
40-
Users
41-
---------------
42-
43-
.. toctree::
44-
:maxdepth: 2
45-
46-
pro-users
47-
48-
Relays
49-
---------------
50-
51-
.. toctree::
52-
:maxdepth: 2
53-
54-
pro-relay-server
55-
56-
Metrics
57-
------------------------------------
58-
59-
How to view network metrics in Netmaker Professional
60-
61-
62-
.. toctree::
63-
:maxdepth: 2
64-
65-
pro-metrics
66-
67-
Branding
68-
------------
69-
70-
.. toctree::
71-
:maxdepth: 2
72-
73-
pro-branding
74-
75-
Remote Access Client
76-
-----------------------
77-
78-
.. toctree::
79-
:maxdepth: 2
80-
81-
rac
82-
83-
FailOvers
84-
-----------------------
85-
86-
.. toctree::
87-
:maxdepth: 2
88-
89-
pro-failovers
90-
91-
Internet Gateways
92-
-----------------------
93-
94-
.. toctree::
95-
:maxdepth: 2
96-
97-
internet-gateways

pro/internet-gateways.rst

+3-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ This behaviour also happens with remote access gateways and their connected clie
2222
Usage
2323
======
2424

25-
Create an internet gateway
26-
--------------------------
25+
**Create an internet gateway**
2726

2827
.. image:: images/inet-gw-create.png
2928
:alt: internet gateway creation
@@ -41,8 +40,7 @@ Create an internet gateway
4140
**NOTE:** A host already connected to an internet gateway cannot be a gateway itself. ie: internet gateway chaining is not supported currently.
4241

4342

44-
Update an internet gateway
45-
--------------------------
43+
**Update an internet gateway**
4644

4745
.. image:: images/inet-gw-update.png
4846
:alt: internet gateway update
@@ -54,8 +52,7 @@ Update an internet gateway
5452
3. Update the gateway and save changes
5553

5654

57-
Delete an internet gateway
58-
--------------------------
55+
**Delete an internet gateway**
5956

6057
.. image:: images/inet-gw-delete.png
6158
:alt: internet gateway deletion

pro/pro-setup.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
=================================
2-
Netmaker Professional
3-
=================================
1+
===========================
2+
Netmaker Professional Setup
3+
===========================
44

55
This guide covers how to get setup with Netmaker Professional. For pricing,visit `our pricing page <https://www.netmaker.io/pricing>`_
66

@@ -100,4 +100,4 @@ In Netmaker.env, change the following:
100100
.. code-block::
101101
102102
METRICS_EXPORTER=on
103-
PROMETHEUS=on
103+
PROMETHEUS=on

pro/pro-users.rst

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
Users in Netmaker Professional
55
---------------------------------
6+
67
Netmaker Professional offers advanced user management features. The super admin can create users with either a user or admin role. Only Admins can access the dashboard, the normal users can use remote access client to join the network through a gateway.
78
Admins can add users and assign them to remote access gateways, which includes managing the user's access to different remote access gateways.
89

@@ -14,8 +15,10 @@ Here is a breakdown of the different user types and their permissions:
1415

1516
* Super Admin: Super admins have full access to Netmaker. They can create and manage users, admins, networks, and gateways. They can also manage user and admin permissions.
1617

18+
1719
Adding users
18-
---------------
20+
============
21+
1922
To add a user, go to the Users section and click the Add User button. Fill in the user's details, including their name, password, and role.
2023

2124
* As a super admin, you can add users with the role of admin or user.
@@ -29,7 +32,8 @@ To add a user, go to the Users section and click the Add User button. Fill in th
2932
The credentials will need to be shared with the added user.
3033

3134
Attaching or removing user from a remote access gateway
32-
------------------------------------------------------------
35+
=======================================================
36+
3337
To attach users to a remote access gateway or remove users from a gateway, you will need to have the gateway set up.
3438
Once the remote access gateway is set up, you will see an option to attach or remove users from the gateway's dropdown menu on the table row.
3539

@@ -47,7 +51,7 @@ You can click the button to either attach or remove a user
4751

4852

4953
Transferring super admin rights
50-
----------------------------------
54+
===============================
5155

5256
Super admin rights can be transferred only to another admin. To do this, on the users page, go to the superadmin row and hover over the ellipsis.
5357
You will see an option to transfer admin rights. On clicking it, a dialog box will open allowing you to select any admin

references.rst

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ Netclient
2626
===========
2727
Netclient manages WireGuard on client devices (nodes)
2828

29-
.. toctree::
30-
:maxdepth: 2
31-
32-
netclient
29+
:ref:`netclient`
3330

3431
NMCTL
3532
======

usage.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _usage:
2+
13
=================
24
External Guides
35
=================
@@ -18,4 +20,4 @@ Written Tutorials
1820

1921
* `K3s Cross-cloud cluster <https://itnext.io/how-to-deploy-a-single-kubernetes-cluster-across-multiple-clouds-using-k3s-and-wireguard-a5ae176a6e81>`_: Tutorial on setting up cross-cloud K3s clusters using Netmaker.
2022
* `MicroK8s Cross-cloud cluster <https://itnext.io/how-to-deploy-a-cross-cloud-kubernetes-cluster-with-built-in-disaster-recovery-bbce27fcc9d7>`_: Tutorial on setting up cross-cloud MicroK8s clusters using Netmaker.
21-
* `Secure access to private services <https://afeiszli.medium.com/how-to-enable-secure-access-to-your-hosted-services-using-netmaker-and-wireguard-1b3282d4b7aa>`_: Tutorial on setting up secure Nextcloud with Netmaker.
23+
* `Secure access to private services <https://afeiszli.medium.com/how-to-enable-secure-access-to-your-hosted-services-using-netmaker-and-wireguard-1b3282d4b7aa>`_: Tutorial on setting up secure Nextcloud with Netmaker.

user-management.rst

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
.. _user-manage:
2+
13
======================
24
User Management
35
======================
46

5-
Superadmin Signup
6-
==================
7+
**Superadmin Signup**
8+
79

810

911

@@ -31,4 +33,4 @@ Input your username and a super memorable but strong password then click on the
3133

3234

3335
.. include:: pro/rac.rst
34-
:start-after: .. include_after_this_label
36+
:start-after: .. include_after_this_label

0 commit comments

Comments
 (0)