Merge pull request #278 from metwork-framework/max_connections

build: fix previous changes concerning max_connections

Author: thebaptiste

adm/mfxxx.init.custom

@@ -47,7 +47,6 @@ if test "${MFBASE_POSTGRESQL_FLAG}" = "1"; then
     fi
     rm -f "/tmp/initdb_pwfile.$$"
 
-    sed -i '/^max_connections = 100*/^#max_connections (default 100) is set in included file (see below)/' ${MFBASE_POSTGRESQL_DATA_DIR}/postgresql.conf
     echo "include '${MFMODULE_RUNTIME_HOME}/tmp/config_auto/postgresql.conf'" >>${MFBASE_POSTGRESQL_DATA_DIR}/postgresql.conf
     PG_HBA="${MFBASE_POSTGRESQL_DATA_DIR}/pg_hba.conf"
     cat >${PG_HBA} <<EOF

adm/mfxxx.start.custom

@@ -21,3 +21,11 @@
     fi
 {% endblock %}
 
+{% block custom %}
+    # Comment line "max_connections = " as it is now provided from config in ${MFMODULE_RUNTIME_HOME}/tmp/config_auto/postgresql.conf
+    grep '^max_connections =' ${MFBASE_POSTGRESQL_DATA_DIR}/postgresql.conf >/dev/null 2>&1
+    if test $? -eq 0; then
+        sed -i 's/^max_connections = */#max_connections (default 100) is set in included file (see below)/' ${MFBASE_POSTGRESQL_DATA_DIR}/postgresql.conf
+    fi
+{% endblock %}
+