From: Marcin Krol Date: Wed, 24 Apr 2024 22:58:37 +0000 (+0200) Subject: - drop old configuration migration triggers X-Git-Url: https://git.tld-linux.org/?p=packages%2Fproftpd.git;a=commitdiff_plain;h=ae170cf7d8cf8d9bb593ad06858f1eee8ea6936a - drop old configuration migration triggers --- diff --git a/proftpd.spec b/proftpd.spec index 631f405..db0c38e 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -655,35 +655,6 @@ if [ "$2" != 1 ]; then %service -q proftpd restart fi -%triggerun common -- proftpd-common < 2:1.3.6-5 -if [ $1 -le 1 ]; then - exit 0 -fi -[ -d /etc/proftpd/conf.d ] || mkdir -p /etc/proftpd/conf.d 2>/dev/null || : -for f in /etc/ftpd/{conf.d/mod_{auth_file,clamav,ident}.conf,ftpusers,ftpusers.default,proftpd.conf}; do - f=${f##*/} - [ -f "/etc/ftpd/$f" ] && mv "/etc/ftpd/$f" /etc/proftpd 2>/dev/null || : - [ -f "/etc/ftpd/conf.d/$f" ] && mv "/etc/ftpd/conf.d/$f" /etc/proftpd/conf.d 2>/dev/null || : -done -find /etc/proftpd -type f 2>/dev/null | xargs sed -i -e 's|/etc/ftpd|/etc/proftpd|g' 2>/dev/null -[ -n "$(find /etc/ftpd/conf.d -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || : -[ -n "$(find /etc/ftpd -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || : - -%triggerpostun common -- proftpd-common < 2:1.3.6-5 -echo -echo "Warning! Configuration has been migrated to /etc/proftpd." -echo - -%triggerun anonftp -- proftpd-anonftp < 2:1.3.6-5 -if [ $1 -le 1 ]; then - exit 0 -fi -[ -d /etc/proftpd/conf.d ] || mkdir -p /etc/proftpd 2>/dev/null || : -[ -f /etc/ftpd/conf.d/anonftp.conf ] && mv /etc/ftpd/conf.d/anonftp.conf /etc/proftpd/conf.d 2>/dev/null || : -sed -i -e 's|/etc/ftpd|/etc/proftpd|g' /etc/ftpd/conf.d/anonftp.conf 2>/dev/null -[ -n "$(find /etc/ftpd/conf.d -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || : -[ -n "$(find /etc/ftpd -type d -empty 2>/dev/null)" ] && rmdir /etc/ftpd 2>/dev/null || : - %module_scripts mod_auth_pam %module_scripts mod_ldap %module_scripts mod_quotatab