Changeset 1100 for opsi/server

Timestamp:

Sep 21, 2012, 4:55:30 PM (12 years ago)

Author:

joergs

Message:

fixes

File:

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

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

@@ -10 +10 @@
 
 opsi={
-    'server': "https://degdepot2.joergs:4447/rpc",
+    'server': "https://opsi.joergs.dass-it:4447/rpc",
     'username': "joergs",
     'password': "linuxlinux",
     }
 
+catalog="MyCatalog"    
+    
 # "-d"
 opsiCallPrefix=[ "opsi-admin",  "-a", opsi['server'], "-u", opsi['username'], "-p", opsi['password'] ]
@@ -41 +43 @@
     #print "  # Address =", ipAddress
     fd.write( "  Password = " + properties['filedaemon_full_password'] + "\n" )
+    fd.write( "  Catalog  = " + catalog + "\n" )
     for i in params:
         try:
@@ -90 +93 @@
     clientsWithBacula=json.loads( subprocess.check_output( opsiCallPrefix + opsiCallClientsWithBacula ) )
 #except subprocess.CalledProcessError as e:
-except e:
-    logger.exception( "%s: failed:" %(clientId) )
+except BaseException as e:
+    logger.exception( "failed: %s" %(e) )
     exit(1)
 
@@ -107 +110 @@
         file_opsi_jobs.write( "# automatically generated at {}\n".format( time.asctime() ) )
         file_opsi_jobs.write( "#\n\n" )
-    except e:
+    except BaseException as e:        
         logger.exception( "failed to create files" )
         exit(1)