Merge pull request #198 from linuxserver/run

Author: thespad

README.md

@@ -270,6 +270,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.03.23:** - Test writing to /run/unifi and symlink to /config/run if it fails.
 * **20.02.23:** - Migrate to s6v3, install deb package on build, fix permissions.
 * **23.01.23:** - Exclude `run` from `/config` volume.
 * **30.11.22:** - Bump JRE to 11.

readme-vars.yml

@@ -51,7 +51,9 @@ app_setup_block_enabled: true
 app_setup_block: |
   The webui is at https://ip:8443, setup with the first run wizard.
 
-  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 Settings > Controller Configuration and set the Controller Hostname/IP to a hostname or IP address accessible by your devices. Additionally the checkbox "Override inform host with controller hostname/IP" has to be checked, so that devices can connect to the controller during adoption (devices use the inform-endpoint during adoption).
+  ### 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.
+
+  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).
 
   In order to manually adopt a device take these steps:
 
@@ -66,6 +68,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "10.03.23:", desc: "Test writing to /run/unifi and symlink to /config/run if it fails."}
   - { date: "20.02.23:", desc: "Migrate to s6v3, install deb package on build, fix permissions."}
   - { date: "23.01.23:", desc: "Exclude `run` from `/config` volume."}
   - { date: "30.11.22:", desc: "Bump JRE to 11."}

root/etc/s6-overlay/s6-rc.d/init-unifi-controller-config/run

@@ -83,8 +83,27 @@ fi
 
 # permissions
 lsiown -R abc:abc \
-	/config \
-	/run/unifi
+	/config
 
 lsiown abc:abc \
-    /config/data/keystore
+    /config/data/keystore \
+	/run/unifi \
+    /var/run/unifi
+
+if ! s6-setuidgid abc touch /run/unifi/mongo.test 2>/dev/null; then
+    if [[ ${S6_VERBOSITY} -ge 2 ]]; then
+        echo "Write test to /run/unifi failed, symlinking to /config/run."
+    fi
+    if [[ -L "/usr/lib/unifi/run" ]]; then
+        unlink "/usr/lib/unifi/run"
+    fi
+    mkdir -p /config/run
+    ln -s "/config/run" "/usr/lib/unifi/run"
+    chown abc:abc /usr/lib/unifi/run
+else
+    if [[ ${S6_VERBOSITY} -ge 2 ]]; then
+        echo "Write test to /run/unifi succeeded."
+    fi
+    chown abc:abc /usr/lib/unifi/run
+    rm /run/unifi/mongo.test
+fi