Changeset 1029

Timestamp:

Jul 10, 2012, 7:00:00 PM (12 years ago)

Author:

joergs

Message:

5.2.10-3: write properties filedaemon_full_name and filedaemon_monitor_name back to opsi server, added properties fileset and jobdefs

Location:

opsi/products/bacula

Files:

• CLIENT_DATA/setup3264.ins (modified) (4 diffs)
• OPSI/control (modified) (5 diffs)

opsi/products/bacula/CLIENT_DATA/setup3264.ins

@@ -25 +25 @@
 DefVar $INST_architecture$
 
-DefVar $filedaemon_name$
 DefVar $filedaemon_full_name$
 DefVar $filedaemon_full_password$
@@ -38 +37 @@
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
 
-set $filedaemon_name$ = GetProductProperty( "filedaemon_name", "" )
+set $filedaemon_full_name$ = GetProductProperty( "filedaemon_full_name", "" )
 set $filedaemon_full_password$ = GetProductProperty( "filedaemon_full_password", "filedaemon_full_password" )
+set $filedaemon_monitor_name$ = GetProductProperty( "filedaemon_monitor_name", "" )
 set $filedaemon_monitor_password$ = GetProductProperty( "filedaemon_monitor_password", "filedaemon_monitor_password" )
 set $director_name$ = GetProductProperty( "director_name", "director_name" )
@@ -85 +85 @@
 comment "installing"
 
-if $filedaemon_name$ = ""
-  set $filedaemon_full_name$    = "%PCname%-fd"
-  set $filedaemon_monitor_name$ = "%PCname%-mon"
-else
-  set $filedaemon_full_name$    = "$filedaemon_name$-fd"
-  set $filedaemon_monitor_name$ = "$filedaemon_name$-mon"
+if $filedaemon_full_name$ = ""
+    set $filedaemon_full_name$    = "%HostID%-fd"
+    opsiservicecall_set_product_property_filedaemon_full_name
+endif
+
+if $filedaemon_monitor_name$ = ""
+    set $filedaemon_monitor_name$ = "%HostID%-mon"
+    opsiservicecall_set_product_property_filedaemon_monitor_name
 endif
 
@@ -181 +183 @@
 ) >> $InstallDir$/bacula-fd.conf
 
+[opsiservicecall_set_product_property_filedaemon_full_name]
+"method": "setProductProperty",
+"params": [
+        'bacula',
+        'filedaemon_full_name',
+        '$filedaemon_full_name$',
+        '%HostID%'
+]
+
+[opsiservicecall_set_product_property_filedaemon_monitor_name]
+"method": "setProductProperty",
+"params": [
+        'bacula',
+        'filedaemon_monitor_name',
+        '$filedaemon_monitor_name$',
+        '%HostID%'
+]
 
 

opsi/products/bacula/OPSI/control

@@ -1 +1 @@
 [Package]
-version: 2
+version: 3
 depends: 
 incremental: False
@@ -24 +24 @@
 [ProductProperty]
 type: unicode
-name: filedaemon_name
-multivalue: False
-editable: True
-description: filedaemon bacula name. Leave empty HOSTNAME-fd
+name: filedaemon_full_name
+multivalue: False
+editable: True
+description: filedaemon bacula name. Leave empty for HostID-fd
 default: [""]
 
@@ -40 +40 @@
 [ProductProperty]
 type: unicode
+name: filedaemon_monitor_name
+multivalue: False
+editable: True
+description: filedaemon bacula name. Leave empty for HostID-mon
+default: [""]
+
+[ProductProperty]
+type: unicode
 name: filedaemon_monitor_password
 multivalue: False
@@ -69 +77 @@
 description: access to Bacula director for bconsole and bat
 default: ["director_password"]
+
+[ProductProperty]
+type: unicode
+name: fileset
+multivalue: False
+editable: True
+description: only relevant for bacula director configuration
+default: [""]
+
+[ProductProperty]
+type: unicode
+name: jobdefs
+multivalue: False
+editable: True
+description: only relevant for bacula director configuration
+default: [""]
 
 [ProductProperty]
@@ -80 +104 @@
 
 [Changelog]
+20120710, 5.2.10-3, Joerg Steffens
+  * write properties filedaemon_full_name and filedaemon_monitor_name back to opsi server
+  * added properties fileset and jobdefs
+
 20120704, 5.2.10-2, Joerg Steffens
   * uninstall