git.samba.org / tridge / solar.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: beecf76)
allow from openvpn link
authorAndrew Tridgell <tridge@samba.org>
Tue, 12 Oct 2010 11:18:29 +0000 (22:18 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 12 Oct 2010 11:18:29 +0000 (22:18 +1100)
live/cgi/annotation.cgi patch | blob | history
live/graphs.js patch | blob | history

diff --git a/live/cgi/annotation.cgi b/live/cgi/annotation.cgi
index 4fb6fff2c877ebe1fbb8264d706f6de247abcb65..6d85e46719249681e16e92bd8b728c1c77ada944 100755 (executable)
--- a/live/cgi/annotation.cgi
+++ b/live/cgi/annotation.cgi
@@ -9,7 +9,7 @@ print('''Content-type: text/html
 <body>go away</body>
 ''')
 
-allowed_addresses = [ "192.168.2.15", "127.0.0.1" ]
+allowed_addresses = [ "192.168.2.15", "127.0.0.1", "59.167.251.244" ]
 
 addr = cgi.escape(os.environ["REMOTE_ADDR"])
 
diff --git a/live/graphs.js b/live/graphs.js
index 067f040d0cd274dff9eb72cb27914161bdec4b77..db9fae7e40d3027ae69d8dff9fea2f591223a654 100644 (file)
--- a/live/graphs.js
+++ b/live/graphs.js
@@ -453,9 +453,6 @@ function load_annotations(g) {
   function callback(d) {
     var anns_by_name = new Array();
     annotations = [];
-    if (d.data == null || d.data == undefined) {
-      return;
-    }
     for (var i=0; i<d.data.length; i++) {
       var xval = d.data[i][0];
       if (xval < pvdate.valueOf() || xval >= (pvdate.valueOf() + 24*60*60*1000)) {
Unnamed repository; edit this file 'description' to name the repository.