Changeset 1105 for opsi/server

Timestamp:

Sep 21, 2012, 5:54:40 PM (12 years ago)

Author:

joergs

Message:

improvements

File:

• opsi/server/dass-opsi-tools/usr/bin/opsi-bacula-server-conf.py (modified) (3 diffs)

opsi/server/dass-opsi-tools/usr/bin/opsi-bacula-server-conf.py

@@ -36 +36 @@
     #AutoPrune = yes
     #}
-    params = [ "FDPort", "Catalog", "FileRetention", "JobRetention", "AutoPrune" ]
+    params = [ "FDPort", "FileRetention", "JobRetention", "AutoPrune" ]
     fd.write( "Client {\n" )
-    fd.write( "  Name     = " + properties['filedaemon_full_name'] + "\n" )
-    fd.write( "  Address  = " + client['clientId'] + "\n" )
+    fd.write( '  Name     = "' + properties['filedaemon_full_name'] + '"' + "\n" )
+    fd.write( '  Address  = "' + client['clientId'] + '"' + "\n" )
     # ipAddress: method host_getObjects [] '{"id":client['clientId']}'
     #print "  # Address =", ipAddress
-    fd.write( "  Password = " + properties['filedaemon_full_password'] + "\n" )
-    fd.write( "  Catalog  = " + catalog + "\n" )
+    fd.write( '  Password = "' + properties['filedaemon_full_password'] + '"' + "\n" )
+    fd.write( '  Catalog  = "' + properties['catalog'] + '"' + "\n" )
     for i in params:
         try:
-            fd.write( " " + i + " = " + properties[i.lower()] + "\n" )
+            fd.write( '  ' + i + ' = "' + properties[i.lower()] + '"' + "\n" )
         except KeyError:
-            fd.write( "  # " + i + " = "  + "\n" )
+            fd.write( '  # ' + i + " = \n" )
     fd.write( "}\n")
     fd.write( "\n" )
@@ -65 +65 @@
     params = [ "Fileset", "JobDefs" ]
     fd.write( "Job {" + "\n" )
-    fd.write( "  Name    = " + client['clientId'] + "-job" + "\n" )
-    fd.write( "  Client  = " + properties['filedaemon_full_name'] + "\n" )
+    fd.write( '  Name    = "' + client['clientId'] + '-job"' + "\n" )
+    fd.write( '  Client  = "' + properties['filedaemon_full_name'] + '"' + "\n" )
     for i in params:
         fd.write( "  " )
@@ -72 +72 @@
             if not properties[i.lower()]:
                 fd.write( "# " )
-            fd.write( i + " = " + properties[i.lower()] + "\n" )
+            fd.write( i + ' = "' + properties[i.lower()] + '"' + "\n" )
         except KeyError:
             fd.write( "# " + i + " = " + "\n" )