Skip to content

Commit 0db9cac

Browse files
authored
Merge pull request #79 from juscghwe/main
QoL fixes
2 parents 39ecd65 + 0645b7d commit 0db9cac

File tree

6 files changed

+55
-5
lines changed

6 files changed

+55
-5
lines changed

docs/API/.pages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
nav:
22
- REST API:
3-
- External API: REST_API_Doc.md
3+
- Public API: REST_API_PublicDoc.md
44
- Internal API: REST_API_InternalDoc.md

docs/API/REST_API_InternalDoc.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11

22
# REST API - Internal
33
Internal APIs are primarily used by the FTS UI to communicate with the server.
4-
See also the [REST API DOC](REST_API_Doc.md) for APIs used in integration
4+
See also the [REST API DOC](REST_API_PublicDoc.md) for APIs used in integration
55
they may be used to create other user interfaces such as CLI.
66

7+
!!! Warning
8+
This documentation is refering to 1.9 (deprecated). There might be changes regarding 2.x.
9+
710
In the current release (1.9), FTS supports following Internal API :
811

912
* authenticate

docs/API/REST_API_Doc.md renamed to docs/API/REST_API_PublicDoc.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ The API allows you to easily connect third parties to the TAK family,
66
without the need to understand the complexity of the CoT structure or what a TCP connection is.
77
FTS also supports an [Internal API](REST_API_InternalDoc.md).
88

9+
!!! Warning
10+
This documentation is refering to 1.9 (deprecated). There might be changes regarding 2.x.
11+
912
## How FTS manages the information
1013

1114
FTS will send the information coming through the API to all the connected clients,

docs/HowToHelp/WriteDocumentation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ See Documentation Patterns below.
3737

3838
### Verify Processing
3939

40-
The following description is only partially correct.
40+
!!! Warning
41+
The following description is only partially correct.
4142

4243
#### GitHub Pages
4344

docs/Installation/mechanism/Ansible/ZeroTouchInstall.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,16 @@ to remember the IP address (MY_IPA) you have selected.
108108
```bash
109109
export MY_IPA=<the appropriate IP address>
110110
```
111-
??? example "Here is an example capturing the wired LAN address:"
111+
112+
!!! note "Here are complete examples capturing the IP address:"
113+
Wired, ethernet, RJ45
112114
```bash
113115
export MY_IPA=$(ip -4 addr show eth0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
114116
```
117+
WiFi
118+
```bash
119+
export MY_IPA=$(ip -4 addr show wlan0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
120+
```
115121

116122
## Run the Zero Touch Installer (ZTI)
117123

@@ -251,6 +257,43 @@ it is time to make sure it is nominally working.
251257
* username: `admin`
252258
* password: `password`
253259

260+
!!! note
261+
When trying to log in for the first time, you might get a warning along the lines of `FTS Server is Not Reachable at {your IPA}`.
262+
[Restarting the services](../../../administration/Operation/fts-service-mgmt.md) can help.
263+
264+
### Node-Red issues
265+
266+
Currently there is a know issue regarding the Node-Red integration. The following is based on the [YouTube-Video by Cßrv0 (external)](https://www.youtube.com/watch?v=Yaa1viiC6_M&t=25m0s). If you run into troubles following the text description, please refer to this video for additional help.
267+
268+
This is due to a problem with nodeJS so we need to reinstall Node-Red at version 20:
269+
270+
```bash
271+
bash <(curl -sL https://raw.githubusercontent.com/node-red/linux-installers/master/deb/update-nodejs-and-nodered) --node20
272+
```
273+
274+
Accept the prompts following up depending on your needs.
275+
276+
Finally you'll need to restart Node-Red:
277+
278+
```bash
279+
sudo systemctl enable nodered.service
280+
sudo systemctl start nodered.service
281+
```
282+
283+
There still will be a known error regarding `worldmap` itself. To fix this you'll need to adjust the corresponding node within Node-Red.
284+
285+
Login into Node-Red again and go to the `FTH Webdmap` flow and edit the `FTS Server` TCP node (with the woarning below). Change the properties to:
286+
287+
```
288+
server: ${your IPA}
289+
port: 8087
290+
```
291+
292+
Redeploy the flows. This should fix the issues.
293+
294+
!!! note
295+
Don't worry when your clients and COTs dont show up immediately. The worldmap needs some time to get up to date.
296+
254297
### Reconfiguration
255298

256299
`ZeroTouch` will have configured the system and started the services for you.

docs/Usage/VideoManagement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ you can:
88
Additionally,
99
FTS will automatically send to all the connected clients
1010
video streams information coming from FreeTAK UAS or TAK ICU
11-
using the [API](../API/REST_API_Doc.md#managevideostream)
11+
using the [API](../API/REST_API_PublicDoc.md#managevideostream)

0 commit comments

Comments
 (0)