1.1 --- a/README.txt Sat Oct 25 02:13:43 2008 +0200
1.2 +++ b/README.txt Sat Nov 01 02:12:10 2008 +0100
1.3 @@ -18,14 +18,14 @@
1.4
1.5 To set up the Wiki in the main MoinMoin configuration, examine farmconfig.py, then:
1.6
1.7 -sudo ./instwiki
1.8 +sudo ./instwiki /etc/moin
1.9
1.10 (This copies the ep2008.py and farmconfig.py files; if either change
1.11 subsequently, it will be necessary to copy them again.)
1.12
1.13 To set up an Apache site for the Wiki, examine site-ep2008, then:
1.14
1.15 -sudo ./instsite
1.16 +sudo ./instsite /etc/apache2/sites-available
1.17
1.18 Macros (if used) can be installed as follows:
1.19
2.1 --- a/initwiki Sat Oct 25 02:13:43 2008 +0200
2.2 +++ b/initwiki Sat Nov 01 02:12:10 2008 +0100
2.3 @@ -1,7 +1,7 @@
2.4 #!/bin/bash
2.5 # Based on the documentation: /usr/share/doc/python-moinmoin/README.Debian.gz
2.6
2.7 -if [ ! $1 ] ; then
2.8 +if [[ ! $1 ]] ; then
2.9 echo "Please specify a directory such as ../ep2008 or /tmp/ep2008."
2.10 exit
2.11 fi
3.1 --- a/instmacros Sat Oct 25 02:13:43 2008 +0200
3.2 +++ b/instmacros Sat Nov 01 02:12:10 2008 +0100
3.3 @@ -1,6 +1,6 @@
3.4 #!/bin/bash
3.5
3.6 -if [ ! $1 ] ; then
3.7 +if [[ ! $1 ]] ; then
3.8 echo "Please specify a directory such as ../ep2008 or /tmp/ep2008."
3.9 exit
3.10 fi
4.1 --- a/instsite Sat Oct 25 02:13:43 2008 +0200
4.2 +++ b/instsite Sat Nov 01 02:12:10 2008 +0100
4.3 @@ -1,5 +1,11 @@
4.4 #!/bin/bash
4.5 # Based on the documentation: /usr/share/doc/python-moinmoin/README.Debian.gz
4.6
4.7 -cp site-ep2008 /etc/apache2/sites-available/ep2008
4.8 +if [[ ! $1 ]] ; then
4.9 + echo "Please specify a directory containing Apache site definitions such as"
4.10 + echo "/etc/apache2/sites-available (used by Debian and Ubuntu)."
4.11 + exit
4.12 +fi
4.13 +
4.14 +cp site-ep2008 $1/ep2008
4.15 a2ensite ep2008
5.1 --- a/insttheme Sat Oct 25 02:13:43 2008 +0200
5.2 +++ b/insttheme Sat Nov 01 02:12:10 2008 +0100
5.3 @@ -1,6 +1,6 @@
5.4 #!/bin/bash
5.5
5.6 -if [ ! $1 ] ; then
5.7 +if [[ ! $1 ]] ; then
5.8 echo "Please specify a directory such as ../ep2008 or /tmp/ep2008."
5.9 exit
5.10 fi
6.1 --- a/instwiki Sat Oct 25 02:13:43 2008 +0200
6.2 +++ b/instwiki Sat Nov 01 02:12:10 2008 +0100
6.3 @@ -1,5 +1,11 @@
6.4 #!/bin/bash
6.5 # Based on the documentation: /usr/share/doc/python-moinmoin/README.Debian.gz
6.6
6.7 -mv /etc/moin/farmconfig.py /etc/moin/farmconfig.py.old
6.8 -cp ep2008.py farmconfig.py /etc/moin
6.9 +if [[ ! $1 ]] ; then
6.10 + echo "Please specify the directory containing farmconfig.py, such as"
6.11 + echo "/etc/moin (used by Debian and Ubuntu)."
6.12 + exit
6.13 +fi
6.14 +
6.15 +mv $1/farmconfig.py $1/farmconfig.py.old
6.16 +cp ep2008.py farmconfig.py $1