sync up

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3@1780 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/website/.htaccess b/website/.htaccess
index 3b4503e093d8a0e467ba1fc8f6f7eaab95b60177..e62adf1ba51f28153bc73a3612cccc277cf3536e 100644 (file)
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -7,3 +7,6 @@ RewriteRule download.html http://oss.oetiker.ch/rrdtool/download.en.html [R=302,
   Order Allow,Deny
   Allow From All
 </FilesMatch>
+<FilesMatch "mirror.html">
+  SetHandler cgi-script
+</FilesMatch>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index ef4eed3ea23066b3e321463ca00034f05852643a..c81e17a0cead3740cf9c1992b9c8c0d448b13342 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -104,8 +104,7 @@
 <a href="http://rrdtool.cs.pu.edu.tw/gallery/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
 <a href="http://rrdtool.codemonkey.se/gallery/index.en.html">SE</a><!--Hans Engren <hans@cyclone.se>-->
 <a href="http://rrdtool.basemirror.de/gallery/index.en.html">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
-<a href="http://rrdtool.mirroraty.org/gallery/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
-<a href="http://rrdtool.paracoda.com/gallery/index.en.html">CA</a><!--Hossam Hossny <admin@paracoda.com>--></div>
+<a href="http://rrdtool.mirroraty.org/gallery/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>--></div>
 <div id="logo">
 <div class="legacy">RRDtool
 <hr /></div>
@@ -150,6 +149,14 @@ google_ad_height = 250;
 </div>
 <!-- no wider than 600 pixle -->
 <!-- creation date -->
+<!-- Optional -->
+<div class="gallery">
+<h2>Transaction monitoring on property market</h2>
+<div class="image"><img src="miszek.png" alt="" width="377" height="233" /></div>
+<div class="caption">Graph presents number of transactions on Real Estate market in Wroclaw. Chart is made based on week updates. Similar graphs present average property prices. Image is not unique but object of monitoring is quite original :) -- M.Cegielski &lt;info@<span class="legacy">XYZ-</span>wycena.net.pl&gt;, 2008/11 <a href="http://wycena.net.pl/ceny-mieszkania-wroclaw.htm">[demo]</a></div>
+</div>
+<!-- no wider than 600 pixle -->
+<!-- creation date -->
 <div class="gallery">
 <h2>HTTP Cache Traffic</h2>
 <div class="image"><img src="charles.png" alt="" width="597" height="213" /></div>
@@ -158,11 +165,6 @@ google_ad_height = 250;
 <!-- no wider than 600 pixle -->
 <!-- creation date -->
 <div class="gallery">
-<h2>RTT of MPLS VPN endpoints</h2>
-<div class="image"><img src="pings.png" alt="" width="583" height="413" /></div>
-<div class="caption">Although MPLS VPN endpoints seem just one hop away from the IP point of view, there is always a more complex underlying infrastructure. Collecting endpoint RTTs (pings) and plotting them reveals the hidden infrastructure. This image shows that there are 6 groups of endpoints that have consistent minimum RTTs. This is most likely due to the number of real hops in the underlying infrastructure and can also be influenced by the last mile technology. It's also easy to spot temporary re-routing: in this example the light green endpoint plots temporarily out of his "league". -- Bruno Ciscato , 2008/9</div>
-</div>
-<div class="gallery">
 <p><script type="text/javascript">
 //<![CDATA[
 <!--
@@ -181,6 +183,11 @@ google_color_text = "000000";
 //]]>
 </script> <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script></p>
+<h2>RTT of MPLS VPN endpoints</h2>
+<div class="image"><img src="pings.png" alt="" width="583" height="413" /></div>
+<div class="caption">Although MPLS VPN endpoints seem just one hop away from the IP point of view, there is always a more complex underlying infrastructure. Collecting endpoint RTTs (pings) and plotting them reveals the hidden infrastructure. This image shows that there are 6 groups of endpoints that have consistent minimum RTTs. This is most likely due to the number of real hops in the underlying infrastructure and can also be influenced by the last mile technology. It's also easy to spot temporary re-routing: in this example the light green endpoint plots temporarily out of his "league". -- Bruno Ciscato , 2008/9</div>
+</div>
+<div class="gallery">
 <h2>System Information (retro look)</h2>
 <div class="image"><img src="systembelastung.png" alt="" width="600" height="264" /></div>
 <div class="caption">These 2 graphs are displayed on a status page of my small server at home. The colour green on black is used because I like these colours in combination with computers referring to the opinion of windows user about linux console freaks that are all supposed to have these colours in their console command line interfaces and because it looks somehow old school. -- kmindi , 2008/08</div>
@@ -454,7 +461,7 @@ creation date -->
 <td id="footcell"><!-- ############################# -->
 <!-- # FOOTER -->
 <!-- ############################# -->
-<div id="address"><small>10/14/08 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a></small></div>
+<div id="address"><small>01/25/09 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a></small></div>
 </td>
 </tr>
 </table>

diff --git a/website/gallery/miszek.xml b/website/gallery/miszek.xml
index e72050a15f5bc86b3102115e53d7672658fa1898..88a1f7e19b8c94162e6e4e5ee7aab35d4cecc44e 100644 (file)
--- a/website/gallery/miszek.xml
+++ b/website/gallery/miszek.xml
@@ -1,4 +1,4 @@
-<gallery image="mieszk.png" > <!-- no wider than 600 pixle -->
+<gallery image="miszek.png" > <!-- no wider than 600 pixle -->
  <title> Transaction monitoring on property market </title>
  <author> M.Cegielski </author>
  <description> Graph presents number of transactions on Real Estate market in Wroclaw. Chart is made based on week updates. Similar

diff --git a/website/inc/template.inc b/website/inc/template.inc
index e8e35b35b38f516aaa93d41998cc3ee69b5feeb9..38e8395c7114b831ca70b8c7875db3c1f693ff75 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -110,7 +110,7 @@
 <A HREF="http://rrdtool.codemonkey.se/<where/>">SE</A><!--Hans Engren <hans@cyclone.se>-->
 <A HREF="http://rrdtool.basemirror.de/<where/>">DE</A><!--Baseportal Mirrors <mirrors@baseportal.de>-->
 <A HREF="http://rrdtool.mirroraty.org/<where/>">US</A><!--Hossam Hossny <hossam@trexle.com>-->
-<A HREF="http://rrdtool.paracoda.com/<where/>">CA</A><!--Hossam Hossny <admin@paracoda.com>-->
+#<A HREF="http://rrdtool.paracoda.com/<where/>">CA</A><!--Hossam Hossny <admin@paracoda.com>-->
 #<A HREF="http://rrdtool.PlaySystems.ro/<where/>">RO</a><!--dan.draghici@ulbsibiu.ro-->
 </div>
 <div id="logo">

diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index 3fa0504cd5253f7ffe7ddee75b471df9b1721cbd..c65ce98b959878fa20bf03efbbda7f8b1f9fe589 100644 (file)
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -74,6 +74,7 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "airwave.xml"
 #include "prefixmaster.xml"
 #include "wanguard.xml"
+#include "tacLOG_RRD.xml"
 
 <h2>Add your own tool to this list</h2>
 

diff --git a/website/rrdworld/tacLOG_RRD.png b/website/rrdworld/tacLOG_RRD.png
new file mode 100644 (file)
index 0000000..ab4ee44
Binary files /dev/null and b/website/rrdworld/tacLOG_RRD.png differ

diff --git a/website/rrdworld/tacLOG_RRD.xml b/website/rrdworld/tacLOG_RRD.xml
new file mode 100644 (file)
index 0000000..2a8cc3a
--- /dev/null
+++ b/website/rrdworld/tacLOG_RRD.xml
@@ -0,0 +1,16 @@
+<rrdworld type="application"
+          icon="taclog_RRD.png" > <!-- Size 100x66 -->
+ 
+       <name>tacLOG / tacMON</name>
+     <author>terreActive AG</author>
+<description>tacLOG is a tool for centralized log management (passive monitoring). It can be used for compliance, event generation, analysis and reporting. tacMON is the active counter part used for system and security monitoring. RRD-graphs are used to display the (active and passive) monitoring results.</description>
+   <homepage> http://www.terreactive.ch </homepage> 
+       <year> 2009 </year><month> 2 </month> <!-- Entry creation date -->
+    <license>proprietary</license>
+
+   <!-- Optional -->   
+
+   <livesite> http://www.terreactive.ch </livesite> 
+      <email> sales@terreactive.ch </email> <!-- Author contact -->
+
+</rrdworld>

diff --git a/website/site-sync b/website/site-sync
index 274b0be9b8649cc455ce3c5c31b1b52e8fed88a1..88cf10841f1f00c8a3ff47788559c6bcae700f30 100755 (executable)
--- a/website/site-sync
+++ b/website/site-sync
@@ -1,52 +1,3 @@
-cat <<HEAD > mirror.html
-<html>
-<head>
-<title>website mirror instructions</title>
-</head>
-<h1>RRDtool Mirror Source</h1>
-<p>Run the following commands once a day.</p>
-<pre>
-#!/bin/sh
-cd /YOUR/MIRROR/TREE
-wget --no-host-directories --timestamping --recursive --level=1 http://oss.oetiker.ch/rrdtool/mirror.html
-</pre>
-
-<p>Create a file called <b>hoster.html</b> like that:</p>
-<pre>
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;
-&lt;html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"&gt;
-&lt;head&gt;
-&lt;style type="text/css"&gt;
-body {
-    margin: 0px;
-    padding: 0px;
-    background-color: #f0f0f0;
-    font-family: sans-serif;
-    font-size: 8px;
-}
-
-#hoster a {
-    color: black;
-    text-decoration: none;
-}
-&lt;/style&gt;
-&lt;/head&gt;
-&lt;body&gt;
-&lt;div id="hoster"&gt;
-mirror by &lt;a target="_top" href="http://YOUR.SITE"&gt;Company&lt;/a&gt;
-&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</pre>
-
-HEAD
-
-for xt in html png gif ico css htaccess js; do
-  find . -name "*.$xt" -not -name stat"*" -not -name "hoster*" -exec printf '<a href="{}">.</a>' \; >> mirror.html
-done
-echo "</body></html>"                                     >> mirror.html
-
 rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . oposs@oss.oetiker.ch:public_html/rrdtool/
 #rsync --copy-unsafe-links --verbose --times --delete --exclude pub --exclude='*~' --exclude=".svn" --exclude=".condor" -r . /home/oetiker/public_html/webtools/rrdtool
 #rsync --links --verbose --times --delete --exclude pub --exclude='*~' --rsh=ssh -r . tobi@ipn.caida.org:/ipn/web/Tools/RRDtool