expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update lots of 'seagrass' references to expo.survex.com, as seagrass

Browse Source 
is gone.
This commit is contained in:
Wookey 2014-05-12 01:30:57 +01:00
parent bd08f9ee75
commit 1598841da4
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
handbook/update.htm
View File

@ -58,7 +58,9 @@ with a cavey:beery password. Ask someone if this isn't enough clue for you.</p>
<h3><a id="repositories">The repositories</a></h3>
<p>All the expo data is contained in 4 'mercurial' repositories at expo.survex.com. This is currently hosted on Julian Todd's server, 'seagrass'. Mercurial* is a distributed version control system which allows collaborative editing and keeps track of all changes so we can roll back and have branches if needed.</p>
<p>All the expo data is contained in 4 'mercurial' repositories at
expo.survex.com. This is currently hosted on a server at Cambridge
University. Mercurial* is a distributed version control system which allows collaborative editing and keeps track of all changes so we can roll back and have branches if needed.</p>
<p>The site has been split into four parts:</p>
@ -84,26 +86,28 @@ stored just as files (not in version control). See below for details on that.</p
<p>If you know what you are doing here is the basic info on what's where:</p>
<dl>
<dt>expoweb on seagrass (The Website)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@seagrass.goatchurch.org.uk/expoweb</tt></dd>
<dt>expoweb (The Website)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@expo.survex.com/expoweb</tt></dd>
<dt>troggle on seagrass (The Website backend)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@seagrass.goatchurch.org.uk/troggle</tt></dd>
<dt>troggle (The Website backend)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@expo.survex.com/troggle</tt></dd>
<dt>loser on seagrass (The survey data)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@seagrass.goatchurch.org.uk/loser</tt></dd>
<dt>loser (The survey data)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@expo.survex.com/loser</tt></dd>
<dt>tunneldata on seagrass (The Tunnel drawings)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@seagrass.goatchurch.org.uk/tunneldata</tt></dd>
<dt>tunneldata (The Tunnel drawings)</dt>
<dd><tt>hg [clone|pull|push] ssh://expo@expo.survex.com/tunneldata</tt></dd>
</dl>
<p>Photos, scans (logbooks, drawn-up cave segments) (This is about 16GB of stuff which you probably don't actually need locally) To sync the files from seagrass to local expoimages directory:</p>
<p>Photos, scans (logbooks, drawn-up cave segments) (This is about
16GB of stuff which you probably don't actually need locally) To sync
the files from the server to local expoimages directory:</p>
<p><tt>rsync -av expo@seagrass.goatchurch.org.uk:expoimages /home/expo/fromserver</tt></p>
<p><tt>rsync -av expo@expo.survex.com:expoimages /home/expo/fromserver</tt></p>
<p>To sync the local expoimage directory back to seagrass:</p>
<p><tt>rsync -av /home/expo/fromserver/expoimages expo@seagrass.goatchurch.org.uk:</tt></p>
<p><tt>rsync -av /home/expo/fromserver/expoimages expo@expo.survex.com:</tt></p>
<p>(do be careful not to delete piles of stuff then rsync back - as it'll all get deleted on the server too, and we may not have backups!)</p>
@ -117,7 +121,7 @@ then restart nautilus (<tt>nautilus -q</tt>). If it works, you'll be able to see
<p>Once you've downloaded and installed a client, the first step is to create what is called a checkout of the website or section of the website which you want to work on. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo website is:</p>
<p><tt>hg clone ssh://expo@seagrass.goatchurch.org.uk/expoweb</tt></p>
<p><tt>hg clone ssh://expo@expo.survex.com/expoweb</tt></p>
<p>for subsequent updates</p>
@ -127,7 +131,7 @@ then restart nautilus (<tt>nautilus -q</tt>). If it works, you'll be able to see
<p>In TortoiseHg, merely right-click on a folder you want to check out to, choose "Mercurial checkout," and enter</p>
<p><tt>ssh://expo@seagrass.goatchurch.org.uk/expoweb</tt></p>
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
<p>After you've made a change, commit it to you local copy with:</p>
@ -151,7 +155,7 @@ then restart nautilus (<tt>nautilus -q</tt>). If it works, you'll be able to see
<p>To start cloning a repository: start TortoiseHg Workbench, click File -> Clone repository, a dialogue box will appear. In the Source box type</p>
<p><tt>ssh://expo@seagrass.goatchurch.org.uk/expoweb</tt></p>
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
<p>or similar for the other repositories. In the Destination box type whatever destination you want your local copies to live in. Hit Clone, and it should hopefully prompt you for the usual beery password. (to be continued) --Zucca 14:25, 25 January 2012 (UTC)</p>
@ -183,7 +187,7 @@ superseded in 2012).</p>
<p>, so to checkout the 2011 page, for example, you would use</p>
<p>hg clone ssh://expo@seagrass.goatchurch.org.uk/expoweb/years/2011</tt></p>
<p>hg clone ssh://expo@expo.survex.com/expoweb/years/2011</tt></p>
<h3><a id="logbooks">Adding typed logbooks</a></h3>
@ -231,7 +235,13 @@ superseded in 2012).</p>
<p>After expo 2009 the VCS was updated to hg, because a DVCS makes a great deal of sense for expo (where it goes offline for a month or two and nearly all the year's edits happen).</p>
<p>The site was moved to Julian Todd's seagrass server, but the change from 32-bit to 64-bit machines broke the website autogeneration code, which was only fixed in early 2011, allowing the move to complete. The data has been split into 3 separate repositories: the website, troggle, the survey data, the tunnel data. Seagrass was turned off at the end of 2013, and the site is now hosted by Sam Wenham at the university.</p>
<p>The site was moved to Julian Todd's seagrass server, but the change
from 32-bit to 64-bit machines broke the website autogeneration code,
which was only fixed in early 2011, allowing the move to complete. The
data has been split into 3 separate repositories: the website,
troggle, the survey data, the tunnel data. Seagrass was turned off at
the end of 2013, and the site has been hosted by Sam Wenham at the
university since Feb 2014.</p>
<h3 id="automation">Automation on cucc.survex.com/expo</h3>