X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plewww.spec;h=17b947171ca01a427055ef2ceb58df1edfdc9f81;hb=53059600b94080446aa3621e17ed8c9b710d30f2;hp=cc3a8cddd87810891b7b628d510301232acac889;hpb=847006de47d4f1868cecf6126801a94e26f709ad;p=plewww.git

diff --git a/plewww.spec b/plewww.spec
index cc3a8cd..17b9471 100644
--- a/plewww.spec
+++ b/plewww.spec
@@ -69,11 +69,12 @@ rm -rf $RPM_BUILD_ROOT
 
 echo "* PLEWWW: Installing web pages"
 mkdir -p $RPM_BUILD_ROOT/var/www/html
-# let's be conservative and exclude codebase files, though there should not be any
-rsync -a --exclude \*.spec --exclude .svn --exclude CVS --exclude Makefile --exclude httpd.conf ./ $RPM_BUILD_ROOT/var/www/html/
+# exclude codebase just in case
+rsync -a --exclude Makefile --exclude httpd --exclude \*.spec --exclude .svn ./ $RPM_BUILD_ROOT/var/www/html/
 
-echo "* PLEWWW: Installing config for httpd"
-install -D -m 644 httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/plewww.conf
+echo "* PLEWWW: Installing conf files for httpd"
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/plewww.conf
+install -D -m 644 httpd/*.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
 
 %post
 # attempt to perform most of the drupal post-install stuff - assuming version 6.x
@@ -115,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab
 /var/www/html/googlemap
 /var/www/html/drupal-hacks
-/etc/httpd/conf.d/plewww.conf
+/etc/httpd/conf.d
 
 %files plekit
 /var/www/html/plekit