diff --git a/Makefile b/Makefile index f3e27fd5dc..565a69226c 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ rpm: mkdir ~/rpmbuild/SOURCES cp ZenTaoPMS.${VERSION}.zip ~/rpmbuild/SOURCES mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p - cp build/rpm/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/ + cp build/debian/zentaopms.conf ~/rpmbuild/SOURCES/etc/httpd/conf.d/ mkdir ~/rpmbuild/SOURCES/var/www/ -p cd ~/rpmbuild/SOURCES; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms var/www/zentao; sed -i 's/index.php/\/zentao\/index.php/' ~/rpmbuild/SOURCES/var/www/zentao/www/.htaccess diff --git a/build/debian/DEBIAN/postinst b/build/debian/DEBIAN/postinst index e0c012f66e..180d16fb54 100755 --- a/build/debian/DEBIAN/postinst +++ b/build/debian/DEBIAN/postinst @@ -1 +1,7 @@ -echo "zentaopms has been successfully installed. Please run sudo apache2ctl restart and visit http://localhost/zentao." +lowVersion=`apache2 -v|awk '$3~/Apache/{print $3}'|awk -F '/' '{print ($2<2.4) ? 1 : 0}'`; +if [ $lowVersion == 1 ]; then +sed -i '/Require all granted/d' /etc/apache2/sites-enabled/zentaopms.conf +fi + +echo "zentaopms has been successfully installed." +echo "Please run sudo apache2ctl restart and visit http://localhost/zentao." diff --git a/build/rpm/zentaopms.conf b/build/rpm/zentaopms.conf deleted file mode 100644 index b3a725e7e5..0000000000 --- a/build/rpm/zentaopms.conf +++ /dev/null @@ -1,7 +0,0 @@ -Alias /zentao /var/www/zentao/www - - - Options FollowSymLinks - DirectoryIndex index.php - AllowOverride All - diff --git a/build/rpm/zentaopms.spec b/build/rpm/zentaopms.spec index 5cfd126ddc..d4e6ccebef 100644 --- a/build/rpm/zentaopms.spec +++ b/build/rpm/zentaopms.spec @@ -33,5 +33,10 @@ rm -rf $RPM_BUILD_ROOT / %post +lowVersion=`httpd -v|awk '$3~/Apache/{print $3}'|awk -F '/' '{print ($2<2.4) ? 1 : 0}'` +if [ $lowVersion == 1 ]; then +sed -i '/Require all granted/d' /etc/httpd/conf.d/zentaopms.conf +fi + echo "zentaopms has been successfully installed." echo "Please restart httpd and visit http://localhost/zentao."