Fix dovecot installation

diff --git a/mailleur.spec.in b/mailleur.spec.in
index a02c459741c1eaa006f319b87a87e078f8b5bcdf..d3cafb6984b736b31e412fec58939c2ec2a81ec0 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -171,6 +171,9 @@ if [ "$1" = 1 ]; then
     esac
   fi
 
+%posttrans
+%{_sysconfdir}/rc.d/init.d/dovecot restart > /dev/null 2>&1 || :
+
 #=============================================================================
 %package               devel
 Summary                :       tools and components to test '%{name}'

diff --git a/support/starting.sh b/support/starting.sh
index 387a455aed2eae63e1e872a7f17e7f5dd0bb47c1..2765045114f14ab219ba176a35f2de6b25d7bcc5 100755 (executable)
--- a/support/starting.sh
+++ b/support/starting.sh
@@ -128,27 +128,7 @@ case "$OS" in
 do_doveconf()
 
 {
-DOVCONF=/etc/dovecot/dovecot.conf
-BEFMAIL=/etc/dovecot/dovecot.conf.before.$APPNAME
-DOVMAIL=/etc/$APPNAME/dovecot/dovecot.conf
-
-if [ ! -f $BEFMAIL ] ; then
-  ln -nsf                                              \
-       /etc/$APPNAME/dovecot/dovecot-2.0-auth-sql.conf \
-       /etc/$APPNAME/dovecot/dovecot-auth-sql.conf
-  ln -nsf                                              \
-       /etc/$APPNAME/dovecot/dovecot-2.0-auth-ldap.conf\
-       /etc/$APPNAME/dovecot/dovecot-auth-ldap.conf
-
-  ln -nsf                                              \
-       /etc/$APPNAME/dovecot/dovecot-auth-sql.conf     \
-       /etc/$APPNAME/dovecot/dovecot-auth.conf
-  cat  /etc/$APPNAME/dovecot/dovecot-auth.conf >> $DOVCONF
-
-  mv $DOVCONF $BEFMAIL
-  ln -nsf $DOVMAIL $DOVCONF
-  /etc/rc.d/init.d/dovecot condrestart
-  fi
+service dovecot restart
 }
 
 #----------------------------------------------------------------------