X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=88acdbec9cea610b1e6893afb9b62b9ac3da5428;hb=79acdcde24a0141ab9abc62430d25a8071d1b688;hp=955e4968ca65e698f17d341731baf4b829edf150;hpb=a31763255c3589a8aa8adb90b27e42b7fbfe1b80;p=proftpd-cn.git diff --git a/debian/postinst b/debian/postinst index 955e496..88acdbe 100755 --- a/debian/postinst +++ b/debian/postinst @@ -29,7 +29,7 @@ esac # created: 2002-11-15 Bozo Juretic # last update: 2007-05-14 Zoran Dzelajlija -# last update: 2007-10-27 Dinko Korunic +# last update: 2011-04-24 Dinko Korunic # Source debconf library. . /usr/share/debconf/confmodule @@ -40,8 +40,8 @@ esac FTP_CONF=/etc/proftpd/proftpd.conf FTP_TMP=`mktemp /etc/proftpd/proftpd.conf.XXXXXX` FTP_OLD=/var/backups/proftpd.conf.bak -SSL_CERT=/etc/ssl/certs/ftpd-rsa.pem -SSL_KEY=/etc/ssl/certs/ftpd-rsa-key.pem +SSL_CERT=/etc/ssl/certs/ftpd.pem +SSL_KEY=/etc/ssl/private/ftpd.pem # Backup stare konfiguracije cp_backup_conffile $FTP_CONF @@ -127,7 +127,7 @@ include_modules() if ! egrep -qi "^[[:space:]]*Include.*/etc/proftpd/modules.conf" $FTP_TMP ; then printf "#\n# Includes required DSO modules. This is mandatory in proftpd 1.3\n#\nInclude\t/etc/proftpd/modules.conf\n\n" >$FTP_TMP.tmp.$$ cat $FTP_TMP >>$FTP_TMP.tmp.$$ - mv -f $FTP_TMP.tmp.$$ $FTP_TMP + cp_mv $FTP_TMP.tmp.$$ $FTP_TMP fi fi } @@ -135,13 +135,12 @@ include_modules() # Generiranje SSL certifikata make_ssl_cert() { - if [ ! -f $SSL_CERT ] ; then - cd $(dirname $SSL_CERT) - echo "CN: Generating SSL certificate ... " + if [ \( ! -f $SSL_CERT \) -o \( ! -f $SSL_KEY \) ] ; then + echo "CN: Generating SSL certificate... " HOSTNAME=`hostname -s` FQDN=`hostname -f` MAILNAME=`cat /etc/mailname 2> /dev/null || hostname -f` - (openssl req -new -x509 -days 365 -nodes -out $(basename $SSL_CERT) -keyout $(basename $SSL_KEY) >/dev/null 2>&1 </dev/null 2>&1 <