Update some services
authorMatthew McPherrin <matthew@mcpherrin.ca>
Wed, 17 Oct 2012 23:27:09 +0000 (19:27 -0400)
committerMatthew McPherrin <matthew@mcpherrin.ca>
Wed, 17 Oct 2012 23:27:09 +0000 (19:27 -0400)
tests.d/10_sockets.py
tests.d/30_ssl.sh
tests.d/50_website.py

index c50834b..dcf1e1a 100755 (executable)
@@ -4,11 +4,11 @@ import sys, socket
 
 services = [
   ('caffeine.csclub.uwaterloo.ca',            [22, 80, 443]),
 
 services = [
   ('caffeine.csclub.uwaterloo.ca',            [22, 80, 443]),
-  ('mail.csclub.uwaterloo.ca',                [25, 80, 110, 110, 143, 143, 993, 465, 587, 993, 995]),
+  ('mail.csclub.uwaterloo.ca',                [25, 80, 143, 465, 587, 993]),
   ('artificial-flavours.csclub.uwaterloo.ca', [22, 389, 636]),
   ('artificial-flavours.csclub.uwaterloo.ca', [22, 389, 636]),
-  ('taurine.csclub.uwaterloo.ca',             [22]),
+  ('taurine.csclub.uwaterloo.ca',             [21, 22, 53, 80, 81, 443, 8000, 8080]),
   ('mirror.csclub.uwaterloo.ca',              [21, 22, 80, 873]),
   ('mirror.csclub.uwaterloo.ca',              [21, 22, 80, 873]),
-  ('denardo.csclub.uwaterloo.ca',             [22]),
# ('denardo.csclub.uwaterloo.ca',             [22]),
   ('corn-syrup.csclub.uwaterloo.ca',          [22]),
   ('ascorbic-acid.csclub.uwaterloo.ca',       [21, 22, 53, 80, 81, 443, 8000, 8080]), #all ssh
   ('ginseng.csclub.uwaterloo.ca',             [22, 111, 389, 464, 636, 749, 888, 2049]),
   ('corn-syrup.csclub.uwaterloo.ca',          [22]),
   ('ascorbic-acid.csclub.uwaterloo.ca',       [21, 22, 53, 80, 81, 443, 8000, 8080]), #all ssh
   ('ginseng.csclub.uwaterloo.ca',             [22, 111, 389, 464, 636, 749, 888, 2049]),
index b3ee07a..83a9244 100755 (executable)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
 #!/bin/sh
 
+#Python, in its infinite shittiness, doesn't check https certificates. 
+
 curl -s "https://csclub.uwaterloo.ca" > /dev/null || (echo "FAIL on csc" && exit 2)
 curl -s "https://webauth.csclub.uwaterloo.ca" > /dev/null || (echo "FAIL on webauth" && exit 3)
 curl -s "https://mail.csclub.uwaterloo.ca" > /dev/null || (echo "FAIL on mail" && exit 4)
 curl -s "https://csclub.uwaterloo.ca" > /dev/null || (echo "FAIL on csc" && exit 2)
 curl -s "https://webauth.csclub.uwaterloo.ca" > /dev/null || (echo "FAIL on webauth" && exit 3)
 curl -s "https://mail.csclub.uwaterloo.ca" > /dev/null || (echo "FAIL on mail" && exit 4)
index 8300d81..848638d 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import urllib2, sys
 
 #!/usr/bin/env python
 import urllib2, sys
 
-pages=["https://csclub.uwaterloo.ca", "http://mirror.csclub.uwaterloo.ca"]
+pages=["https://csclub.uwaterloo.ca", "http://mirror.csclub.uwaterloo.ca", "http://git.csclub.uwaterloo.ca"]
 
 for page in pages:
   try:
 
 for page in pages:
   try: