From 243d2b7434452512964fe59b3bd781cb315df519 Mon Sep 17 00:00:00 2001 From: immarvin Date: Sat, 5 Jul 2014 04:53:49 -0700 Subject: [PATCH] fix defect #4190 [DEV]apache2 configuration file /etc/apache2/conf-enabled/xcat.conf.apach24 failed to be applied on ubuntu14.04 MN --- xCAT/debian/dirs | 1 + xCAT/debian/install | 3 ++- xCAT/debian/postinst | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xCAT/debian/dirs b/xCAT/debian/dirs index 7fed8339e..f1b529689 100644 --- a/xCAT/debian/dirs +++ b/xCAT/debian/dirs @@ -5,5 +5,6 @@ install/prescripts install/kdump opt/xcat/share/xcat etc/apache2/conf.d +etc/apache2/conf-available etc/apache2/conf-enabled opt/xcat/share/doc/packages/xCAT diff --git a/xCAT/debian/install b/xCAT/debian/install index ab485abda..33798984d 100644 --- a/xCAT/debian/install +++ b/xCAT/debian/install @@ -1,5 +1,6 @@ xcat.conf etc/apache2/conf.d/ -xcat.conf.apach24 etc/apache2/conf-enabled +xcat.conf etc/apache2/conf-available/ +xcat.conf.apach24 etc/apache2/conf-available/ LICENSE.html opt/xcat/share/doc/packages/xCAT postscripts/* install/postscripts/ prescripts/* install/prescripts/ diff --git a/xCAT/debian/postinst b/xCAT/debian/postinst index 0490badea..466289e9a 100644 --- a/xCAT/debian/postinst +++ b/xCAT/debian/postinst @@ -42,7 +42,7 @@ case "$1" in fi # [ -e /etc/apache2/conf-enabled/xcat.conf ] && rm /etc/apache2/conf-enabled/xcat.conf - mv -f /etc/apache2/conf-enabled/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf + ln -s -f /etc/apache2/conf-available/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf /etc/init.d/apache2 restart ;;