Merge lp://qastaging/~mathiaz/eucalyptus/k-mod-alias into lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu

Proposed by Mathias Gug
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~mathiaz/eucalyptus/k-mod-alias
Merge into: lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~mathiaz/eucalyptus/k-mod-alias
Reviewer Review Type Date Requested Status
Soren Hansen Pending
Review via email: mp+11073@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathias Gug (mathiaz) wrote :

Load mod alias.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-09-02 05:46:00 +0000
3+++ debian/changelog 2009-09-02 17:40:30 +0000
4@@ -1,3 +1,9 @@
5+eucalyptus (1.6~bzr588-0ubuntu5) UNRELEASED; urgency=low
6+
7+ * Load apache2 alias module when generating httpd CC configuration.
8+
9+ -- Mathias Gug <mathiaz@ubuntu.com> Wed, 02 Sep 2009 13:39:18 -0400
10+
11 eucalyptus (1.6~bzr588-0ubuntu4) karmic; urgency=low
12
13 * eucalyptus-commons-ext changed its jarname again. Adjust accordingly
14
15=== modified file 'tools/eucalyptus-cc.in'
16--- tools/eucalyptus-cc.in 2009-09-01 23:02:23 +0000
17+++ tools/eucalyptus-cc.in 2009-09-02 15:59:15 +0000
18@@ -130,6 +130,7 @@
19 # let's configure the CC
20 cat $EUCALYPTUS/etc/eucalyptus/httpd-tmp.conf |sed "s|\(Listen\).*|\1 $CC_PORT|"|sed "s|\(PidFile\).*|\1 $EUCALYPTUS/var/run/eucalyptus/eucalyptus-cc.pid|"|sed "s|\(Allow from\).*|\1 $IPS|"|sed "s|\(ErrorLog\).*|\1 $EUCALYPTUS/var/log/eucalyptus/httpd-cc_error_log|"|sed "s|\(StartServers\).*|\1 5|"|sed "s|\(MinSpareServers\).*|\1 5|"|sed "s|\(MaxSpareServers\).*|\1 10|"|sed "s|\(MaxClients\).*|\1 25|" |sed "s|\(MinSpareThreads\).*|\1 5|" | sed "s|\(MaxSpareThreads\).*|\1 10|" | sed "s|\(ThreadsPerChild\).*|\1 25|"> $EUCALYPTUS/etc/eucalyptus/httpd-cc.conf
21 cat >>$EUCALYPTUS/etc/eucalyptus/httpd-cc.conf <<EOF
22+LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
23 Alias /node-preseed /etc/eucalyptus/node-preseed.conf
24 <Files /etc/eucalyptus/node-preseed.conf>
25 Order allow,deny

Subscribers

People subscribed via source and target branches