dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor improvements for edge centos/ubuntu instruction. css minor updates

Browse Source
This commit is contained in:
Volodymyr Babak 2023-09-14 13:44:51 +03:00
parent ec831ef0b1
commit 092e3b07c1
3 changed files with 41 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/src/main/data/json/edge/install_instructions/centos/instructions.md
View File

@ -84,8 +84,8 @@ sudo systemctl enable --now postgresql-12
{:copy-code} {:copy-code}
``` ```
Once PostgreSQL is installed you may want to create a new user or set the password for the the main user. Once PostgreSQL is installed you may want to create a new user or set the password for the main user.
The instructions below will help to set the password for main postgresql user The instructions below will help to set the password for main PostgreSQL user:
```text ```text
sudo su - postgres sudo su - postgres
@ -132,7 +132,7 @@ psql -U postgres -d postgres -h 127.0.0.1 -W
{:copy-code} {:copy-code}
``` ```
Execute create database statement Execute create database statement:
```bash ```bash
CREATE DATABASE tb_edge; CREATE DATABASE tb_edge;
@ -148,7 +148,7 @@ wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDG
{:copy-code} {:copy-code}
``` ```
Go to the download repository and install ThingsBoard Edge service Go to the download repository and install ThingsBoard Edge service:
```bash ```bash
sudo rpm -Uvh tb-edge-${TB_EDGE_VERSION}.rpm sudo rpm -Uvh tb-edge-${TB_EDGE_VERSION}.rpm
@ -170,8 +170,7 @@ EOL'
``` ```
##### [Optional] Database Configuration ##### [Optional] Database Configuration
In case you changed default PostgreSQL datasource settings please update the configuration file with your actual values (**/etc/tb-edge/conf/tb-edge.conf**). In case you changed default PostgreSQL datasource settings (**postgres**/**postgres**) please update the configuration file (**/etc/tb-edge/conf/tb-edge.conf**) with your actual values:
Edit ThingsBoard Edge configuration file:
```bash ```bash
sudo nano /etc/tb-edge/conf/tb-edge.conf sudo nano /etc/tb-edge/conf/tb-edge.conf
@ -179,12 +178,12 @@ sudo nano /etc/tb-edge/conf/tb-edge.conf
``` ```
Please update the following lines in your configuration file. Make sure **to replace**: Please update the following lines in your configuration file. Make sure **to replace**:
- PUT_YOUR_POSTGRESQL_PASSWORD_HERE with your actual postgres datasource username - Replace 'postgres' with your actual PostgreSQL username;
- PUT_YOUR_POSTGRESQL_PASSWORD_HERE with your actual postgres datasource password. - Replace 'PUT_YOUR_POSTGRESQL_PASSWORD_HERE' with your actual PostgreSQL password.
```bash ```bash
export SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/tb_edge export SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/tb_edge
export SPRING_DATASOURCE_USERNAME=PUT_YOUR_POSTGRESQL_USERNAME_HERE export SPRING_DATASOURCE_USERNAME=postgres
export SPRING_DATASOURCE_PASSWORD=PUT_YOUR_POSTGRESQL_PASSWORD_HERE export SPRING_DATASOURCE_PASSWORD=PUT_YOUR_POSTGRESQL_PASSWORD_HERE
{:copy-code} {:copy-code}
``` ```
@ -204,7 +203,7 @@ EOL'
{:copy-code} {:copy-code}
``` ```
Make sure that ports above (18080, 11883, 15683-15688) are not used by any other application. Make sure that ports above (18080, 11883, 15683) are not used by any other application.
#### Run installation script #### Run installation script
Once ThingsBoard Edge is installed and configured please execute the following install script: Once ThingsBoard Edge is installed and configured please execute the following install script:

17
application/src/main/data/json/edge/install_instructions/ubuntu/instructions.md
View File

@ -55,7 +55,7 @@ sudo service postgresql start
``` ```
Once PostgreSQL is installed you may want to create a new user or set the password for the main user. Once PostgreSQL is installed you may want to create a new user or set the password for the main user.
The instructions below will help to set the password for main postgresql user The instructions below will help to set the password for main PostgreSQL user:
```text ```text
sudo su - postgres sudo su - postgres
@ -73,14 +73,14 @@ CREATE DATABASE tb_edge;
``` ```
#### Thingsboard Edge service installation #### Thingsboard Edge service installation
Download installation package. Download installation package:
```bash ```bash
wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_VERSION}/tb-edge-${TB_EDGE_VERSION}.deb wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_VERSION}/tb-edge-${TB_EDGE_VERSION}.deb
{:copy-code} {:copy-code}
``` ```
Go to the download repository and install ThingsBoard Edge service Go to the download repository and install ThingsBoard Edge service:
```bash ```bash
sudo dpkg -i tb-edge-${TB_EDGE_VERSION}.deb sudo dpkg -i tb-edge-${TB_EDGE_VERSION}.deb
@ -102,8 +102,7 @@ EOL'
``` ```
##### [Optional] Database Configuration ##### [Optional] Database Configuration
In case you changed default PostgreSQL datasource settings please update the configuration file with your actual values (**/etc/tb-edge/conf/tb-edge.conf**). In case you changed default PostgreSQL datasource settings (**postgres**/**postgres**) please update the configuration file (**/etc/tb-edge/conf/tb-edge.conf**) with your actual values:
Edit ThingsBoard Edge configuration file:
```bash ```bash
sudo nano /etc/tb-edge/conf/tb-edge.conf sudo nano /etc/tb-edge/conf/tb-edge.conf
@ -111,12 +110,12 @@ sudo nano /etc/tb-edge/conf/tb-edge.conf
``` ```
Please update the following lines in your configuration file. Make sure **to replace**: Please update the following lines in your configuration file. Make sure **to replace**:
- PUT_YOUR_POSTGRESQL_PASSWORD_HERE with your actual postgres datasource username - Replace 'postgres' with your actual PostgreSQL username;
- PUT_YOUR_POSTGRESQL_PASSWORD_HERE with your actual postgres datasource password. - Replace 'PUT_YOUR_POSTGRESQL_PASSWORD_HERE' with your actual PostgreSQL password.
```bash ```bash
export SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/tb_edge export SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/tb_edge
export SPRING_DATASOURCE_USERNAME=PUT_YOUR_POSTGRESQL_USERNAME_HERE export SPRING_DATASOURCE_USERNAME=postgres
export SPRING_DATASOURCE_PASSWORD=PUT_YOUR_POSTGRESQL_PASSWORD_HERE export SPRING_DATASOURCE_PASSWORD=PUT_YOUR_POSTGRESQL_PASSWORD_HERE
{:copy-code} {:copy-code}
``` ```
@ -136,7 +135,7 @@ EOL'
{:copy-code} {:copy-code}
``` ```
Make sure that ports above (18080, 11883, 15683-15688) are not used by any other application. Make sure that ports above (18080, 11883, 15683) are not used by any other application.
#### Run installation script #### Run installation script

63
ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.scss
View File

@ -69,47 +69,32 @@
:host ::ng-deep { :host ::ng-deep {
.tb-markdown-view { .tb-markdown-view {
padding: 16px; padding: 16px 16px 32px 16px;
.tb-command-code { div.code-wrapper button.clipboard-btn {
.code-wrapper { right: -2px !important;
padding: 0; p {
pre[class*=language-] { color: #305680;
margin: 0; }
background: #F3F6FA; p, div {
border-color: #305680; background-color: #F3F6FA;
padding-right: 38px; }
overflow: scroll; div {
padding-bottom: 4px; img {
display: none;
&::-webkit-scrollbar { }
width: 4px; &:after {
height: 4px; content: "";
} position: initial;
display: block;
width: 18px;
height: 18px;
background: #305680;
mask-image: url(/assets/copy-code-icon.svg);
mask-repeat: no-repeat;
} }
} }
button.clipboard-btn { &.multiline {
right: -2px; right: -2px !important;
p {
color: #305680;
}
p, div {
background-color: #F3F6FA;
}
div {
img {
display: none;
}
&:after {
content: "";
position: initial;
display: block;
width: 18px;
height: 18px;
background: #305680;
mask-image: url(/assets/copy-code-icon.svg);
mask-repeat: no-repeat;
}
}
} }
} }
& > *:not(ul) { & > *:not(ul) {