Move max/min mem settings to system.properties

Author: thespad

root/defaults/system.properties

@@ -0,0 +1,42 @@
+## system.properties
+#
+# each unifi instance requires a set of ports:
+#
+## device inform
+# unifi.http.port=8080
+## controller UI / API
+# unifi.https.port=8443
+## portal redirect port for HTTP
+# portal.http.port=8880
+## portal redirect port for HTTPs
+# portal.https.port=8843
+## local-bound port for DB server
+# unifi.db.port=27117
+## UDP port used for STUN
+# unifi.stun.port=3478
+#
+## the IP devices should be talking to for inform
+# system_ip=a.b.c.d
+## disable mongodb journaling
+# unifi.db.nojournal=false
+## extra mongod args
+# unifi.db.extraargs
+#
+## HTTPS options
+# unifi.https.ciphers=TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA
+# unifi.https.sslEnabledProtocols=TLSv1,SSLv2Hello
+# unifi.https.hsts=false
+# unifi.https.hsts.max_age=31536000
+# unifi.https.hsts.preload=false
+# unifi.https.hsts.subdomain=false
+#
+# Ports reserved for device redirector. There is no need to open
+# firewall for these ports on controller, however do NOT set
+# controller to use these ports.
+#
+# portal.redirector.port=8881
+# portal.redirector.port.wired=8882
+#
+# Port used for throughput measurement.
+# unifi.throughput.port=6789
+#

root/etc/cont-init.d/20-config

@@ -17,6 +17,20 @@ do
 [[ ! -L "$i" ]] && ln -s /config/"$(basename "$i")" "$i"
 done
 
+if [[ ! -e /config/data/system.properties ]]; then
+    cp /defaults/system.properties /config/data
+fi
+
+if [[ -n $MEM_LIMIT ]]; then
+    echo "*** Setting Java memory limit to $MEM_LIMIT ***"
+    echo "unifi.xmx=$MEM_LIMIT" >> /config/data/system.properties 
+fi
+
+if [[ -n $MEM_STARTUP ]]; then
+    echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
+    echo "unifi.xms=$MEM_STARTUP" >> /config/data/system.properties
+fi
+
 # permissions
 chown -R abc:abc \
 	/config \

root/etc/services.d/unifi/run

@@ -2,14 +2,5 @@
 
 cd /config || exit
 
-if [ -z ${MEM_LIMIT+x} ]; then
-  MEM_LIMIT="1024M"
-fi
-
-if [ -z ${MEM_STARTUP+x} ]; then
-    exec \
-        s6-setuidgid abc java -Xmx"${MEM_LIMIT}" -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;
-else
-    exec \
-        s6-setuidgid abc java -Xms"${MEM_STARTUP}" -Xmx"${MEM_LIMIT}" -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;
-fi
+exec \
+    s6-setuidgid abc java -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;