Merge pull request #281 from gravitl/develop

Develop
gravitl · Feb 29, 2024 · 293a732 · 293a732
2 parents e58e84a + 9a60201
commit 293a732
Show file tree

Hide file tree

Showing 40 changed files with 369 additions and 122 deletions.
diff --git a/.github/workflows/prcheck.yml b/.github/workflows/prcheck.yml
@@ -6,7 +6,18 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: ammaraskar/sphinx-action@master
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Build
+      uses: ammaraskar/sphinx-action@master
       with:
-        docs-folder: "."
+        docs-folder: "."
+    - name: Generate Name
+      id: name
+      run: |
+        echo "ARTIFACT_NAME=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: HTMLupload-${{ steps.name.outputs.ARTIFACT_NAME }}-${{ github.run_attempt }}
+        path: ./_build/html/
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -61,3 +61,5 @@ RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https:/
 RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https://docs.netmaker.io/pro/pro-relay-server.html\"\ />' /usr/share/nginx/html/pro/pro-relay-server.html
 
 RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https://docs.netmaker.io/ui-reference.html\"\ />' /usr/share/nginx/html/ui-reference.html
+
+RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https://docs.netmaker.io/integrating-non-native-devices.html\"\ />' /usr/share/nginx/html/integrating-non-native-devices.html
diff --git a/README.md b/README.md
@@ -7,7 +7,6 @@
 
 Where is the netmaker documentation hosted?  
 - https://docs.netmaker.org  
-- https://netmaker.readthedocs.io  
 
 We encourage contributions! Follow the below documentation to build and make changes/additions to the documentation.
 

diff --git a/examplecode/netclient-help.txt b/examplecode/netclient-help.txt
@@ -9,7 +9,6 @@ COMMANDS:
    connect     connect to a netmaker network
    daemon      netclient daemon
    disconnect  disconnet from a network
-   guiServer   guiServer [enable|disable]
    help        Help about any command
    install     install netclient binary and daemon
    join        join a network

diff --git a/how-to-guides.rst b/how-to-guides.rst
@@ -56,6 +56,14 @@ Netmaker Professional is our advanced Netmaker offering for business use cases.
 
    pro/index
 
+Integrating Non-native Devices
+===============================
+
+.. toctree::
+   :maxdepth: 1
+
+   integrating-non-native-devices
+
 External Guides
 ================
 

diff --git a/images/integration-config-additional-addresses.jpg b/images/integration-config-additional-addresses.jpg
diff --git a/images/integration-get-config.jpg b/images/integration-get-config.jpg
diff --git a/images/integration-mikrotik-wg-config.jpg b/images/integration-mikrotik-wg-config.jpg
diff --git a/images/integration-openwrt-assign-if.jpg b/images/integration-openwrt-assign-if.jpg
diff --git a/images/integration-openwrt-pkgmgr.jpg b/images/integration-openwrt-pkgmgr.jpg
diff --git a/images/integration-openwrt-wg-config.jpg b/images/integration-openwrt-wg-config.jpg
diff --git a/images/integration-openwrt-wg-fw.jpg b/images/integration-openwrt-wg-fw.jpg
diff --git a/images/integration-openwrt-wg-peer.jpg b/images/integration-openwrt-wg-peer.jpg
diff --git a/images/integration-openwrt-wg-status.jpg b/images/integration-openwrt-wg-status.jpg
diff --git a/images/integration-opnsense-assign-if.jpg b/images/integration-opnsense-assign-if.jpg
diff --git a/images/integration-opnsense-enable-if.jpg b/images/integration-opnsense-enable-if.jpg
diff --git a/images/integration-opnsense-enable-wg.jpg b/images/integration-opnsense-enable-wg.jpg
diff --git a/images/integration-opnsense-fw.jpg b/images/integration-opnsense-fw.jpg
diff --git a/images/integration-opnsense-peer.jpg b/images/integration-opnsense-peer.jpg
diff --git a/images/integration-opnsense-tunnel-interface.jpg b/images/integration-opnsense-tunnel-interface.jpg
diff --git a/images/integration-pfsense-assign-if.jpg b/images/integration-pfsense-assign-if.jpg
diff --git a/images/integration-pfsense-enable-if-init.jpg b/images/integration-pfsense-enable-if-init.jpg
diff --git a/images/integration-pfsense-enable-if.jpg b/images/integration-pfsense-enable-if.jpg
diff --git a/images/integration-pfsense-enable-wg.jpg b/images/integration-pfsense-enable-wg.jpg
diff --git a/images/integration-pfsense-fw-init.jpg b/images/integration-pfsense-fw-init.jpg
diff --git a/images/integration-pfsense-fw.jpg b/images/integration-pfsense-fw.jpg
diff --git a/images/integration-pfsense-if-internet-gw-dns.jpg b/images/integration-pfsense-if-internet-gw-dns.jpg
diff --git a/images/integration-pfsense-if-internet-gw.jpg b/images/integration-pfsense-if-internet-gw.jpg
diff --git a/images/integration-pfsense-peer.jpg b/images/integration-pfsense-peer.jpg
diff --git a/images/integration-pfsense-pkgmgr.jpg b/images/integration-pfsense-pkgmgr.jpg
diff --git a/images/integration-pfsense-tunnel-interface.jpg b/images/integration-pfsense-tunnel-interface.jpg
diff --git a/images/integration-sample-config.jpg b/images/integration-sample-config.jpg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,3 +61,5 @@ RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https:/
		RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https://docs.netmaker.io/pro/pro-relay-server.html\"\ />' /usr/share/nginx/html/pro/pro-relay-server.html

		RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https://docs.netmaker.io/ui-reference.html\"\ />' /usr/share/nginx/html/ui-reference.html

		RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https://docs.netmaker.io/integrating-non-native-devices.html\"\ />' /usr/share/nginx/html/integrating-non-native-devices.html