Improving postgresql data-base creation

diff --git a/conf/mailleur.conf b/conf/mailleur.conf
index 5a0e6650757cbc0ef54bda98156c19bf5a109f78..a6a451e56c9aaeee6d3993e55723f16ff16bbd3e 100644 (file)
--- a/conf/mailleur.conf
+++ b/conf/mailleur.conf
@@ -31,11 +31,12 @@ CA_KEY_CLT="./certs/localhost-key.pem"
 CA_VERIFY_CLT=0        #to check PEER/server remote certificate
 #------------------------------------------------
 #Configured for Postgresql database
-#DB_TYPE can be either POSTGRESQL,MYSQL
-DB_TYPE=TO_BE_DEFINED
+#DB_TYPE can be either POSTGRESQL,MYSQL, default POSTGRESQL
+DB_TYPE=POSTGRESQL
 DB_NAME=mailleur
 DB_HOST=localhost
 DB_PORT=5432
+DB_LANG="UTF-8"
 #------------------------------------------------
 #Dovecot storage directory
 DOV_MAILDIR="/var/spool/mailleur/mails"

diff --git a/mailleur.spec.in b/mailleur.spec.in
index 7ba6786c84f2c5fba30d4c894304833a1c081e93..424921688678e78104599badd3b6c2cb53f14d8c 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -149,7 +149,7 @@ Obsoletes   :       %{name}-mysql           <= %{version}-%{release}
 %post                  postgresql
 if [ "$1" = 1 ]; then
   sed -i                                       \
-       -e "s/DB_TO_BE_DEFINED/POSTGRESQL/"     \
+       -e "s/DB_TYPE=.*$/DB_TYPE=POSTGRESQL/"  \
        %{_sysconfdir}/%{name}/%{name}.conf
   fi