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
1=== modified file 'serverguide/C/lamp-applications.xml'
2--- serverguide/C/lamp-applications.xml 2011-10-08 05:48:25 +0000
3+++ serverguide/C/lamp-applications.xml 2012-03-05 20:49:21 +0000
4@@ -180,9 +180,8 @@
5 <note>
6 <para>
7 If the <filename>/etc/moin/mywiki.py</filename> file does not exists,
8- you should copy <filename>/etc/moin/moinmaster.py</filename> file to
9- <filename>/etc/moin/mywiki.py</filename> file and do the above mentioned
10- change.
11+ you should copy <filename>/usr/share/moin/config/wikifarm/mywiki.py</filename> file to
12+ <filename>/etc/moin/mywiki.py</filename> file and do the above mentioned change.
13 </para>
14 </note>
15
16@@ -211,7 +210,7 @@
17 <programlisting>
18 ### moin
19 ScriptAlias /mywiki "/usr/share/moin/mywiki/moin.cgi"
20- alias /moin_static184 "/usr/share/moin/htdocs"
21+ alias /moin_static193 "/usr/share/moin/htdocs"
22 &lt;Directory /usr/share/moin/htdocs&gt;
23 Order allow,deny
24 allow from all
25@@ -219,13 +218,6 @@
26 ### end moin
27 </programlisting>
28
29- <note>
30- <para>
31- Adjust the <emphasis>"moin_static184"</emphasis> in the <emphasis>alias</emphasis> line above,
32- to the <application>moinmoin</application> version installed.
33- </para>
34- </note>
35-
36 <para>
37 Once you configure the <application>apache2</application> web server and
38 make it ready for your Wiki application, you should restart it. You

Subscribers

People subscribed via source and target branches