Skip to content

Commit 293a732

Browse files
authored
Merge pull request #281 from gravitl/develop
Develop
2 parents e58e84a + 9a60201 commit 293a732

40 files changed

+369
-122
lines changed

.github/workflows/prcheck.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ jobs:
66
docs:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v1
10-
- uses: ammaraskar/sphinx-action@master
9+
- name: Checkout
10+
uses: actions/checkout@v1
11+
- name: Build
12+
uses: ammaraskar/sphinx-action@master
1113
with:
12-
docs-folder: "."
14+
docs-folder: "."
15+
- name: Generate Name
16+
id: name
17+
run: |
18+
echo "ARTIFACT_NAME=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
19+
- name: Upload Artifact
20+
uses: actions/upload-artifact@v4
21+
with:
22+
name: HTMLupload-${{ steps.name.outputs.ARTIFACT_NAME }}-${{ github.run_attempt }}
23+
path: ./_build/html/

.readthedocs.yaml

-35
This file was deleted.

Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,5 @@ RUN sed -i '/link rel=\"prev\"/a \ \ \ \ <link rel=\"canonical\"\ href=\"https:/
6161
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
6262

6363
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
64+
65+
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

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
Where is the netmaker documentation hosted?
99
- https://docs.netmaker.org
10-
- https://netmaker.readthedocs.io
1110

1211
We encourage contributions! Follow the below documentation to build and make changes/additions to the documentation.
1312

examplecode/netclient-help.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ COMMANDS:
99
connect connect to a netmaker network
1010
daemon netclient daemon
1111
disconnect disconnet from a network
12-
guiServer guiServer [enable|disable]
1312
help Help about any command
1413
install install netclient binary and daemon
1514
join join a network

how-to-guides.rst

+8
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ Netmaker Professional is our advanced Netmaker offering for business use cases.
5656

5757
pro/index
5858

59+
Integrating Non-native Devices
60+
===============================
61+
62+
.. toctree::
63+
:maxdepth: 1
64+
65+
integrating-non-native-devices
66+
5967
External Guides
6068
================
6169

Loading

images/integration-get-config.jpg

108 KB
Loading
35.2 KB
Loading
48.1 KB
Loading

images/integration-openwrt-pkgmgr.jpg

100 KB
Loading
41.5 KB
Loading

images/integration-openwrt-wg-fw.jpg

106 KB
Loading
121 KB
Loading
45.7 KB
Loading
74.6 KB
Loading
47.8 KB
Loading
45.1 KB
Loading

images/integration-opnsense-fw.jpg

124 KB
Loading

images/integration-opnsense-peer.jpg

151 KB
Loading
Loading
105 KB
Loading
112 KB
Loading
226 KB
Loading
171 KB
Loading
90.1 KB
Loading

images/integration-pfsense-fw.jpg

207 KB
Loading
Loading
162 KB
Loading

images/integration-pfsense-peer.jpg

267 KB
Loading

images/integration-pfsense-pkgmgr.jpg

134 KB
Loading
Loading

images/integration-sample-config.jpg

34.7 KB
Loading

0 commit comments

Comments
 (0)