Skip to content

Commit 41b3671

Browse files
committed
Merge remote-tracking branch 'origin/main' into replace-placeholers-in-proeprties
2 parents 27594b9 + dc1faeb commit 41b3671

File tree

9 files changed

+526
-502
lines changed

9 files changed

+526
-502
lines changed

.github/ISSUE_TEMPLATE/issue.bug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ body:
6767
- type: textarea
6868
attributes:
6969
description: |
70-
Provide a full docker log, output of "docker logs linuxserver.io"
70+
Provide a full docker log, output of "docker logs unifi-network-application"
7171
label: Container logs
7272
placeholder: |
73-
Output of `docker logs linuxserver.io`
73+
Output of `docker logs unifi-network-application`
7474
render: bash
7575
validations:
7676
required: true

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
external-trigger-main:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3.1.0
10+
- uses: actions/checkout@v4.1.1
1111

1212
- name: External Trigger
1313
if: github.ref == 'refs/heads/main'

.github/workflows/external_trigger_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
external-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3.1.0
12+
- uses: actions/checkout@v4.1.1
1313
with:
1414
fetch-depth: '0'
1515

.github/workflows/package_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
package-trigger-main:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3.1.0
10+
- uses: actions/checkout@v4.1.1
1111

1212
- name: Package Trigger
1313
if: github.ref == 'refs/heads/main'

.github/workflows/package_trigger_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
package-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3.1.0
12+
- uses: actions/checkout@v4.1.1
1313
with:
1414
fetch-depth: '0'
1515

Jenkinsfile

Lines changed: 177 additions & 159 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ After setup, the web UI is available at https://ip:8443. The application can be
6464

6565
### Setting Up Your External Database
6666

67-
Formally only mongodb 3.6 through 4.4 are supported, however, it has been reported that newer versions will work. If you choose to use a newer version be aware that you will not be operating a supported configuration.
67+
Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported.
6868

6969
**Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.**
7070

@@ -155,7 +155,7 @@ services:
155155
- MONGO_TLS= #optional
156156
- MONGO_AUTHSOURCE= #optional
157157
volumes:
158-
- /path/to/data:/config
158+
- /path/to/unifi-network-application/data:/config
159159
ports:
160160
- 8443:8443
161161
- 3478:3478/udp
@@ -195,7 +195,7 @@ docker run -d \
195195
-p 8880:8880 `#optional` \
196196
-p 6789:6789 `#optional` \
197197
-p 5514:5514/udp `#optional` \
198-
-v /path/to/data:/config \
198+
-v /path/to/unifi-network-application/data:/config \
199199
--restart unless-stopped \
200200
lscr.io/linuxserver/unifi-network-application:latest
201201
```
@@ -227,7 +227,7 @@ Containers are configured using parameters passed at runtime (such as those abov
227227
| `-e MEM_STARTUP=1024` | Optionally change the Java initial/minimum memory (in Megabytes). Set to `default` to reset to default |
228228
| `-e MONGO_TLS=` | Mongodb enable [TLS](https://www.mongodb.com/docs/manual/reference/connection-string/#mongodb-urioption-urioption.tls). Only evaluated on first run. |
229229
| `-e MONGO_AUTHSOURCE=` | Mongodb [authSource](https://www.mongodb.com/docs/manual/reference/connection-string/#mongodb-urioption-urioption.authSource). For Atlas set to `admin`.Defaults to `MONGO_DBNAME`.Only evaluated on first run. |
230-
| `-v /config` | All Unifi data stored here |
230+
| `-v /config` | Persistent config files |
231231

232232
## Environment variables from files (Docker secrets)
233233

package_versions.txt

Lines changed: 335 additions & 329 deletions
Large diffs are not rendered by default.

readme-vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ development_versions: false
1919
param_container_name: "{{ project_name }}"
2020
param_usage_include_vols: true
2121
param_volumes:
22-
- { vol_path: "/config", vol_host_path: "/path/to/data", desc: "All Unifi data stored here" }
22+
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Persistent config files" }
2323

2424
param_usage_include_ports: true
2525
param_ports:
@@ -61,7 +61,7 @@ app_setup_block: |
6161
6262
### Setting Up Your External Database
6363
64-
Formally only mongodb 3.6 through 4.4 are supported, however, it has been reported that newer versions will work. If you choose to use a newer version be aware that you will not be operating a supported configuration.
64+
Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported.
6565
6666
**Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.**
6767
@@ -95,9 +95,9 @@ app_setup_block: |
9595
### Device Adoption
9696
9797
For Unifi to adopt other devices, e.g. an Access Point, it is required to change the inform IP address. Because Unifi runs inside Docker by default it uses an IP address not accessible by other devices. To change this go to Settings > System > Advanced and set the Inform Host to a hostname or IP address accessible by your devices. Additionally the checkbox "Override" has to be checked, so that devices can connect to the controller during adoption (devices use the inform-endpoint during adoption).
98-
98+
9999
Note that you must use 8080:8080. If you MUST change the port, it must be changed on both sides and manually changed in your system.properties file. Otherwise, devices will initially communicate and then break after.
100-
100+
101101
**Please note, Unifi change the location of this option every few releases so if it's not where it says, search for "Inform" or "Inform Host" in the settings.**
102102
103103
In order to manually adopt a device take these steps:

0 commit comments

Comments
 (0)