diff --git a/makerpm b/makerpm index 5fa58918a..e48de76d5 100755 --- a/makerpm +++ b/makerpm @@ -85,6 +85,7 @@ function makexcat { cd `dirname $0`/$RPMNAME tar --exclude .svn -czf $RPMROOT/SOURCES/license.tar.gz LICENSE.html cp xcat.conf $RPMROOT/SOURCES + cp xcat.conf.apach24 $RPMROOT/SOURCES cp xCATSN $RPMROOT/SOURCES cd - >/dev/null elif [ "$RPMNAME" = "xCAT-buildkit" ]; then diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 11a2c55ae..3838d7268 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -171,7 +171,7 @@ then cp /etc/httpd/conf.d/xcat.conf.apach24 /etc/httpd/conf.d/xcat.conf elif [ -n "$(apachectl -v 2>&1 |grep -e '^Server version\s*:.*\/2.4')" ] then - rm -rf /etc/httpd/conf.d/xcat.conf + rm -rf /etc/apache2/conf.d/xcat.conf cp /etc/apache2/conf.d/xcat.conf.apach24 /etc/apache2/conf.d/xcat.conf else rm -rf /etc/httpd/conf.d/xcat.conf