summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/en/commands.html0
-rw-r--r--docs/en/guide/virtual-machines.html2
-rw-r--r--docs/en/guide/virtual-machines/index.html2
-rw-r--r--docs/en/services/couchdb.html2
-rw-r--r--docs/en/services/couchdb/index.html2
-rw-r--r--docs/en/services/mx.html4
-rw-r--r--docs/en/services/mx/index.html4
-rw-r--r--docs/index.html2
-rw-r--r--provider_base/common.json2
-rw-r--r--tests/server-tests/white-box/webapp.rb2
10 files changed, 11 insertions, 11 deletions
diff --git a/docs/en/commands.html b/docs/en/commands.html
deleted file mode 100644
index e69de29b..00000000
--- a/docs/en/commands.html
+++ /dev/null
diff --git a/docs/en/guide/virtual-machines.html b/docs/en/guide/virtual-machines.html
index 5cee9a40..c522c181 100644
--- a/docs/en/guide/virtual-machines.html
+++ b/docs/en/guide/virtual-machines.html
@@ -142,7 +142,7 @@ Virtual Machines - LEAP Platform Documentation
<h2><a name="introduction"></a>Introduction</h2>
-<p>You can use the <code>leap</code> command line to easily remote virtual machines.</p>
+<p>You can use the <code>leap</code> command line to easily manage remote virtual machines.</p>
<p>Note: there are two types of virtual machines that <code>leap</code> can handle:</p>
diff --git a/docs/en/guide/virtual-machines/index.html b/docs/en/guide/virtual-machines/index.html
index da0da107..4b2a2e0f 100644
--- a/docs/en/guide/virtual-machines/index.html
+++ b/docs/en/guide/virtual-machines/index.html
@@ -142,7 +142,7 @@ Virtual Machines - LEAP Platform Documentation
<h2><a name="introduction"></a>Introduction</h2>
-<p>You can use the <code>leap</code> command line to easily remote virtual machines.</p>
+<p>You can use the <code>leap</code> command line to easily manage remote virtual machines.</p>
<p>Note: there are two types of virtual machines that <code>leap</code> can handle:</p>
diff --git a/docs/en/services/couchdb.html b/docs/en/services/couchdb.html
index 6de6455c..de50a692 100644
--- a/docs/en/services/couchdb.html
+++ b/docs/en/services/couchdb.html
@@ -215,7 +215,7 @@ couchdb - LEAP Platform Documentation
<ul>
<li>search for the &ldquo;user_id&rdquo; field</li>
-<li>in this example <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#58;&#x74;&#101;&#x73;&#116;&#x75;&#115;&#101;&#114;&#64;&#x65;&#x78;&#97;&#109;&#x70;&#108;&#x65;&#x2e;&#111;&#114;&#x67;">&#x74;&#101;&#x73;&#116;&#x75;&#115;&#x65;&#x72;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#x2e;&#x6f;&#114;&#x67;</a> uses the database user-665e004870ee17aa4c94331ff3cd59eb</li>
+<li>in this example <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#116;&#x65;&#115;&#x74;&#x75;&#x73;&#x65;&#114;&#64;&#x65;&#120;&#x61;&#109;&#x70;&#x6c;&#x65;&#46;&#x6f;&#x72;&#103;">&#116;&#x65;&#115;&#116;&#x75;&#x73;&#101;&#114;&#x40;&#x65;&#120;&#x61;&#109;&#112;&#108;&#x65;&#46;&#111;&#x72;&#103;</a> uses the database user-665e004870ee17aa4c94331ff3cd59eb</li>
</ul>
diff --git a/docs/en/services/couchdb/index.html b/docs/en/services/couchdb/index.html
index 10043db6..9eb7fcb8 100644
--- a/docs/en/services/couchdb/index.html
+++ b/docs/en/services/couchdb/index.html
@@ -215,7 +215,7 @@ couchdb - LEAP Platform Documentation
<ul>
<li>search for the &ldquo;user_id&rdquo; field</li>
-<li>in this example <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x74;&#x65;&#115;&#116;&#117;&#x73;&#x65;&#x72;&#x40;&#101;&#x78;&#97;&#109;&#x70;&#108;&#101;&#46;&#111;&#114;&#x67;">&#116;&#x65;&#115;&#116;&#x75;&#x73;&#101;&#114;&#x40;&#x65;&#120;&#97;&#109;&#112;&#x6c;&#x65;&#x2e;&#111;&#114;&#103;</a> uses the database user-665e004870ee17aa4c94331ff3cd59eb</li>
+<li>in this example <a href="&#x6d;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x74;&#x65;&#x73;&#116;&#117;&#115;&#101;&#x72;&#64;&#x65;&#x78;&#97;&#109;&#112;&#x6c;&#x65;&#46;&#111;&#114;&#103;">&#x74;&#101;&#115;&#116;&#x75;&#115;&#x65;&#x72;&#64;&#101;&#x78;&#x61;&#x6d;&#x70;&#x6c;&#101;&#x2e;&#111;&#x72;&#103;</a> uses the database user-665e004870ee17aa4c94331ff3cd59eb</li>
</ul>
diff --git a/docs/en/services/mx.html b/docs/en/services/mx.html
index 8e08cfe0..8f5a36da 100644
--- a/docs/en/services/mx.html
+++ b/docs/en/services/mx.html
@@ -156,8 +156,8 @@ mx - LEAP Platform Documentation
<ol>
<li>alias lists: by specifying an array of destination addresses, as in the case of &ldquo;flock&rdquo;, the single email will get copied to each address.</li>
-<li>chained resolution: alias resolution will recursively continue until there are no more matching aliases. For example, &ldquo;flock&rdquo; is resolved to &ldquo;robin&rdquo;, which then gets resolved to &ldquo;<a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#114;&#111;&#x62;&#x69;&#110;&#x40;&#98;&#105;&#x72;&#100;&#x2e;&#111;&#114;&#103;">&#114;&#111;&#x62;&#105;&#x6e;&#x40;&#x62;&#x69;&#114;&#x64;&#46;&#x6f;&#x72;&#x67;</a>&rdquo;.</li>
-<li>virtual domains: by specifying the full domain, as in the case of &ldquo;<a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#x63;&#104;&#x69;&#x63;&#x6b;&#97;&#x64;&#101;&#101;&#x40;&#97;&#118;&#105;&#97;&#110;&#x2e;&#111;&#x72;&#x67;">&#x63;&#x68;&#x69;&#99;&#107;&#x61;&#x64;&#101;&#101;&#64;&#x61;&#x76;&#105;&#97;&#x6e;&#x2e;&#x6f;&#x72;&#103;</a>&rdquo;, the alias will work for any domain you want. Of course, the MX record for that domain must point to appropriate MX servers, but otherwise you don&rsquo;t need to do any additional configuration.</li>
+<li>chained resolution: alias resolution will recursively continue until there are no more matching aliases. For example, &ldquo;flock&rdquo; is resolved to &ldquo;robin&rdquo;, which then gets resolved to &ldquo;<a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#x3a;&#x72;&#111;&#98;&#105;&#110;&#x40;&#98;&#105;&#114;&#100;&#46;&#111;&#x72;&#x67;">&#x72;&#111;&#x62;&#x69;&#110;&#64;&#x62;&#105;&#114;&#x64;&#46;&#x6f;&#x72;&#103;</a>&rdquo;.</li>
+<li>virtual domains: by specifying the full domain, as in the case of &ldquo;<a href="&#109;&#97;&#x69;&#108;&#116;&#x6f;&#58;&#x63;&#104;&#105;&#x63;&#x6b;&#97;&#100;&#x65;&#x65;&#x40;&#97;&#x76;&#x69;&#97;&#110;&#x2e;&#x6f;&#114;&#x67;">&#x63;&#104;&#x69;&#99;&#107;&#x61;&#100;&#x65;&#x65;&#64;&#97;&#x76;&#x69;&#x61;&#110;&#x2e;&#111;&#114;&#x67;</a>&rdquo;, the alias will work for any domain you want. Of course, the MX record for that domain must point to appropriate MX servers, but otherwise you don&rsquo;t need to do any additional configuration.</li>
<li>local delivery: for testing purposes, it is often useful to copy all incoming mail for a particular address and send those copies to another address. You can do this by adding &ldquo;@deliver.local&rdquo; as one of the destination addresses. When &ldquo;@local.delivery&rdquo; is found, alias resolution stops and the mail is delivered to that username.</li>
</ol>
diff --git a/docs/en/services/mx/index.html b/docs/en/services/mx/index.html
index 6899e0cc..e8e06e80 100644
--- a/docs/en/services/mx/index.html
+++ b/docs/en/services/mx/index.html
@@ -156,8 +156,8 @@ mx - LEAP Platform Documentation
<ol>
<li>alias lists: by specifying an array of destination addresses, as in the case of &ldquo;flock&rdquo;, the single email will get copied to each address.</li>
-<li>chained resolution: alias resolution will recursively continue until there are no more matching aliases. For example, &ldquo;flock&rdquo; is resolved to &ldquo;robin&rdquo;, which then gets resolved to &ldquo;<a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#x72;&#x6f;&#x62;&#105;&#x6e;&#64;&#x62;&#105;&#x72;&#100;&#46;&#111;&#x72;&#x67;">&#114;&#111;&#98;&#x69;&#x6e;&#x40;&#98;&#x69;&#x72;&#x64;&#46;&#x6f;&#x72;&#x67;</a>&rdquo;.</li>
-<li>virtual domains: by specifying the full domain, as in the case of &ldquo;<a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#x63;&#x68;&#105;&#x63;&#x6b;&#97;&#x64;&#x65;&#101;&#x40;&#x61;&#118;&#x69;&#97;&#x6e;&#46;&#x6f;&#114;&#x67;">&#99;&#104;&#105;&#x63;&#x6b;&#97;&#100;&#x65;&#101;&#64;&#97;&#x76;&#x69;&#97;&#x6e;&#x2e;&#x6f;&#114;&#103;</a>&rdquo;, the alias will work for any domain you want. Of course, the MX record for that domain must point to appropriate MX servers, but otherwise you don&rsquo;t need to do any additional configuration.</li>
+<li>chained resolution: alias resolution will recursively continue until there are no more matching aliases. For example, &ldquo;flock&rdquo; is resolved to &ldquo;robin&rdquo;, which then gets resolved to &ldquo;<a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#x72;&#111;&#98;&#x69;&#x6e;&#64;&#x62;&#105;&#114;&#100;&#x2e;&#x6f;&#114;&#x67;">&#x72;&#x6f;&#x62;&#105;&#x6e;&#x40;&#x62;&#x69;&#114;&#x64;&#46;&#x6f;&#114;&#x67;</a>&rdquo;.</li>
+<li>virtual domains: by specifying the full domain, as in the case of &ldquo;<a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#x63;&#x68;&#x69;&#x63;&#x6b;&#x61;&#100;&#101;&#x65;&#x40;&#x61;&#x76;&#105;&#x61;&#110;&#x2e;&#x6f;&#x72;&#103;">&#99;&#x68;&#x69;&#99;&#107;&#x61;&#100;&#101;&#101;&#x40;&#x61;&#118;&#105;&#97;&#x6e;&#x2e;&#x6f;&#x72;&#x67;</a>&rdquo;, the alias will work for any domain you want. Of course, the MX record for that domain must point to appropriate MX servers, but otherwise you don&rsquo;t need to do any additional configuration.</li>
<li>local delivery: for testing purposes, it is often useful to copy all incoming mail for a particular address and send those copies to another address. You can do this by adding &ldquo;@deliver.local&rdquo; as one of the destination addresses. When &ldquo;@local.delivery&rdquo; is found, alias resolution stops and the mail is delivered to that username.</li>
</ol>
diff --git a/docs/index.html b/docs/index.html
index 49465a9d..5ef4303c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -152,7 +152,7 @@ Provider Platform - LEAP Platform Documentation
<h2><a name="the-leap-command-line-tool"></a>The <code>leap</code> command line tool</h2>
-<p>The <code>leap</code> <a href="en/commands.html">command line tool</a> is used by sysadmins to manage everything about a service provider&rsquo;s infrastructure.</p>
+<p>The <code>leap</code> <a href="en/guide/commands.html">command line tool</a> is used by sysadmins to manage everything about a service provider&rsquo;s infrastructure.</p>
<p>Keep these rules in mind:</p>
diff --git a/provider_base/common.json b/provider_base/common.json
index 893d5daf..c6ab18d5 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -86,7 +86,7 @@
"webapp": {
"type": "git",
"source": "https://leap.se/git/leap_web",
- "revision": "origin/version/0.8"
+ "revision": "origin/version/0.9"
}
}
}
diff --git a/tests/server-tests/white-box/webapp.rb b/tests/server-tests/white-box/webapp.rb
index da1ec8c5..c46c9f96 100644
--- a/tests/server-tests/white-box/webapp.rb
+++ b/tests/server-tests/white-box/webapp.rb
@@ -28,7 +28,7 @@ class Webapp < LeapTest
def test_03_Are_daemons_running?
assert_running '^/usr/sbin/apache2'
- assert_running '^ruby /usr/bin/nickserver'
+ assert_running 'ruby /usr/bin/nickserver'
pass
end