From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 20 Feb 2009 10:27:44 +0000 (+0000)
Subject: adopt workaround.conf (as limits.conf)
X-Git-Tag: PLEWWW-4.3-1~31
X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=commitdiff_plain;h=53059600b94080446aa3621e17ed8c9b710d30f2

adopt workaround.conf (as limits.conf)
---

diff --git a/httpd/limits.conf b/httpd/limits.conf
new file mode 100644
index 0000000..046e0c8
--- /dev/null
+++ b/httpd/limits.conf
@@ -0,0 +1,8 @@
+# for better stability
+StartServers		8
+MinSpareServers		5
+MaxSpareServers		20
+ServerLimit		256
+MaxClients		256
+MaxRequestsPerChild	50
+
diff --git a/httpd.conf b/httpd/plewww.conf
similarity index 100%
rename from httpd.conf
rename to httpd/plewww.conf
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