Skip to content

Commit

Permalink
Irminsule -> Irmin
Browse files Browse the repository at this point in the history
Replace all mentions of Irminsule with the new name of Irmin.
This will all be reworked for a new MISO site but it's worth
correcting it now.

Closes #13
[skip ci]
  • Loading branch information
amirmc committed Jun 30, 2014
1 parent b6a02c8 commit 5612022
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 60 deletions.
22 changes: 11 additions & 11 deletions _includes/frontpage/about-mugshots.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,27 @@ <h5 class="profile-name">
</div>

<div class="span2 profile">
<a href="http://www.cs.nott.ac.uk/~rmm">
<a href="http://dave.recoil.org">
<div class="image-wrap">
<div class="hover-wrap">
<span class="overlay-img"></span>
<span class="overlay-text-thumb">Signpost<br/>Lead</span>
<span class="overlay-text-thumb">Mirage<br/>Lead</span>
</div>
<img src="images/mugshots/mort.png" alt="Mort">
<img src="images/mugshots/djs.jpg" alt="David S">
</div>
</a>
<h5 class="profile-name">
<a href="http://www.cs.nott.ac.uk/~rmm">Richard M</a>
<a href="http://dave.recoil.org">David S</a>
</h5>
<p class="profile-description"></p>
<p class="profile-description"></p>
</div>

<div class="span2 profile">
<a href="http://gazagnaire.org">
<div class="image-wrap">
<div class="hover-wrap">
<span class="overlay-img"></span>
<span class="overlay-text-thumb">Irminsule<br/>Lead</span>
<span class="overlay-text-thumb">Irmin<br/>Lead</span>
</div>
<img src="images/mugshots/tg.png" alt="Thomas">
</div>
Expand All @@ -79,19 +79,19 @@ <h5 class="profile-name">
</div>

<div class="span2 profile">
<a href="http://dave.recoil.org">
<a href="http://www.cs.nott.ac.uk/~rmm">
<div class="image-wrap">
<div class="hover-wrap">
<span class="overlay-img"></span>
<span class="overlay-text-thumb">Mirage<br/>Lead</span>
<span class="overlay-text-thumb">Signpost<br/>Lead</span>
</div>
<img src="images/mugshots/djs.jpg" alt="David S">
<img src="images/mugshots/mort.png" alt="Mort">
</div>
</a>
<h5 class="profile-name">
<a href="http://dave.recoil.org">David S</a>
<a href="http://www.cs.nott.ac.uk/~rmm">Richard M</a>
</h5>
<p class="profile-description"></p>
<p class="profile-description"></p>
</div>

<div class="span2 profile">
Expand Down
6 changes: 3 additions & 3 deletions _includes/frontpage/sw-infra-intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2 id='infrastructure'>
systems that anyone can build on. These tools are the bedrock on which
we will create the next generation of products. They deal with the
issues of
<a href='#signpost'>connectivity</a>,
<a href='#irminsule'>synchronisation</a>, and
<a href='#mirage'>deployment</a>.
<a href='#mirage'>deployment</a>,
<a href='#irmin'>synchronisation</a> and
<a href='#signpost'>connectivity</a>.
</p>
42 changes: 20 additions & 22 deletions _includes/frontpage/sw-infra.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ <h3 id='mirage'>Mirage</h3>
<div class="span3">
<div class="services-box">
<div class="icon" style="margin-top: 5px;">
<a href="/software/signpost"><span class="icon-compass"></span></a>
<a href="/software/irmin"><span class="icon-refresh"></span></a>
</div>
</div>
</div>
<div class="span9">
<h3 id='signpost'>Signpost</h3>
<h3 id='irmin'>Irmin</h3>
<p>
The cloud is a (mostly) always available service that can be seen by
all devices. Without this, it is difficult for individual devices to
find each other. <strong>Signpost</strong> is building &#8220;personal
cloud&#8221; infrastructure to let your devices all see each and reach
each other without requiring any complex configuration. Once all your
devices can find each other, regardless of location, you effectively
have your own little internet.<br />
<em>(<a href='/software/signpost/'>more about signpost</a></em>)
Having multiple devices has made the engineering effort around data
persistence and sync more complex. We have to concern ourselves about
how data obtained for one device is made available and useful to
others, without losing history. <strong>Irmin</strong> is a new
kind of library database, based on the principles of Git (the version
control system), meaning that all history can be kept and moved
between devices with ease.<br />
<em>(<a href='/software/irmin/'>more about irmin</a></em>)
</p>
</div>
</div>
Expand All @@ -48,23 +48,21 @@ <h3 id='signpost'>Signpost</h3>
<div class="span3">
<div class="services-box">
<div class="icon" style="margin-top: 5px;">
<a href="/software/irminsule"><span class="icon-refresh"></span></a>
<a href="/software/signpost"><span class="icon-compass"></span></a>
</div>
</div>
</div>
<div class="span9">
<h3 id='irminsule'>Irminsule</h3>
<h3 id='signpost'>Signpost</h3>
<p>
Having multiple devices has made the engineering effort around data
persistence and sync more complex. We have to concern ourselves about
how data obtained for one device is made available and useful to
others, without losing history. <strong>Irminsule</strong> is a new
kind of library database, based on the principles of Git (the version
control system), meaning that all history can be kept and moved
between devices with ease.<br />
<em>(<a href='/software/irminsule/'>more about irminsule</a></em>)
The cloud is a (mostly) always available service that can be seen by
all devices. Without this, it is difficult for individual devices to
find each other. <strong>Signpost</strong> is building &#8220;personal
cloud&#8221; infrastructure to let your devices all see each and reach
each other without requiring any complex configuration. Once all your
devices can find each other, regardless of location, you effectively
have your own little internet.<br />
<em>(<a href='/software/signpost/'>more about signpost</a></em>)
</p>
</div>
</div>


2 changes: 1 addition & 1 deletion _wip/old/about/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ contributors so far.

[![Thomas](/images/mugshots/tg.png)][thomas-www]
*[Thomas Gazagnaire][thomas-www]*
**Lead for [Irminsule](/software/irminsule)**
**Lead for [Irmin](/software/irmin)**
[thomas-www]: http://gazagnaire.org

[![David](/images/mugshots/djs.jpg)][scotty-www]
Expand Down
8 changes: 4 additions & 4 deletions _wip/old/software-page.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The underlying building blocks are a crucial piece of the puzzle. We need
robust and open-source tools that allow us to create distributed systems
that anyone can build on. These tools are the bedrock on which we will
create the next generation of products. They deal with the issues of
[connectivity](#signpost), [synchronisation](#irminsule), and
[connectivity](#signpost), [synchronisation](#irmin), and
[deployment](#mirage).

### Signpost
Expand All @@ -40,16 +40,16 @@ any complex configuration. Once all your devices can find each other,
regardless of location, you effectively have your own little internet.
*([more about signpost](./signpost/)*)

### Irminsule
### Irmin

<img style="float:right;" src="/images/tree_of_digital_life-thumb.png">
Having multiple devices has made the engineering effort around data
persistence and sync more complex. We have to concern ourselves about how
data obtained for one device is made available and useful to others, without
losing history. **Irminsule** is a new kind of library database, based on
losing history. **Irmin** is a new kind of library database, based on
the principles of Git (the version control system), meaning that all history
can be kept and moved between devices with ease.
*([more about irminsule](./irminsule/)*)
*([more about irmin](./irmin/)*)

### Mirage

Expand Down
10 changes: 5 additions & 5 deletions blog/_posts/2013-09-02-introducing-nymote.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: post
title: "Introducing Nymote"
author: Amir Chaudhry
tags: [infrastructure, internet of things, irminsule, mirage, signpost, tools]
tags: [infrastructure, internet of things, irmin, mirage, signpost, tools]
excerpt: "Nymote is a set of tools and software infrastructure, created from
the ground up, to provide end-users with life-long control of their networks
and personal data."
Expand Down Expand Up @@ -115,11 +115,11 @@ upgrade.
<a href="http://www.flickr.com/photos/jezpage/4990873353/"><img style="float:right" src="/images/lego-blocks.jpg"></a>
We're starting with fundamental [infrastructure][] to solve the problems
around [operating systems][Mirage] for the future, [identity][Signpost] for
users and devices and [data-persistence][Irminsule] across those devices.
users and devices and [data-persistence][Irmin] across those devices.

[Mirage]: /software/mirage
[Signpost]: /software/signpost
[Irminsule]: /software/irminsule
[Irmin]: /software/irmin

We began work on these issues four years ago under the umbrella of the
[Horizon Digital Economy programme][horizon-de], at Cambridge University and
Expand Down Expand Up @@ -171,9 +171,9 @@ approach.
[signposter1]: /docs/2012-signpost-poster-a4.pdf
[signposter2]: /docs/2012-sigcomm-signposts-poster.pdf

Finally, we will cover **[Irminsule][]**, which rethinks how we *persist data
Finally, we will cover **[Irmin][]**, which rethinks how we *persist data
* based on the principles of version control systems such as Git (or
historically, [Bayou][]). Irminsule incorporates provenance and sync and
historically, [Bayou][]). Irmin incorporates provenance and sync and
solves the problems of how all a user's devices coordinate and remain
synchronised with each other, and how that data is seamlessly backed up and
encrypted to prevent third-party snooping. This is increasingly important as
Expand Down
4 changes: 2 additions & 2 deletions blog/_posts/2013-09-12-indiewebcamp-uk.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ saw because it deals with some of the fundamental problems people need to
solve. For the case of Indie Web participants that meant dealing with
identity and authentication ([Signpost][]) as well as connectivity
([Signpost][] again) and deployment ([Mirage][]). We did briefly discuss
immutable datastores and sync problems, where [Irminsule][] is relevant.
immutable datastores and sync problems, where [Irmin][] is relevant.
I've collected some of these projects on a [links page][], which I'll be
adding to over time. Please do [send me][email-link] any interesting things
which should go on that list.
Expand Down Expand Up @@ -93,7 +93,7 @@ Below are some quick notes I took during the sessions I attended.
[HubMed]: http://www.hubmed.org
[PubMed]: http://www.ncbi.nlm.nih.gov/pubmed
[Mirage]: /software/mirage
[Irminsule]: /software/irminsule
[Irmin]: /software/irmin
[links page]: /links
[food-fest]: http://brightonfoodfestival.com
[email-link]: mailto:[email protected]?subject=New%20link%20to%20consider!
Expand Down
4 changes: 2 additions & 2 deletions blog/_posts/2013-10-03-overview-of-mirage.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ short duration that they're needed.

Overall, Mirage provides substantial benefits in terms of increased
efficiency and safety and is ideal for deploying to both the public could
and embedded devices. Together with [Signpost][] and [Irminsule][], Mirage
and embedded devices. Together with [Signpost][] and [Irmin][], Mirage
forms a core piece of the Nymote toolstack to power the coming wave of
[Internet of Things devices][iot-wiki].

Expand All @@ -138,7 +138,7 @@ slides on the [Mirage page](/software/mirage).
[mirage-www]: http://openmirage.org
[RPi]: http://www.raspberrypi.org
[Signpost]: /software/signpost
[Irminsule]: /software/irminsule
[Irmin]: /software/irmin
[iot-wiki]: http://en.wikipedia.org/wiki/Internet_of_Things
[horizon]: http://www.horizon.ac.uk
[mirage-github]: http://github.com/mirage
6 changes: 3 additions & 3 deletions blog/_posts/2014-01-13-announcing-first-mirage-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: "Announcing the first major release of Mirage - the Cloud Operating Syste
author: Amir Chaudhry and Anil Madhavapeddy
date: 2014-01-13 17:00:00
tags: [mirage, releases, software]
excerpt: "We're very pleased to announce that version 1.0 of Mirage, the first of the components, has been released! This is the first major release of Mirage and represents many years of development, testing and community building. As mentioned previously, there are three main components of the Nymote toolstack, which are: Mirage - an operating system for the cloud, Signpost - an identity and connectivity system and Irminsule - a distributed database. As always, the best way to learn is to try things out, so follow the revamped install instructions and create your own webserver to host a static website!"
excerpt: "We're very pleased to announce that version 1.0 of Mirage, the first of the components, has been released! This is the first major release of Mirage and represents many years of development, testing and community building. As mentioned previously, there are three main components of the Nymote toolstack, which are: Mirage - an operating system for the cloud, Signpost - an identity and connectivity system and Irmin - a distributed database. As always, the best way to learn is to try things out, so follow the revamped install instructions and create your own webserver to host a static website!"
shorturl: http://nymote.org/blog/announcing-first-mirage-release
---
{% include JB/setup %}
Expand All @@ -15,7 +15,7 @@ represents many years of development, testing and community building. As
mentioned previously, there are three main components of the
[Nymote toolstack][nymote-intro], which are: [Mirage][mirage-nym] - an
operating system for the cloud, [Signpost][signpost-nym] - an identity and
connectivity system and [Irminsule][irmin-nym] - a distributed database. As
connectivity system and [Irmin][irmin-nym] - a distributed database. As
always, the best way to learn is to try things out, so follow the revamped
[install instructions][mirage-install] and create your own webserver to host
a static website!
Expand Down Expand Up @@ -67,7 +67,7 @@ will open up for us!
[nymote-intro]: http://nymote.org/blog/2013/introducing-nymote/
[mirage-nym]: http://nymote.org/software/mirage/
[signpost-nym]: http://nymote.org/software/signpost/
[irmin-nym]: http://nymote.org/software/irminsule/
[irmin-nym]: http://nymote.org/software/irmin/
[mirage-install]: http://openmirage.org/wiki/install
[mirage-post]: http://nymote.org/blog/2013/overview-of-mirage/
[mirage-www]: http://openmirage.org
Expand Down
2 changes: 1 addition & 1 deletion blog/_posts/2014-01-30-heading-to-fosdem-2014.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: post
title: "Heading to FOSDEM!"
author: Amir Chaudhry
date: 2014-01-30 09:00:00
tags: [conference, demo, irminsule, mirage]
tags: [conference, demo, irmin, mirage]
excerpt: "We're heading to FOSDEM in a few days! If you haven't heard of FOSDEM before, it's a two-day, volunteer-organised event to promote open source software. It takes place in Brussels and there will be over 500 talks, across 44 tracks attended by around 5000 people. The numbers alone don't capture the scale of the event so click though the image below for a view of the schedule -- and that's just for the Saturday. Did I mention this is all run by volunteers?"
shorturl: http://bit.ly/MyEWP2
---
Expand Down
2 changes: 1 addition & 1 deletion blog/_posts/2014-02-11-fosdem-summary.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: post
title: "Summary of FOSDEM 2014"
author: Amir Chaudhry
date: 2014-02-11 13:40:00
tags: [conference, demo, irminsule, mirage]
tags: [conference, demo, irmin, mirage]
excerpt: "It's been just over a week since FOSDEM ended and it was even more hectic than we imagined. Thousands of open source developers across dozens of rooms and speakers and lots of delicious waffles. I'm still in awe that this is a completely volunteer organised event and that everything appeared to run smoothly."
shorturl: http://bit.ly/1fcKu8o
---
Expand Down
12 changes: 7 additions & 5 deletions software/irminsule/index.md → software/irmin/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: Irminsule
title: Irmin
tagline: "A branch-consistent 'git-like' database"
next: "Create prototype for distributed queues"

Expand All @@ -13,19 +13,21 @@ next: "Create prototype for distributed queues"
Having multiple devices has made the engineering effort around data
persistence and sync more complex. We have to concern ourselves about how
data obtained for one device is made available and useful to others, without
losing history. **Irminsule** is a new kind of library database, based on
losing history. **Irmin** is a new kind of library database, based on
the principles of Git (the version control system), meaning that all history
can be kept and moved between devices with ease.

Many third-party services have arisen to tackle the specific issue of how
our content remains synchronised across our devices. Yet most of them rely
on the premise of having one canonical location from which all other devices
take their cues. This is invariably somewhere up in the cloud and is
subject to the whims of the providers. Developers have had good distributed solutions that don't rely on one authority but why have such approaches not made it into more mainstream products?
subject to the whims of the providers. Developers have had good distributed
solutions that don't rely on one authority but why have such approaches not
made it into more mainstream products?

**Irminsule** is a library database that takes the principles behind tools
**Irmin** is a library database that takes the principles behind tools
like Git and applies them to the wider problem of storing and syncing our
data. This allows the possibility for all software using the Irminsule
data. This allows the possibility for all software using the Irmin
layer to remain in sync as changes can be pushed directly from one location
to another. It also allows the possibility of reverting to previous
versions of any content as all history is also preserved.
Expand Down
1 change: 1 addition & 0 deletions software/irminsule/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<meta http-equiv="refresh" content="0; url=../irmin">

0 comments on commit 5612022

Please sign in to comment.