changeset 495:19233d760859 draft

Merge commit '8db5f4a188acb637d26cb779998e6a4c59dd4ce2'
author Nick <nick@somerandomnick.ano>
date Fri, 15 Apr 2011 20:07:18 +0000
parents da7f5407c53b (diff) 4086e24de797 (current diff)
children fb7a84b3132e
files db/dom/ano/vger/ns/ns1.vutral.ano db/dom/ano/vger/ns/ns2.vutral.ano db/dom/ano/vger/ns/ns3.vutral.ano db/dom/ano/vutral/ns/ns1 db/dom/ano/vutral/ns/ns2 db/dom/ano/vutral/ns/ns3 db/ip/01/16/BB/ns/ns1 db/ip/01/16/BB/ns/ns1.vutral.ano db/ip/01/16/BB/ns/ns2 db/ip/01/16/BB/ns/ns2.vutral.ano db/ip/01/16/BB/ns/ns3 db/ip/01/16/BB/ns/ns3.vutral.ano db/ip/01/16/BC/ns/ns1.vutral.ano db/ip/01/16/BC/ns/ns2.vutral.ano db/ip/01/16/BC/ns/ns3.vutral.ano
diffstat 14 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/6/owner	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+Obee
--- a/db/dom/ano/ano2wiki/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano	Fri Apr 15 21:58:55 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
--- a/db/dom/ano/ano2wiki/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano	Fri Apr 15 21:58:55 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
--- a/db/dom/ano/ano2wiki/owner	Fri Apr 15 21:58:55 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-sevilNatas
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lynx/ns/ns2.ucis.ano	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/obee/owner	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+Obee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/sn/ns/ns0.sevilnatas.ano	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+1.0.49.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/sn/owner	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+sevilNatas
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/ucis/ns/ns.lynx.ano	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/06/cidr	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+1.1.6.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/06/owner	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+Obee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/Obee/git	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,1 @@
+git://git.obee.ano/
--- a/doc/ucis.ano/bgp_graph/readme.txt	Fri Apr 15 21:58:55 2011 +0200
+++ b/doc/ucis.ano/bgp_graph/readme.txt	Fri Apr 15 20:07:18 2011 +0000
@@ -3,7 +3,7 @@
 Some of the scripts will communicate with the BGP software, another script can be used to export the obtained information to a .dot file, which can then be converted to a graph file using graphviz. The scripts can run on different machines, and it is recommended to use routing information from multiple routes, to obtain an accurate view of the network.
 
 Depending on the BGP software, one of the following scripts must be used to acquire the data:
-- bgp_path_list_birg.sh (or .php) for the bird routing daemon
+- bgp_path_list_bird.sh (or .php) for the bird routing daemon
 - bgp_path_list_quagga.sh (or .php) for the quagga/zebra routing daemon
 - bgp_path_list_xml.php to convert existing dn42/diac42 .xml data
 
@@ -43,4 +43,4 @@
 You can also use inetd/xinetd on the server side for a more permanent solution.
 
 
-Be creative!
\ No newline at end of file
+Be creative!
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/iface.php	Fri Apr 15 20:07:18 2011 +0000
@@ -0,0 +1,5 @@
+<?php
+
+echo exec('/sbin/ifconfig');
+
+?>