Merge branch 'master' of lctp:lctp

This commit is contained in:
Alfred Krohmer 2013-11-07 12:21:22 +01:00
commit a5acc69783
2 changed files with 6 additions and 12 deletions

View File

@ -4,6 +4,6 @@ all:
(cd $$d; make all) \
done
upload: all
rsync -avcL www/ lctp@devkid.net:/
rsync -avcL www/ deploy@lctp:/srv/http/lctp
watch:
cd bericht && make watch

View File

@ -72,40 +72,34 @@ pre {
<div class="pure-u-1-4"></div>
<div class="pure-u-1-2">
<section id="status">
<h2>Status</h2>
<h2><a href="/munin/">Status</a></h2>
<table class="pure-table">
<thead>
<tr>
<th>Server</th>
<th>IP</th>
<th>Status</th>
</tr>
</thead>
<tbody>
<tr>
<th>zotac0 (Head-Node)</th>
<th><a href="/munin/zotac0/zotac0/index.html">zotac0 (Head-Node)</a></th>
<th>10.20.0.1/24</th>
<th>-</th>
</tr>
<tr>
<th>zotac1 (Compute-Node, 330er Board)</th>
<th><a href="munin/zotac1/zotac1/index.html">zotac1 (Compute-Node, 330er Board)</a></th>
<th>10.20.0.101/24</th>
<th>-</th>
</tr>
<tr>
<th>zotac2</th>
<th>10.20.0.102/24</th>
<th>-</th>
</tr>
<tr>
<th>zotac3</th>
<th>10.20.0.103/24</th>
<th>-</th>
</tr>
<tr>
<th>zotac4</th>
<th>10.20.0.104/24</th>
<th>-</th>
</tr>
</tbody>
</table>
@ -139,7 +133,7 @@ EOF</pre>
<tbody>
<tr>
<td>Alfred</td>
<td>devkid devkid.net</td>
<td>s4039299 mail.zih.tu-dresden.de</td>
</tr>
<tr>
<td>Jörg</td>
@ -147,7 +141,7 @@ EOF</pre>
</tr>
<tr>
<td>Patrick</td>
<td>stoepsel stoepsel.net</td>
<td>s7384334 mail.zih.tu-dresden.de</td>
</tr>
</tbody>
</table>