Changeset 813

Timestamp:

Jan 13, 2010, 12:39:46 PM (14 years ago)

Author:

slederer

Message:

FileDaemon-Konfiguration erzeugen

File:

• vanHelsing/trunk/src/bcfg.py (modified) (5 diffs)

vanHelsing/trunk/src/bcfg.py

@@ -8 +8 @@
 import resource
 import directive
+import random
 
 RESOURCE_TYPES = ('dird', 'console', 'filed', 'stored')
@@ -65 +66 @@
                 #curRes.add_comment(inlinecomment)
 
-            if len(line)>0 and line[0]=='@':
-                includepath=line[1:].strip()
-                print "include " +includepath
-                self.parse(self.resources,open(includepath,"r"),0)
+            include=line.strip()
+            if include.startswith("@"):
+                includepath=include[1:].strip()
+                print "include " +includepath
+                self.parse(curRes,open(includepath,"r"),level)
 
             if rxp_closebrace.match(line):
@@ -124 +126 @@
 
 class FiledConfig(Config):
-    pass
+    def __init__(self, filename=""):
+        Config.__init__(self, 'fd', filename)
 
+    def setDefaults(self,directorName,directorPassword,myName):
+        director=resource.Director(1,"Director")
+        director.add("Name",directorName)
+        director.add("Password",'"'+directorPassword+'"')
+        self.getRoot().add_item(director)
+        
+        fileDaemon=resource.FileDaemon(1,"FileDaemon")
+        fileDaemon.add("Name",myName)
+        #fileDaemon.add("FDport","9102")
+        fileDaemon.add("WorkingDirectory","/var/lib/bacula")
+        fileDaemon.add("Pid Directory","/var/run")
+        fileDaemon.add("Maximum Concurrent Jobs","20")
+        self.getRoot().add_item(fileDaemon)
+
+        messages=resource.Messages(1,"Messages")
+        messages.add("Name","Standard")
+        messages.add("director",directorName+" = all, !skipped, !restored")
+        self.getRoot().add_item(messages)
+        
 class StoredConfig(Config):
     pass
@@ -135 +157 @@
     #newclient.add("FDPort",fdport)
     newclient.add("Catalog",catalog)
-    newclient.add("Password",password)
+    newclient.add("Password",'"'+password+'"')
     return newclient
 
+def genpasswd(len=32):
+    charset="01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!/%()=?@"
+    password=""
+    for a in xrange(0,len):
+       password += random.choice(charset)
+    return password
+ 
 if __name__ == "__main__":
-    
-    dirdcfg = DirdConfig("test.conf")
+
+    if len(sys.argv) < 2:
+        filename="test.conf"
+    else:
+        filename=sys.argv[1]   
+ 
+    dirdcfg = DirdConfig(filename)
     dirdcfg.read()
 
@@ -152 +186 @@
     root.add_item(job)
 
-    newclient=createClient("testclient-fd","testclient","MyCatalog","testpassword")
+    pwd=genpasswd()
+    newclient=createClient("test-fd","testclient","MyCatalog",pwd)
     root.add_item(newclient)
 
     dirdcfg.write("test.conf.out")
+
+    fdcfg=FiledConfig("test-fd.conf")
+    fdcfg.setDefaults("bacula-dird",pwd,"test-fd")
+    fdcfg.write()
+
     sys.exit(0)