[tw] - removed aliases from postfix-files (#135840)

- fixed postalias call in init script
This commit is contained in:
Thomas Woerner 2004-10-15 13:48:00 +00:00
parent f109565755
commit 10a61439f3
2 changed files with 11 additions and 6 deletions

View File

@ -34,7 +34,7 @@ RETVAL=0
start() { start() {
# Start daemons. # Start daemons.
echo -n "Starting postfix: " echo -n "Starting postfix: "
/usr/sbin/postalias /etc/postfix/aliases /usr/sbin/postalias /etc/aliases
/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure /usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure
RETVAL=$? RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix [ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix

View File

@ -47,7 +47,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 2.1.5 Version: 2.1.5
Release: 2 Release: 2.1
Epoch: 2 Epoch: 2
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.postfix.org URL: http://www.postfix.org
@ -327,10 +327,10 @@ perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl,g" $RPM_BUILD_ROOT%{postfix_doc
%endif %endif
# Change alias_maps and alias_database default directory to %{postfix_config_dir} # Change alias_maps and alias_database default directory to %{postfix_config_dir}
#bin/postconf -c $RPM_BUILD_ROOT%{postfix_config_dir} -e \ bin/postconf -c $RPM_BUILD_ROOT%{postfix_config_dir} -e \
# "alias_maps = hash:/etc/aliases" \ "alias_maps = hash:/etc/aliases" \
# "alias_database = hash:/etc/aliases" \ "alias_database = hash:/etc/aliases" \
#|| exit 1 || exit 1
# This installs into the /etc/rc.d/init.d directory # This installs into the /etc/rc.d/init.d directory
/bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d /bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
@ -354,6 +354,7 @@ done
# when called during package installation. # when called during package installation.
ed $RPM_BUILD_ROOT%{postfix_config_dir}/postfix-files <<EOF || exit 1 ed $RPM_BUILD_ROOT%{postfix_config_dir}/postfix-files <<EOF || exit 1
%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ %s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
%s/\$config_directory\/aliases:f/\#/
w w
q q
EOF EOF
@ -561,6 +562,10 @@ exit 0
%changelog %changelog
* Fri Oct 15 2004 Thomas Woerner <twoerner@redhat.com> 2:2.1.5-2.1
- removed aliases from postfix-files (#135840)
- fixed postalias call in init script
* Thu Oct 14 2004 Thomas Woerner <twoerner@redhat.com> 2:2.1.5-2 * Thu Oct 14 2004 Thomas Woerner <twoerner@redhat.com> 2:2.1.5-2
- switched over to system aliases file and database in /etc/ (#117661) - switched over to system aliases file and database in /etc/ (#117661)
- new reuires and buildrequires for setup >= 2.5.36-1 - new reuires and buildrequires for setup >= 2.5.36-1