Allow restoring to default

Author: thespad

readme-vars.yml

@@ -25,8 +25,8 @@ param_volumes:
 # optional container parameters
 opt_param_usage_include_env: true
 opt_param_env_vars:
-  - { env_var: "MEM_LIMIT", env_value: "1024M", desc: "Optionally change the Java memory limit (-Xmx) (default is 1024M)." }
-  - { env_var: "MEM_STARTUP", env_value: "1024M", desc: "Optionally change the Java initial memory (-Xms) (default is 1024M)." }
+  - { env_var: "MEM_LIMIT", env_value: "1024", desc: "Optionally change the Java memory limit. Set to `default` to reset to default" }
+  - { env_var: "MEM_STARTUP", env_value: "1024", desc: "Optionally change the Java initial/minimum memory. Set to `default` to reset to default" }
 
 param_usage_include_ports: true
 param_ports:

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

@@ -23,21 +23,30 @@ fi
 
 if grep -q "xmx" /config/data/system.properties && grep -q "xms" /config/data/system.properties; then
 
-    if [[ -n $MEM_LIMIT ]]; then
+    if [[ $MEM_LIMIT == "default" ]]; then
+        echo "*** Setting Java memory limit to default ***"
+        sed -i "/unifi.xmx=.*/d" /config/data/system.properties
+    elif [[ -n $MEM_LIMIT ]]; then
         echo "*** Setting Java memory limit to $MEM_LIMIT ***"
         sed -i "s/unifi.xmx=.*/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties 
     fi
 
-    if [[ -n $MEM_STARTUP ]]; then
+    if [[ $MEM_STARTUP == "default" ]]; then
+        echo "*** Setting Java memory minimum to default ***"
+        sed -i "/unifi.xms=.*/d" /config/data/system.properties
+    elif [[ -n $MEM_STARTUP ]]; then
         echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
         sed -i "s/unifi.xms=.*/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
     fi
 
 elif grep -q "xmx" /config/data/system.properties; then
 
-    if [[ -n $MEM_LIMIT ]]; then
+    if [[ $MEM_LIMIT == "default" ]]; then
+        echo "*** Setting Java memory limit to default ***"
+        sed -i "/unifi.xmx=.*/d" /config/data/system.properties
+    elif [[ -n $MEM_LIMIT ]]; then
         echo "*** Setting Java memory limit to $MEM_LIMIT ***"
-        sed -i "s/unifi.xmx=.*/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties 
+        sed -i "s/unifi.xmx=.*/unifi.xmx=$MEM_LIMIT/" /config/data/system.properties
     fi
 
     if [[ -n $MEM_STARTUP ]]; then
@@ -47,7 +56,10 @@ elif grep -q "xmx" /config/data/system.properties; then
 
 elif grep -q "xms" /config/data/system.properties; then
 
-    if [[ -n $MEM_STARTUP ]]; then
+    if [[ $MEM_STARTUP == "default" ]]; then
+        echo "*** Setting Java memory minimum to default ***"
+        sed -i "/unifi.xms=.*/d" /config/data/system.properties
+    elif [[ -n $MEM_STARTUP ]]; then
         echo "*** Setting Java memory minimum to $MEM_STARTUP ***"
         sed -i "s/unifi.xms=.*/unifi.xms=$MEM_STARTUP/" /config/data/system.properties
     fi