Changeset 1152

Timestamp:

Apr 8, 2016, 1:31:35 PM (3 years ago)

Author:

hectorgh

Message:

Adding more configuration

Location:

n4d-nfs/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• install/etc/n4d/conf.d/NfsManager (modified) (1 diff)
• install/usr/share/n4d/python-plugins/NfsManager.py (modified) (5 diffs)

n4d-nfs/trunk/fuentes/debian/changelog

@@ +1 @@
+n4d-nfs (0.2) xenial; urgency=high
+
+  * Adding functionality to reset configuration
+
+ -- Hector Garcia Huerta <hectorgh@gmail.com>  Fri, 08 Apr 2016 13:29:49 +0200
+
 n4d-nfs (0.1) xenial; urgency=medium
 

n4d-nfs/trunk/fuentes/install/etc/n4d/conf.d/NfsManager

@@ -8 +8 @@
 remove_ip_from_share=adm,admins
 configure_mount_on_boot=adm,admins
+clean_exports_file=adm,admins
+remove_mount_on_boot=adm,admins

n4d-nfs/trunk/fuentes/install/usr/share/n4d/python-plugins/NfsManager.py

@@ -22 +22 @@
                 
                 # LLX TESTING
-                self.nfs_file="/tmp/exports"
+                #self.nfs_file="/tmp/exports"
                 #
+                
+                if not os.path.exists(self.nfs_dir):
+                        os.makedirs(self.nfs_dir)
                 
                 
@@ -72 +75 @@
                 
                 #ret=os.system("exportfs -ra")
-                p=subprocess.Popen(["export","-ra"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                p=subprocess.Popen(["exportfs","-ra"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
                 ret=p.communicate()
                 
                 if p.poll()==0:
                 
-                        return {"status":True , "msg": ""}
+                        return {"status":True , "msg": "NFS shares exported"}
                         
                 else:
@@ -112 +115 @@
                                 self.write_exports_file(exports)
                                 
-                                return {"status":True,"msg":""}
+                                return {"status":True,"msg":"Removed IP from server"}
                         
                         else:
@@ -148 +151 @@
                 f.close()
                 
-                return {"status":True,"msg":""}
+                return {"status":True,"msg":"NFS exports.d file written"}
                         
         #def write_exports_file
@@ -191 +194 @@
                 
         #def configure_mount_on_boot
+        
+        def remove_mount_on_boot(self,target):
+                
+                p=subprocess.Popen(["systemd-escape",target.lstrip("/")],stdout=subprocess.PIPE)
+                file_name=p.communicate()[0].strip("\n")+".mount"
+                file_dest="/lib/systemd/system/"+file_name
+                
+                ret=""
+                
+                if os.path.exists(file_dest):
+                        o2=subprocess.Popen(["systemctl","stop",file_name],stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()
+                        o=subprocess.Popen(["systemctl","disable",file_name],stdout=subprocess.PIPE,stderr=subprocess.PIPE).communicate()
+                        os.remove(file_dest)
+                        ret=(o,o2)
+                        
+                return {"status":True,"msg":ret}
+                
+        #def remove_mount_on_boot
+        
+        def clean_exports_file(self):
+                
+                if os.path.exists(self.nfs_file):
+                        os.remove(self.nfs_file)
+                        self.export_directories()
+                
+                return {"status":True,"msg":"NfsManager exports.d file is clean"}
+