X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=website%2Fmirrors.mdwn;h=44f50d996eda0253e03201e1741d076ce71e011f;hb=550d92828823fdb637119bb0c8d05197074f3920;hp=83bb04504d4fc1452b3cff8ebbcbc7c579ca20e3;hpb=acf06410a88737dbf7bd1966f7c754da08acfea5;p=monkeysphere.git

diff --git a/website/mirrors.mdwn b/website/mirrors.mdwn
index 83bb045..44f50d9 100644
--- a/website/mirrors.mdwn
+++ b/website/mirrors.mdwn
@@ -8,13 +8,13 @@ We're mirrored on several servers. Rather than using ikiwiki's [pinger/pingee
 approach to distribution](http://ikiwiki.info/tips/distributed_wikis/), we've
 opted for a method that uses ssh.
 
-The steps for creating a new mirror are:
+## Initial steps to take on the mirror server ##
 
- * Add etch-backports to your /etc/apt/sources.list:
+Add etch-backports to your /etc/apt/sources.list:
 
     deb http://www.backports.org/debian etch-backports main contrib non-free
 
- * Add the following lines to your /etc/apt/preferences file:
+Add the following lines to your /etc/apt/preferences file:
 
     Package: ikiwiki
     Pin: release a=etch-backports
@@ -29,53 +29,70 @@ The steps for creating a new mirror are:
     Pin: release a=etch-backports
     Pin-Priority: 999
 
-	* Install git-core and ikiwiki
+Install git-core and ikiwiki
 
     aptitude update; aptitutde install git-core ikiwiki
 
-	* Create a new user. Change the new users shell to git-shell:
+Create a new user. Change the new users shell to git-shell:
 
     adduser -s /usr/bin/git-shell <username>
 
-	* Add webmaster@george's public key to this user's ~/.ssh/authorized_keys file
+Add webmaster@george's public key to this user's ~/.ssh/authorized_keys file
 
-	* Add web site configuration that the user has write access to. If you are using Apache, include the following rewrite:
+Add web site configuration that the user has write access to. If you are using Apache, include the following rewrite:
 
     RewriteEngine On
     RewriteCond %{HTTP_HOST} !^(YOURHOSTNAME|web)\.monkeysphere\.info$ [NC]
     RewriteCond %{HTTP_HOST} !^$
     RewriteRule ^/(.*) http://web.monkeysphere.info/$1 [L,R]
 
-	* Upload and edit ikiwiki.setup.sample from the docs directory
+Upload and edit ikiwiki.setup.sample from the docs directory
 
-	* As the new user, create two new git repos
+As the new user, create a git repo
 
-    mkdir monkeysphere.git; cd monkeysphere.git; git init --bare; cd ../
-    git clone monkeysphere.git # this will create a second git repo called monkeysphere
+    mkdir monkeysphere.git; cd monkeysphere.git; git init --bare;
 
-	* Change the mode of monkeysphere.git/hooks/post-receive to 755
 
-    chmod 755 monkesphere.git/hooks/post-receive
-
-	* Edit the file so that it executes the post-receive hook ikiwiki
-	generates (as you specified in the ikiwiki.setup file)
+## Initial Admin steps to take to enable the configuration ##
 
-The steps to be taken on the mirror site should now be complete. The
-following steps should be taken by a Monkeysphere admin user:
+Add a new dns record for SERVERNAME.monkeysphere.info. 
 
- * Add a new dns record for SERVERNAME.monkeysphere.info. 
+Test the ssh connection by logging in as webmaster@george.riseup.net
 
- * Test the ssh connection by logging in as webmaster@george.riseup.net
-
- * Add the new server as a remote on
-	webmaster@george.riseup.net:monkeysphere.git
+Add the new server as a remote on webmaster@george.riseup.net:monkeysphere.git
 
     cd ~/monkeysphere.git
     git add remote SERVERNAME USER@SERVERNAME.monkeysphere.info:/path/to/repo
 
- * Test:
+Modify ~/monkeysphere.git/config, so the new repo stanza looks like this:
+
+    [remote "SERVERNAME"]
+		url = USER@SERVERNAME.monkeysphere.info:monkeysphere.git
+		push = +refs/heads/master
+		skipDefaultUpdate = true
+
+Test:
 
     git push SERVERNAME
 
 
-    
+## Final steps to take on mirror server ##
+
+At this point, you should have a populated git repo in your
+monkeyshere.git directory. 
+
+Change the mode of monkeysphere.git/hooks/post-receive to 755
+
+    chmod 755 monkesphere.git/hooks/post-receive
+
+Edit the file so that it executes the post-receive hook ikiwiki generates (as
+you specified in the ikiwiki.setup file)
+
+Next, clone the repository:
+
+    clone monkeysphere.git monkeysphere
+
+And lastly, run ikiwiki manually to generate the post-receive hook:
+
+    ikiwiki --setup ikiwiki.setup
+