8 files changed, 117 insertions, 8 deletions
diff --git a/abs/core/supplemental-web/contents/back.png b/abs/core/supplemental-web/contents/back.png
new file mode 100644
index 0000000..6b5da48
--- /dev/null
+++ b/abs/core/supplemental-web/contents/back.png
diff --git a/abs/core/supplemental-web/contents/calllog.py b/abs/core/supplemental-web/contents/calllog.py
index a96813e..908a9c6 100644
--- a/abs/core/supplemental-web/contents/calllog.py
+++ b/abs/core/supplemental-web/contents/calllog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # import MySQL module
 
 import MySQLdb
diff --git a/abs/core/supplemental-web/contents/count.py b/abs/core/supplemental-web/contents/count.py
index d59144a..2889af1 100644
--- a/abs/core/supplemental-web/contents/count.py
+++ b/abs/core/supplemental-web/contents/count.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # import MySQL module
 
 import MySQLdb
@@ -89,4 +89,4 @@ def main(argv):
     print "</div>"
 
 if __name__ == "__main__":
-    main(sys.argv[1:])
-\ No newline at end of file
+    main(sys.argv[1:])
diff --git a/abs/core/supplemental-web/contents/exports.shtml b/abs/core/supplemental-web/contents/exports.shtml
new file mode 100755
index 0000000..9a26dc9
--- /dev/null
+++ b/abs/core/supplemental-web/contents/exports.shtml
@@ -0,0 +1,20 @@
+<html>
+<head>
+<style type="text/css">@import "/frame.css";</style>
+</head>
+
+<body>
+<div id="mainContainer">
+<!--		<div id="header"><p></p></div>
+		<div id="content">
+		<p></p>-->
+
+	<!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" -->
+
+
+</br>
+</br>
+
+</body>
+</html>
+
diff --git a/abs/core/supplemental-web/contents/go.png b/abs/core/supplemental-web/contents/go.png
new file mode 100644
index 0000000..c70bf2a
--- /dev/null
+++ b/abs/core/supplemental-web/contents/go.png
diff --git a/abs/core/supplemental-web/contents/links.html b/abs/core/supplemental-web/contents/links.html
index cfc7311..883c273 100644
--- a/abs/core/supplemental-web/contents/links.html
+++ b/abs/core/supplemental-web/contents/links.html
@@ -24,6 +24,7 @@ Other Links
         <li><a href="http://forums.linhes.org"  >Online User Forums</a></li>
         <li><a href="http://www.mythtv.org"  >mythtv.org</a></li>
         <li><a href="http://smolt.mythtv.org"  >mythtv smolt server</a></li>
+        <li><a href="/exports.shtml"  >List file shares </a></li>
 
 
 </ul>
diff --git a/abs/core/supplemental-web/contents/list_exports.py b/abs/core/supplemental-web/contents/list_exports.py
new file mode 100755
index 0000000..13ec690
--- /dev/null
+++ b/abs/core/supplemental-web/contents/list_exports.py
@@ -0,0 +1,82 @@
+#!/usr/bin/python2
+import subprocess
+
+def  nfs_export_list():
+    nfslist = []
+    exportfile = "/etc/exports"
+    proc = subprocess.Popen(["showmount", "-a"] , stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    stdout,stderr = proc.communicate()
+    rc = proc.returncode
+    if rc == 0:
+        try:
+            f = open(exportfile,"r")
+            for line in f.readlines():
+                if line.startswith("#"):
+                    continue
+                item = line.split()
+                if len(item) <= 1 :
+                    continue
+                nfslist.append(item)
+        except :
+            pass
+    else:
+        nfslist.append(["NFS server  is not running",'NFS server is not running'])
+    return nfslist
+
+
+def smb_share_list():
+    smblist=[]
+
+    proc = subprocess.Popen(["smbclient", "-L", "\\localhost" , "-N"], stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    stdout,stderr = proc.communicate()
+    outstuff = stderr.split("\n")
+    for line in outstuff:
+        try:
+            heading1 = line.split()[0]
+        except:
+            continue
+        #print heading1
+        #print heading1.find("Domain")
+        if heading1.find("Domain") > -1  :
+            #smblist.append('')
+            smblist.append(heading1)
+            break
+
+    outstuff = stdout.split("\n")
+    for line in outstuff:
+        try:
+            heading1,heading2 = line.split()
+        except:
+            continue
+        if heading1 == "Server" and heading2 == "Comment":
+            break
+        smblist.append(line)
+
+    return smblist
+
+
+nfslist = nfs_export_list()
+smblist = smb_share_list()
+
+
+print "---------NFS SHARES-----------\n"
+print "</br>"
+for sharename in nfslist:
+    if sharename[1].find("noaccess") > -1 :
+        print "%s \t no access" %sharename[0]
+        print "</br>"
+    else:
+        print sharename[0]
+        print "</br>"
+
+print "\n---------SMB SHARES----------\n"
+print "</br>"
+
+if len(smblist)  == 0:
+    print "Samba is not running or no shares listed"
+    print "</br>"
+else:
+    for sharename in smblist:
+        print "%s" %(sharename.split()[0])
+        print "</br>"
+
diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
index 9098ad6..22ffb0f 100644
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 import sys
 import cgi
 import os
@@ -101,7 +101,7 @@ def go_backup(myhost):
     results="Nothing happened"
     command= "sudo /usr/LH/bin/lh_system_backup_job"
     print command
-    command2="sleep 1; /data/srv/hobbit/server/ext/hbnotes.py"
+    command2="sleep 1; /home/xymon/server/ext/hbnotes.py"
     results=os.popen(command,'r')
     os.popen(command2,'r')
 
@@ -110,14 +110,16 @@ def go_backup(myhost):
 def go_restore(restorefile,myhost):
     myhostname = socket.gethostname()
     if myhostname.strip() == myhost.strip():
-        localcommand="sudo /usr/bin/restore_job.sh "
+        localcommand="sudo /usr/LH/bin/lh_system_restore_job "
         command= localcommand + restorefile
+
     else:
+        #this should never execute
         sshcmd="ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa mythtv@"
         sshcmd+=myhost.strip()
         cmd=' "sudo /usr/bin/restore_job.sh   "   '
         command=sshcmd + cmd + restorefile + " 2>&1 "
-
+    print command
     results=os.popen(command,'r')
     return  results
 
@@ -295,7 +297,11 @@ if __name__ == '__main__':
         print line + '</br> \r\n'
 
     print endbox
-    print '<a href=',  oldurl,     '  > Back </a> '
+    print "</br></br>"
+    #print '<a href=',  oldurl,     '  > Back </a> '
+    s='<a href="%s"><img src="back.png"></a>' %oldurl
+    print s
+    #<a href="myfile.htm"><img src="rainbow.gif"></a>
     #print oldurl
     print javascript