From 87ead41f5e65ec7beca3e1ab3e01e1a5dc5c17c1 Mon Sep 17 00:00:00 2001 From: Laur Ivan Date: Wed, 8 Jan 2025 09:26:38 +0100 Subject: [PATCH 1/2] chore: Update unifi controller. Add conventional commits. --- defaults/main.yml | 11 ++++++- git-conventional-commits.yaml | 43 ++++++++++++++++++++++++++ templates/docker-compose.yml.j2 | 1 + templates/env.unifi-controller.conf.j2 | 12 +++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 git-conventional-commits.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 1a34060..b13c217 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,12 +1,14 @@ --- ## General -unifi_image: lscr.io/linuxserver/unifi-controller:latest +unifi_image: lscr.io/linuxserver/unifi-network-application:latest +unifi_container_name: unifi-network-application unifi_uid: 1000 unifi_gid: 1000 unifi_mem_limit: 1024 unifi_mem_startup: 1024 +unifi_tz: "Etc/UTC" unifi_volume: "unifi" @@ -22,6 +24,13 @@ unifi_http_port_8880: 8880 unifi_http_port_6789: 6789 unifi_http_port_5514: 5514 +unifi_mongo_user: unifi +unifi_mongo_pass: +unifi_mongo_host: unifi-db +unifi_mongo_port: 27017 +unifi_nongo_db_name: unifi +unifi_mongo_auth_source: admin +unifi_mongo_tls: # Unifi-Controller paths unifi_root_path: /var/local diff --git a/git-conventional-commits.yaml b/git-conventional-commits.yaml new file mode 100644 index 0000000..60ac584 --- /dev/null +++ b/git-conventional-commits.yaml @@ -0,0 +1,43 @@ +--- +convention: + commitTypes: + - feat + - fix + - perf + - refactor + - style + - test + - build + - ops + - docs + - chore + - merge + - revert + commitScopes: [] + releaseTagGlobPattern: v[0-9]*.[0-9]*.[0-9]* +changelog: + commitTypes: + - feat + - fix + - perf + - merge + includeInvalidCommits: true + commitIgnoreRegexPattern: "^WIP " + headlines: + feat: Features + fix: Bug Fixes + perf: Performance Improvements + merge: Merges + breakingChange: BREAKING CHANGES + + ## GitHub + # commitUrl: https://github.com/ACCOUNT/REPOSITORY/commit/%commit% + # commitRangeUrl: https://github.com/ACCOUNT/REPOSITORY/compare/%from%...%to%?diff=split + + ## GitHub Issues + # issueRegexPattern: "#[0-9]+" + # issueUrl: https://github.com/ACCOUNT/REPOSITORY/issues/%issue% + + ## Jira Issues + # issueRegexPattern: "[A-Z][A-Z0-9]+-[0-9]+" + # issueUrl: https://WORKSPACE.atlassian.net/browse/%issue% diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index b5f1697..f6f1270 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -1,4 +1,5 @@ # unifi-controller docker compose +--- version: '3.9' services: unifi-controller: diff --git a/templates/env.unifi-controller.conf.j2 b/templates/env.unifi-controller.conf.j2 index c33a2f0..7b9dc9f 100644 --- a/templates/env.unifi-controller.conf.j2 +++ b/templates/env.unifi-controller.conf.j2 @@ -5,4 +5,16 @@ PUID={{ unifi_gid }} MEM_LIMIT={{ unifi_mem_limit }} MEM_STATUP={{ unifi_mem_startup }} +TZ={{ unifi_tz }} +MONGO_USER={{ unifi_mongo_user }} +MONGO_PASS={{ unifi_mongo_pass }} +MONGO_HOST={{ unifi_mongo_host }} +MONGO_PORT={{ unifi_mongo_port }} +MONGO_DBNAME={{ unifi_nongo_db_name }} +MONGO_AUTHSOURCE={{ unifi_mongo_auth_source }} +{% if unifi_mongo_tls is defined -%} +MONGO_TLS= {{ unifi_mongo_tls }} +{% endif %} + + -- 2.45.2 From d4291453cc1c3092db8eaf4fc4fc8db8d4550986 Mon Sep 17 00:00:00 2001 From: Laur Ivan Date: Wed, 8 Jan 2025 09:41:55 +0100 Subject: [PATCH 2/2] fix: Use the variable container name --- templates/docker-compose.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index f6f1270..55bc0f3 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -4,7 +4,7 @@ version: '3.9' services: unifi-controller: image: "{{ unifi_image }}" - container_name: unifi-controller-service + container_name: "{{ unifi_container_name }}" restart: unless-stopped env_file: - "{{ unifi_config_path | expanduser }}/env.unifi-controller.conf" -- 2.45.2