merge upstream

env.template

@@ -5,8 +5,8 @@
 # Mark all the following variables for export
 set -o allexport
 
-#Any names here will be added as additional users with the
-#specified additional user password
+# Any names here will be added as additional users with the
+# specified additional user password
 ADDITIONAL_USER_NAMES="" # comma separated
 ADDITIONAL_USER_PASSWORD=""
 
@@ -17,15 +17,15 @@ ADMIN_PASSWORD=password
 
 # set to CERT to enable scos-sensor certificate authentication
 AUTHENTICATION=TOKEN
-CALIBRATION_EXPIRATION_LIMIT=360
+
 # Default callback api/results
 # Set to CERT for certificate authentication
 CALLBACK_AUTHENTICATION=TOKEN
 # Set to false to disable SSL cert verification in the callback POST request
 CALLBACK_SSL_VERIFICATION=false
 
-#Set the number of seconds before timeout in postback when a scheduled
-#action completes
+# Set the number of seconds before timeout in postback when a scheduled
+# action completes
 CALLBACK_TIMEOUT=2
 
 # SECURITY WARNING: don't run with debug turned on in production!
@@ -101,9 +101,8 @@ API_SHM_SIZE=16gb
 #    is available on startup. The specified action must be available.
 STARTUP_CALIBRATION_ACTION=SEA_CBRS_Calibrate_Baseline
 
-# Size of shared memory for API container (/dev/shm), used for parallel processing
-# See https://docs.docker.com/compose/compose-file/compose-file-v3/#shm_size
-API_SHM_SIZE=16gb
+# How many seconds until calibration data is considered stale
+CALIBRATION_EXPIRATION_LIMIT=3600
 
 # Debug dependant settings
 if $DEBUG; then