Changeset 1108 for opsi/server

Timestamp:

Sep 22, 2012, 5:57:22 PM (12 years ago)

Author:

joergs

Message:

exception for new property catalog

File:

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

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

@@ -10 +10 @@
 
 opsi={
-    'server': "https://opsi.joergs.dass-it:4447/rpc",
+    'server': "https://opsi4.joergs.dass-it:4447/rpc",
     'username': "joergs",
     'password': "linuxlinux",
@@ -43 +43 @@
     #print "  # Address =", ipAddress
     fd.write( '  Password = "' + properties['filedaemon_full_password'] + '"' + "\n" )
-    fd.write( '  Catalog  = "' + properties['catalog'] + '"' + "\n" )
+    try:
+        catalog = properties['catalog']
+    except KeyError:
+        catalog = "MyCatalog"
+    fd.write( '  Catalog  = "' + catalog + '"' + "\n" )
     for i in params:
         try: