fix(entrypoint): update conf values as per env vars

entrypoint.sh

@@ -2,40 +2,40 @@
 
 set -e
 
-: ${OPENERP_SERVER:='/opt/config/odoo-server.conf'}
+: ${OPENERP_SERVER_CONF:='/opt/config/odoo-server.conf'}
 # Variables del conf:
 
-: ${LOG_HANDLER:="[':INFO']"}
-: ${LOG_LEVEL:='info'}
-: ${LOG_DB:="False"}
-: ${DATA_DIR:="/var/lib/odoo"}
-: ${LOGROTATE:="True"}
-: ${CSV_INTERNAL_SEP:=";"}
 : ${ADMIN_PASSWD:="admin"}
+: ${CSV_INTERNAL_SEP:=";"}
+: ${DATA_DIR:="/var/lib/odoo"}
+: ${DB_HOST:="db"}
+: ${DB_FILTER:="^%d"}
+: ${DB_MAXCONN:="64"}
+: ${DB_NAME:="False"}
+: ${DB_PASSWORD:="odoo"}
 : ${DB_PORT:="5432"}
 : ${DB_USER:="odoo"}
-: ${DB_PASSWORD:="odoo"}
 : ${DB_TEMPLATE:="template1"}
-: ${DB_NAME:="False"}
-: ${DB_MAXCONN:="64"}
-: ${DB_MAXCONN:="64"}
 : ${DEBUG_MODE:="False"}
 : ${EMAIL_FROM:="False"}
+: ${GEVENT_PORT:="8072"}
 : ${LIMIT_MEMORY_HARD:="2684354560"}
 : ${LIMIT_MEMORY_SOFT:="2147483648"}
 : ${LIMIT_REQUEST:="8192"}
 : ${LIMIT_TIME_CPU:="300"}
 : ${LIMIT_TIME_REAL:="600"}
 : ${LIST_DB:="True"}
-: ${LONGPOLLING_PORT:="8072"}
+: ${LOG_DB:="False"}
+: ${LOG_HANDLER:="[':INFO']"}
+: ${LOG_LEVEL:='info'}
+: ${LOGROTATE:="True"}
 : ${MAX_CRON_THREADS:="2"}
-: ${OSV_MEMORY_AGE_LIMIT:="1"}
 : ${OSV_MEMORY_COUNT_LIMIT:="False"}
 : ${PIDFILE:="None"}
 : ${PROXY_MODE:="False"}
 : ${REPORTGZ:="False"}
 : ${SECURE_CERT_FILE:="server.cert"}
-: ${SECURE_pkey_FILE:="server.pkey"}
+: ${SECURE_PKEY_FILE:="server.pkey"}
 : ${SERVER_WIDE_MODULES:="None"}
 : ${SMTP_PASSWORD:="False"}
 : ${SMTP_PORT:="25"}
@@ -48,6 +48,7 @@ set -e
 : ${TEST_FILE:="False"}
 : ${TEST_REPORT_DIRECTORY:="False"}
 : ${TIMEZONE:="False"}
+: ${TRANSIENT_AGE_LIMIT:="1"}
 : ${TRANSLATE_MODULES:="['all']"}
 : ${UNACCENT:="True"}
 : ${WITHOUT_DEMO:="True"}
@@ -56,53 +57,60 @@ set -e
 : ${XMLRPC_PORT:="8069"}
 : ${XMLRPCS:="True"}
 : ${XMLRPCS_PORT:="8071"}
-: ${DB_HOST:="db"}
-: ${DB_FILTER:="^%d"}
 # Estas no las estabamos metiendo:
  ## echo 'logfile = '${LOGFILE:-"/var/log/odoo/odoo-server.log"} >> /opt/config/odoo-server.conf; \
  ## echo 'pg_path = '${PG_PATH:-None} >> /opt/config/odoo-server.conf; \
 
 function write_conf() {
-	param="$1"
-	value="$2"
-	if ! grep -q -E "^\s*\b${param}\b\s*=" "$OPENERP_SERVER" ; then
-		echo "${param} not in conf, setting..."
-		echo "${param} = ${value}" >> $OPENERP_SERVER
-	fi;
+  param="$1"
+  value="$2"
+  # The ; character is a comment in the conf file
+  if ! grep -q -E "^\s*\b${param}\b\s*=" "$OPENERP_SERVER_CONF" ; then
+    echo "${param} not found in conf, setting now."
+    echo "${param} = ${value}" >> $OPENERP_SERVER_CONF
+  elif ! grep -q -E "^\s*\b${param}\b\s*=\s*${value}" "$OPENERP_SERVER_CONF" ; then
+    echo "Changing config value of ${param} as update needed."
+    # Using ; as sed delimiter because it's not very common in the conf file,
+    # but still escaping it.
+    escaped_value=$(sed 's/;/\\;/g' <<< ${value})
+    sed -i \
+      "s;\b${param}\b\s*=\s*.*$;${param} = ${escaped_value};g" \
+      "$OPENERP_SERVER_CONF"
+  fi;
 }
 
 echo "ENTRYPOINT: Setting conf values"
-write_conf "log_handler" "${LOG_HANDLER}"
-write_conf "log_level" "${LOG_LEVEL}"
-write_conf  "log_db" "${LOG_DB}"
-write_conf 'data_dir' "${DATA_DIR}"
-write_conf 'logrotate' "${LOGROTATE}"
-write_conf 'csv_internal_sep' "${CSV_INTERNAL_SEP}"
 write_conf 'admin_passwd' "${ADMIN_PASSWD}"
-write_conf 'db_port' "${DB_PORT}"
-write_conf 'db_user' "${DB_USER}"
+write_conf 'csv_internal_sep' "${CSV_INTERNAL_SEP}"
+write_conf 'data_dir' "${DATA_DIR}"
+write_conf 'db_host' "${DB_HOST}"
+write_conf 'db_maxconn' "${DB_MAXCONN}"
+write_conf 'db_name' "${DB_NAME}"
 write_conf 'db_password' "${DB_PASSWORD}"
+write_conf 'db_port' "${DB_PORT}"
 write_conf 'db_template' "${DB_TEMPLATE}"
-write_conf 'db_name' "${DB_NAME}"
-write_conf 'db_maxconn' "${DB_MAXCONN}"
-write_conf 'db_maxconn' "${DB_MAXCONN}"
+write_conf 'db_user' "${DB_USER}"
+write_conf 'dbfilter' "${DB_FILTER}"
 write_conf 'debug_mode' "${DEBUG_MODE}"
 write_conf 'email_from' "${EMAIL_FROM}"
+write_conf 'gevent_port' "${GEVENT_PORT}"
 write_conf 'limit_memory_hard' "${LIMIT_MEMORY_HARD}"
 write_conf 'limit_memory_soft' "${LIMIT_MEMORY_SOFT}"
 write_conf 'limit_request' "${LIMIT_REQUEST}"
 write_conf 'limit_time_cpu' "${LIMIT_TIME_CPU}"
 write_conf 'limit_time_real' "${LIMIT_TIME_REAL}"
 write_conf 'list_db' "${LIST_DB}"
-write_conf 'longpolling_port' "${LONGPOLLING_PORT}"
+write_conf "log_handler" "${LOG_HANDLER}"
+write_conf "log_level" "${LOG_LEVEL}"
+write_conf "log_db" "${LOG_DB}"
+write_conf 'logrotate' "${LOGROTATE}"
 write_conf 'max_cron_threads' "${MAX_CRON_THREADS}"
-write_conf 'osv_memory_age_limit' "${OSV_MEMORY_AGE_LIMIT}"
 write_conf 'osv_memory_count_limit' "${OSV_MEMORY_COUNT_LIMIT}"
 write_conf 'pidfile' "${PIDFILE}"
 write_conf 'proxy_mode' "${PROXY_MODE}"
 write_conf 'reportgz' "${REPORTGZ}"
 write_conf 'secure_cert_file' "${SECURE_CERT_FILE}"
-write_conf 'secure_pkey_file' "${SECURE_pkey_FILE}"
+write_conf 'secure_pkey_file' "${SECURE_PKEY_FILE}"
 write_conf 'server_wide_modules' "${SERVER_WIDE_MODULES}"
 write_conf 'smtp_password' "${SMTP_PASSWORD}"
 write_conf 'smtp_port' "${SMTP_PORT}"
@@ -115,6 +123,7 @@ write_conf 'test_enable' "${TEST_ENABLE}"
 write_conf 'test_file' "${TEST_FILE}"
 write_conf 'test_report_directory' "${TEST_REPORT_DIRECTORY}"
 write_conf 'timezone' "${TIMEZONE}"
+write_conf 'transient_age_limit' "${TRANSIENT_AGE_LIMIT}"
 write_conf 'translate_modules' "${TRANSLATE_MODULES}"
 write_conf 'unaccent' "${UNACCENT}"
 write_conf 'without_demo' "${WITHOUT_DEMO}"
@@ -123,20 +132,18 @@ write_conf 'xmlrpc' "${XMLRPC}"
 write_conf 'xmlrpc_port' "${XMLRPC_PORT}"
 write_conf 'xmlrpcs' "${XMLRPCS}"
 write_conf 'xmlrpcs_port' "${XMLRPCS_PORT}"
-write_conf 'db_host' "${DB_HOST}"
-write_conf 'dbfilter' "${DB_FILTER}"
 
 case "$1" in
 	-- | /opt/odoo/odoo-bin)
 		shift
 		if [[ "$1" == "scaffold" ]] ; then
-			exec /opt/odoo/odoo-bin --config $OPENERP_SERVER "$@"
+			exec /opt/odoo/odoo-bin --config $OPENERP_SERVER_CONF "$@"
 		else
-			exec /opt/odoo/odoo-bin --config $OPENERP_SERVER "$@" "${DB_ARGS[@]}"
+			exec /opt/odoo/odoo-bin --config $OPENERP_SERVER_CONF "$@" "${DB_ARGS[@]}"
 		fi
 		;;
 	-*)
-		exec /opt/odoo/odoo-bin --config $OPENERP_SERVER "$@" "${DB_ARGS[@]}"
+		exec /opt/odoo/odoo-bin --config $OPENERP_SERVER_CONF "$@" "${DB_ARGS[@]}"
 		;;
 	*)
 		exec "$@"