Merge lp:~giuseppeterrasi-deactivatedaccount/serverguide/serverguide-review12.2 into lp:~ubuntu-core-doc/serverguide/precise

Proposed by Giuseppe Terrasi
Status: Merged
Approved by: Peter Matulis
Approved revision: 35
Merged at revision: 37
Proposed branch: lp:~giuseppeterrasi-deactivatedaccount/serverguide/serverguide-review12.2
Merge into: lp:~ubuntu-core-doc/serverguide/precise
Diff against target: 38 lines (+3/-11)
1 file modified
serverguide/C/lamp-applications.xml (+3/-11)
To merge this branch: bzr merge lp:~giuseppeterrasi-deactivatedaccount/serverguide/serverguide-review12.2
Reviewer Review Type Date Requested Status
Peter Matulis Approve
Review via email: mp+95998@code.launchpad.net

Description of the change

 * Testing istructions
 * Fix path mywiki.py;
 * Fix apache alias: /static_193

To post a comment you must log in.
Revision history for this message
Peter Matulis (petermatulis) wrote :

All good. Thank you.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'serverguide/C/lamp-applications.xml'
--- serverguide/C/lamp-applications.xml 2011-10-08 05:48:25 +0000
+++ serverguide/C/lamp-applications.xml 2012-03-05 20:49:21 +0000
@@ -180,9 +180,8 @@
180 <note>180 <note>
181 <para>181 <para>
182 If the <filename>/etc/moin/mywiki.py</filename> file does not exists,182 If the <filename>/etc/moin/mywiki.py</filename> file does not exists,
183 you should copy <filename>/etc/moin/moinmaster.py</filename> file to183 you should copy <filename>/usr/share/moin/config/wikifarm/mywiki.py</filename> file to
184 <filename>/etc/moin/mywiki.py</filename> file and do the above mentioned184 <filename>/etc/moin/mywiki.py</filename> file and do the above mentioned change.
185 change.
186 </para>185 </para>
187 </note>186 </note>
188187
@@ -211,7 +210,7 @@
211<programlisting>210<programlisting>
212### moin211### moin
213 ScriptAlias /mywiki "/usr/share/moin/mywiki/moin.cgi"212 ScriptAlias /mywiki "/usr/share/moin/mywiki/moin.cgi"
214 alias /moin_static184 "/usr/share/moin/htdocs"213 alias /moin_static193 "/usr/share/moin/htdocs"
215 &lt;Directory /usr/share/moin/htdocs&gt;214 &lt;Directory /usr/share/moin/htdocs&gt;
216 Order allow,deny215 Order allow,deny
217 allow from all216 allow from all
@@ -219,13 +218,6 @@
219### end moin218### end moin
220</programlisting>219</programlisting>
221220
222 <note>
223 <para>
224 Adjust the <emphasis>"moin_static184"</emphasis> in the <emphasis>alias</emphasis> line above,
225 to the <application>moinmoin</application> version installed.
226 </para>
227 </note>
228
229 <para>221 <para>
230 Once you configure the <application>apache2</application> web server and222 Once you configure the <application>apache2</application> web server and
231 make it ready for your Wiki application, you should restart it. You223 make it ready for your Wiki application, you should restart it. You

Subscribers

People subscribed via source and target branches