Skip to content

Commit fa26a81

Browse files
committed
Merge branch 'main-ra'
# Conflicts: # docs/docs/Installation/Linux/1.Installation.md
2 parents 54ad939 + 509d962 commit fa26a81

File tree

1 file changed

+46
-22
lines changed

1 file changed

+46
-22
lines changed

docs/docs/Installation/Linux/1.Installation.md

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sudo apt update && sudo apt upgrade
3535

3636
<details>
3737
<summary>
38-
RHEL
38+
Centos/RHEL/Fedora
3939
</summary>
4040

4141
```bash
@@ -46,12 +46,14 @@ sudo dnf update
4646
---
4747
## 2. Pre-requisite Software
4848

49+
50+
Install packages from the distro repo
4951
<details>
5052
<summary>
5153
Ubuntu
5254
</summary>
5355

54-
Install packages from the distro repo
56+
5557

5658
```bash
5759
sudo apt update && sudo apt install python3 && sudo apt install python3-pip
@@ -61,13 +63,29 @@ sudo apt install python3-dev python3-setuptools build-essential python3-gevent p
6163

6264
<details>
6365
<summary>
64-
RHEL
66+
RHEL/Centos
6567
</summary>
6668

67-
Install distro repo packages
69+
```bash
70+
sudo dnf group install "Development Tools"
71+
sudo dnf install python3 pip virtualenv virtualenvwrapper cairo cairo-devel python3-gevent python3-lxml bzip2-devel libffi-devel
72+
```
73+
74+
Create and activate a virtualenv for the next steps
75+
76+
```bash
77+
virtualenv venv
78+
source venv/bin/activate
79+
```
80+
</details>
81+
82+
<details>
83+
<summary>
84+
Fedora
85+
</summary>
6886

6987
```bash
70-
sudo dnf group install "C Development Tools and Libraries" "Development Tools"
88+
sudo dnf group install "Development Tools" "C Development Tools and Libraries"
7189
sudo dnf install python3 python3-pip cairo cairo-devel python3-cairo python3-cairo-devel python3-gevent python3-lxml python3-virtualenv
7290
```
7391

@@ -79,7 +97,6 @@ source venv/bin/activate
7997
```
8098
</details>
8199

82-
83100
---
84101
## 3. Install Python Libraries
85102

@@ -98,7 +115,7 @@ Note, use of pip with sudo is not recommended and you will be warned about this!
98115

99116
<details>
100117
<summary>
101-
RHEL
118+
Centos/RHEL/Fedora
102119
</summary>
103120

104121

@@ -124,26 +141,32 @@ Ubuntu
124141
sudo pip3 uninstall FreeTAKServer
125142
sudo pip3 uninstall FreeTAKServer-UI
126143
```
144+
145+
Delete the database and log folders
146+
147+
```bash
148+
sudo rm /opt/FTSDataBase.db
149+
sudo rm -r /usr/local/lib/<your-python-version>/<dist or site>-packages/FreeTAKServer
150+
```
127151
</details>
128152

129153
<details>
130154
<summary>
131-
RHEL
155+
Centos/RHEL/Fedora
132156
</summary>
133157

134158
```bash
135159
deactivate
136160
rm -rf venv/
137161
pip uninstall FreeTAKServer FreeTAKServer-UI
138162
```
139-
</details>
140163

141164
Delete the database and log folders
142165

143166
```bash
144-
sudo rm /opt/FTSDataBase.db
145-
sudo rm -r /usr/local/lib/<your-python-version>/<dist or site>-packages/FreeTAKServer
167+
sudo rm /opt/FTS/FTSDataBase.db
146168
```
169+
</details>
147170

148171
---
149172
## 5. Install FreeTAKServer
@@ -161,7 +184,7 @@ sudo python3 -m pip install FreeTAKServer[ui]
161184

162185
<details>
163186
<summary>
164-
RHEL
187+
Centos/RHEL/Fedora
165188
</summary>
166189

167190
```bash
@@ -230,7 +253,7 @@ sudo python3 -m FreeTAKServer.controllers.services.FTS
230253

231254
<details>
232255
<summary>
233-
RHEL
256+
Centos/RHEL/Fedora
234257
</summary>
235258

236259
```bash
@@ -254,7 +277,7 @@ to automatically use the default.
254277

255278
An example is provided below, your exact configuration will differ.
256279

257-
```text
280+
```css
258281
would you like to use a yaml config file,
259282
if yes you will be prompted for further configuration options [yes]:
260283
where would you like to save the yaml config [/opt/fts/FTSConfig.yaml]:
@@ -263,6 +286,7 @@ enter the preferred database type (MySQL is highly experimental if you're not su
263286
enter the preferred database path [/opt/fts/FTSDataBase.db]:
264287
enter the preferred main path [/usr/local/lib/python3.11/site-packages/FreeTAKServer]:
265288
enter the preferred log file path [/opt/fts/Logs]:
289+
266290
```
267291

268292
> :memo: **Note:** The IP in this configuration wizard is the FTS_MAIN_IP.
@@ -345,8 +369,8 @@ Advanced users may wish to use a different port.
345369

346370

347371
```python
348-
# Port the UI uses to communicate with the API
349-
PORT = '19023'
372+
# Port the UI uses to communicate with the API
373+
PORT = '19023'
350374
```
351375

352376
### Custom Secrets Configuration
@@ -355,7 +379,7 @@ The following items can be updated to use your own secrets, however the values
355379
must be updated in both the `FreeTAKServer-UI/config.py` and the
356380
`FreeTAKServer/core/configuration/MainConfig.py` files.
357381

358-
The API key used by the UI to communicate with FTS.
382+
The API key used by the UI to comunicate with FTS.
359383
Generate a new system user and then set it.
360384
~~What does this mean? Where is a user generated? What is a system user?~~
361385

@@ -409,7 +433,7 @@ sudo python3 run.py
409433

410434
<details>
411435
<summary>
412-
RHEL
436+
Centos/RHEL/Fedora
413437
</summary>
414438

415439
```bash
@@ -420,7 +444,7 @@ python run.py
420444
You will see the UI server start up in your terminal, which should look similar
421445
to that shown below.
422446

423-
```log
447+
```python
424448
(55501) wsgi starting up on http://0.0.0.0:5000
425449
(55501) accepted ('192.168.1.100', 49842)
426450
```
@@ -448,8 +472,8 @@ sudo pip install eventlet
448472
The config file will also need to be updated.
449473

450474
```python
451-
IP = ['FTS external IP']
452-
APPIP = ['FTS-UI internal IP']
475+
IP = [FTS external IP]
476+
APPIP = [FTS-UI internal IP]
453477
```
454478

455479
## 12. Check Installation
@@ -501,7 +525,7 @@ for TCP traffic.
501525

502526
<details>
503527
<summary>
504-
RHEL
528+
Centos/RHEL/Fedora
505529
</summary>
506530

507531
```bash

0 commit comments

Comments
 (0)