Changeset 1023


Ignore:
Timestamp:
Jul 4, 2012, 6:53:50 PM (12 years ago)
Author:
joergs
Message:

bugfixes, uninstall, properties, bacula-fd.conf

Location:
opsi/products/bacula
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • opsi/products/bacula/CLIENT_DATA/delsub3264.ins

    r1022 r1023  
    55
    66
    7 Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
     7;Set $MsiId32$ = 'Bacula'
    88Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
    99
    10 Set $MsiId64$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
     10;Set $MsiId64$ = 'Bacula'
    1111Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe"
    1212
    … …  
    2020        endif
    2121
    22         if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
    23                 comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
    24                 Winbatch_uninstall_msi_32
    25                 sub_check_exitcode
    26         endif
     22        ;if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
     23        ;       comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
     24        ;       Winbatch_uninstall_msi_32
     25        ;       sub_check_exitcode
     26        ;endif
    2727       
    28         comment "Delete files"
    29         Files_uninstall_32 /32Bit
    30         comment "Cleanup registry"
    31         Registry_uninstall /32Bit
     28        ;comment "Delete files"
     29        ;Files_uninstall_32 /32Bit
     30        ;comment "Cleanup registry"
     31        ;Registry_uninstall /32Bit
    3232endif
    3333
    … …  
    4141        endif
    4242
    43         if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
    44                 comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
    45                 Winbatch_uninstall_msi_64
    46                 sub_check_exitcode
    47         endif
     43        ;if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
     44        ;       comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
     45        ;       Winbatch_uninstall_msi_64
     46        ;       sub_check_exitcode
     47        ;endif
    4848       
    49         comment "Delete files"
    50         Files_uninstall_64 /64Bit
    51         comment "Cleanup registry"
    52         Registry_uninstall /64Bit
     49        ;comment "Delete files"
     50        ;Files_uninstall_64 /64Bit
     51        ;comment "Cleanup registry"
     52        ;Registry_uninstall /64Bit
    5353endif
    5454
    55 comment "Delete program shortcuts"
    56 LinkFolder_uninstall
     55;comment "Delete program shortcuts"
     56;LinkFolder_uninstall
    5757
    5858[Winbatch_uninstall_32]
    59 ; Choose one of the following examples as basis for program uninstall
    60 ;
    61 ; === Nullsoft Scriptable Install System ================================================================
    62 ; "$UninstallProgram32$" /S
    63 ;
    64 ; === Inno Setup ========================================================================================
    65 ; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
     59"$UninstallProgram32$" /S
     60
     61
     62[Winbatch_uninstall_64]
     63"$UninstallProgram64$" /S
    6664
    6765
    … …  
    7472; delete -sf "$InstallDir32$\"
    7573
    76 [Winbatch_uninstall_64]
    77 ; Choose one of the following examples as basis for program uninstall
    78 ;
    79 ; === Nullsoft Scriptable Install System ================================================================
    80 ; "$UninstallProgram64$" /S
    81 ;
    82 ; === Inno Setup ========================================================================================
    83 ; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
    8474
    8575

  • opsi/products/bacula/CLIENT_DATA/readme.txt

    r1022 r1023  
    11TODO
    2 * Programme not "Program Files"
     2* (Programme not "Program Files")
    33* properties?
    4 * fd service läuft?
     4        bconsole.conf:
     5        Director {
     6        Name = @director_name@
     7        DIRport = 9101
     8        address = @director_address@
     9        Password = "@director_password@"
     10        }
     11
     12        bacula-fd.conf:
     13        @director_name@
     14        Director {
     15        Name = opsiwinxpjs1-mon
     16        Password = "2T7xTQg7uCi+RCUpQBUVYCSe+imYWbBfxOBa5QmDxDiD"
     17        Monitor = yes
     18        }
     19
     20        bat.conf:
     21        Director {
     22        Name = @director_name@
     23        DIRport = 9101
     24        address = @director_address@
     25        Password = "@director_password@"
     26        }
     27
     28        tray-monitor.conf:
     29        Monitor {
     30        Name = opsiwinxpjs1-mon
     31        Password = "@mon_password@"         # password for the Directors   
     32        RefreshInterval = 30 seconds
     33        }
     34       
     35        Client {
     36        Name = opsiwinxpjs1-fd
     37        Address = localhost
     38        FDPort = 9102
     39        Password = "2T7xTQg7uCi+RCUpQBUVYCSe+imYWbBfxOBa5QmDxDiD"
     40        }
     41
     42        #Storage {
     43        #  Name = @basename@-sd
     44        #  Address = @hostname@
     45        #  SDPort = @sd_port@
     46        #  Password = "@mon_sd_password@"          # password for StorageDaemon
     47        #}
     48        #
     49        #Director {
     50        #  Name = @basename@-dir
     51        #  DIRport = @dir_port@
     52        #  address = @hostname@
     53        #}
     54        #
     55* (fd service läuft? start automatisch)
    556* firewall
    657* gui feedback?
    758
     59installer:
     60http://www.bacula.org/git/cgit.cgi/bacula/tree/bacula/src/win32/full_win32_installer/winbacula.nsi
    861
     62@philipp:
     63- \\ in pfaden bei windows configuration erforderlich?
     64- benennung der properties?
     65

  • opsi/products/bacula/CLIENT_DATA/setup3264.ins

    r1022 r1023  
    1515DefVar $ProductVer$ 
    1616DefVar $MinimumSpace$
     17DefVar $InstallDir$
    1718DefVar $InstallDir32$
    1819DefVar $InstallDir64$
    … …  
    2425DefVar $INST_architecture$
    2526
     27DefVar $filedaemon_name$
     28DefVar $filedaemon_full_name$
     29DefVar $filedaemon_full_password$
     30DefVar $filedaemon_monitor_name$
     31DefVar $filedaemon_monitor_password$
     32DefVar $director_name$
     33DefVar $director_address$
     34DefVar $director_password$
     35
     36
    2637Set $INST_SystemType$ = GetSystemType
    2738set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
    2839
     40set $filedaemon_name$ = GetProductProperty( "filedaemon_name", "" )
     41set $filedaemon_full_password$ = GetProductProperty( "filedaemon_full_password", "filedaemon_full_password" )
     42set $filedaemon_monitor_password$ = GetProductProperty( "filedaemon_monitor_password", "filedaemon_monitor_password" )
     43set $director_name$ = GetProductProperty( "director_name", "director_name" )
     44set $director_address$ = GetProductProperty( "director_address", "director_address.example.com" )
     45set $director_password$ = GetProductProperty( "director_password", "director_password" )
    2946
    3047Set $LogDir$ = "%SystemDrive%\tmp"
    … …  
    3855Set $ProductId$       = "bacula"
    3956Set $ProductVer$      = "5.2.10"
    40 Set $MinimumSpace$    = "20 MB"
     57Set $MinimumSpace$    = "30 MB"
    4158; the path were we find the product after the installation
    42 Set $InstallDir32$      = "%ProgramFiles32Dir%\<path to the product>"
    43 Set $InstallDir64$      = "%ProgramFiles64Dir%\<path to the product>"
     59Set $InstallDir$        = "%ProgramFilesDir%\Bacula"
     60Set $InstallDir32$      = "%ProgramFiles32Dir%\Bacula"
     61Set $InstallDir64$      = "%ProgramFiles64Dir%\Bacula"
    4462Set $LicenseRequired$ = "false"
    4563Set $LicensePool$     = "p_" + $ProductId$
    … …  
    5068        isFatalError
    5169        ; Stop process and set installation status to failed
     70endif
     71
     72comment "Show product picture"
     73ShowBitmap "%ScriptPath%\logo.png" $ProductId$
     74
     75if FileExists("%ScriptPath%\delsub3264.ins")
     76    comment "Start uninstall sub section"
     77    Sub "%ScriptPath%\delsub3264.ins"
     78endif
     79
     80;if $LicenseRequired$ = "true"
     81;       comment "Licensing required, reserve license and get license key"
     82;       Sub_get_licensekey
     83;endif
     84
     85comment "installing"
     86
     87if $filedaemon_name$ = ""
     88  set $filedaemon_full_name$    = "%PCname%-fd"
     89  set $filedaemon_monitor_name$ = "%PCname%-mon"
    5290else
    53         comment "Show product picture"
    54         ShowBitmap "%ScriptPath%\logo.png" $ProductId$
    55        
    56         if FileExists("%ScriptPath%\delsub3264.ins")
    57                 comment "Start uninstall sub section"
    58                 Sub "%ScriptPath%\delsub3264.ins"
    59         endif
    60        
    61         ;if $LicenseRequired$ = "true"
    62         ;       comment "Licensing required, reserve license and get license key"
    63         ;       Sub_get_licensekey
    64         ;endif
    65        
    66         comment "installing"
    67 
    68         if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
    69                 Message "Installing " + $ProductId$ + " 32 Bit..."
    70                 comment "Start setup program"
    71                 Winbatch_install_32
    72                 Sub_check_exitcode
    73                 ;comment "Copy files"
    74                 ;Files_install_32 /32Bit
    75                 ;comment "Patch Registry"
    76                 ;Registry_install /32Bit
    77                 ;comment "Create shortcuts"
    78                 ;LinkFolder_install
    79         endif
    80 
    81         if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
    82                 Message "Installing " + $ProductId$ + " 64 Bit..."
    83                 comment "Start setup program"
    84                 Winbatch_install_64
    85                 Sub_check_exitcode
    86                 ;comment "Copy files"
    87                 ;Files_install_64 /64Bit
    88                 ;comment "Patch Registry"
    89                 ;Registry_install /64Bit
    90                 ;comment "Create shortcuts"
    91                 ;LinkFolder_install
    92         endif
    93        
    94 endif
     91  set $filedaemon_full_name$    = "$filedaemon_name$-fd"
     92  set $filedaemon_monitor_name$ = "$filedaemon_name$-mon"
     93endif
     94
     95
     96if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
     97    Message "Installing " + $ProductId$ + " 32 Bit..."
     98    comment "Start setup program"
     99    Winbatch_install_32
     100    Sub_check_exitcode
     101    ;comment "Copy files"
     102    ;Files_install_32 /32Bit
     103    ;comment "Patch Registry"
     104    ;Registry_install /32Bit
     105    ;comment "Create shortcuts"
     106    ;LinkFolder_install
     107endif
     108
     109if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
     110    Message "Installing " + $ProductId$ + " 64 Bit..."
     111    comment "Start setup program"
     112    Winbatch_install_64
     113    Sub_check_exitcode
     114    ;comment "Copy files"
     115    ;Files_install_64 /64Bit
     116    ;comment "Patch Registry"
     117    ;Registry_install /64Bit
     118    ;comment "Create shortcuts"
     119    ;LinkFolder_install
     120endif
     121
     122;Patches_bacula_conf $InstallDir$+"\bacula-fd.conf"
     123DosBatch_bacula-fd.conf
     124
     125;
     126; end
     127;
     128
     129
     130
     131; winbatch installer:
     132; /S silent installl
     133; /D destination path
     134;       use this, otherwise it installs to "program files" for all languages.
     135;       don't use " around argument, otherwise argument is ignored
    95136
    96137[Winbatch_install_32]
    97 ; Choose one of the following examples as basis for your installation
    98 ; You can use $LicenseKey$ var to pass a license key to the installer
    99 ;
    100 ; === Nullsoft Scriptable Install System ================================================================
    101 ; "%ScriptPath%\Setup.exe" /S
    102 ;
    103 ; === MSI package =======================================================================================
    104 ; You may use the parameter PIDKEY=$Licensekey$
    105 ; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
    106 ;
    107 ; === InstallShield + MSI=====================================================================================
    108 ; Attention: The path to the log file should not contain any whitespaces
    109 ; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=2 REBOOT=ReallySuppress"
    110 ; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress"
    111 ;
    112 ; === InstallShield =====================================================================================
    113 ; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss"
    114 ; "%ScriptPath%\setup.exe" /s /sms /f1"%ScriptPath%\setup.iss" /f2"$LogDir$\$ProductId$.install_log.txt"
    115 ;
    116 ; === Inno Setup ========================================================================================
    117 ; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html
    118 ; You may create setup answer file by: setup.exe /SAVEINF="filename"
    119 ; You may use an answer file by the parameter /LOADINF="filename"
    120 ; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
    121 
    122 "%ScriptPath%\data\bacula-win32-$ProductVer$.exe" /S
     138"%ScriptPath%\data\bacula-win32-$ProductVer$.exe" /S /D=$InstallDir32$
     139
     140[Winbatch_install_64]
     141"%ScriptPath%\data\bacula-win64-$ProductVer$.exe" /S /D=$InstallDir64$
     142
     143[DosBatch_bacula-fd.conf]
     144(
     145echo # managed by opsi
     146echo #
     147echo # "Global" File daemon configuration specifications
     148echo #
     149echo FileDaemon {                            # this is me
     150echo   Name = $filedaemon_full_name$
     151echo   FDport = 9102                # where we listen for the director
     152echo   WorkingDirectory = "$InstallDir32$\\working"
     153echo   Pid Directory = "$InstallDir32$\\working"
     154echo   Plugin Directory = "$InstallDir32$\\plugins"
     155echo   Maximum Concurrent Jobs = 10
     156echo }
     157;echo
     158echo #
     159echo # List Directors who are permitted to contact this File daemon
     160echo #
     161echo Director {
     162echo   Name     = $director_name$
     163echo   Password = "$filedaemon_full_password$"
     164echo }
     165;echo
     166echo #
     167echo # Restricted Director, used by tray-monitor to get the
     168echo #   status of the file daemon
     169echo #
     170echo Director {
     171echo   Name     = $filedaemon_monitor_name$
     172echo   Password = "$filedaemon_monitor_password$"
     173echo   Monitor  = yes
     174echo }
     175;echo
     176echo # Send all messages except skipped files back to Director
     177echo Messages {
     178echo   Name = Standard
     179echo   director = $director_name$ = all, !skipped, !restored
     180echo }
     181) >> $InstallDir$/bacula-fd.conf
    123182
    124183
    … …  
    128187;
    129188; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
    130 
    131 [Winbatch_install_64]
    132 ; Choose one of the following examples as basis for your installation
    133 ; You can use $LicenseKey$ var to pass a license key to the installer
    134 ;
    135 ; === Nullsoft Scriptable Install System ================================================================
    136 ; "%ScriptPath%\Setup.exe" /S
    137 ;
    138 ; === MSI package =======================================================================================
    139 ; You may use the parameter PIDKEY=$Licensekey$
    140 ; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
    141 ;
    142 ; === InstallShield + MSI=====================================================================================
    143 ; Attention: The path to the log file should not contain any whitespaces
    144 ; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb! ALLUSERS=2 REBOOT=ReallySuppress"
    145 ; "%ScriptPath%\setup.exe" /s /v" /qb! ALLUSERS=2 REBOOT=ReallySuppress"
    146 ;
    147 ; === InstallShield =====================================================================================
    148 ; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss"
    149 ; "%ScriptPath%\setup.exe" /s /sms /f1"%ScriptPath%\setup.iss" /f2"$LogDir$\$ProductId$.install_log.txt"
    150 ;
    151 ; === Inno Setup ========================================================================================
    152 ; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html
    153 ; You may create setup answer file by: setup.exe /SAVEINF="filename"
    154 ; You may use an answer file by the parameter /LOADINF="filename"
    155 ; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES
    156 
    157 "%ScriptPath%\data\bacula-win64-$ProductVer$.exe" /S
    158 
    159 
    160189
    161190[Files_install_64]

  • opsi/products/bacula/CLIENT_DATA/uninstall3264.ins

    r1022 r1023  
    3131; ----------------------------------------------------------------
    3232Set $ProductId$       = "opsi-template"
    33 Set $InstallDir32$    = "%ProgramFiles32Dir%\<path to the product>"
    34 Set $InstallDir64$    = "%ProgramFiles64Dir%\<path to the product>"
     33Set $InstallDir32$    = "%ProgramFiles32Dir%\Bacula"
     34Set $InstallDir64$    = "%ProgramFiles64Dir%\Bacula"
    3535Set $LicenseRequired$ = "false"
    3636Set $LicensePool$     = "p_" + $ProductId$
    … …  
    4848endif
    4949
    50 if $LicenseRequired$ = "true"
    51         comment "Licensing required, free license used"
    52         Sub_free_license
    53 endif
     50;if $LicenseRequired$ = "true"
     51;       comment "Licensing required, free license used"
     52;       Sub_free_license
     53;endif
    5454
    5555[Sub_free_license]

  • opsi/products/bacula/OPSI/control

    r1022 r1023  
    11[Package]
    2 version: 1
     2version: 2
    33depends:
    44incremental: False
    … …  
    2424[ProductProperty]
    2525type: unicode
     26name: filedaemon_name
     27multivalue: False
     28editable: True
     29description: filedaemon bacula name. Leave empty HOSTNAME-fd
     30default: [""]
     31
     32[ProductProperty]
     33type: unicode
     34name: filedaemon_full_password
     35multivalue: False
     36editable: True
     37description: password used by director to connect to this filedaemon
     38default: ["filedaemon_full_password"]
     39
     40[ProductProperty]
     41type: unicode
     42name: filedaemon_monitor_password
     43multivalue: False
     44editable: True
     45description: password used by monitoring (eg. tray-monitor) to connect to this filedaemon
     46default: ["filedaemon_monitor_password"]
     47
     48[ProductProperty]
     49type: unicode
     50name: director_name
     51multivalue: False
     52editable: True
     53description: access to Bacula director for bconsole and bat
     54default: ["bacula-dir"]
     55
     56[ProductProperty]
     57type: unicode
     58name: director_address
     59multivalue: False
     60editable: True
     61description: access to Bacula director for bconsole and bat
     62default: ["bacula-dir.example.com"]
     63
     64[ProductProperty]
     65type: unicode
     66name: director_password
     67multivalue: False
     68editable: True
     69description: access to Bacula director for bconsole and bat
     70default: ["director_password"]
     71
     72[ProductProperty]
     73type: unicode
    2674name: install_architecture
    2775multivalue: False
    … …  
    3179default: ["system specific"]
    3280
     81
    3382[Changelog]
     8320120704, 5.2.10-2, Joerg Steffens
     84  * uninstall
     85  * properties
     86  * generate bacula-fd.conf
     87
    348820120702, 5.2.10-1, Joerg Steffens
    3589  * initial
Note: See TracChangeset for help on using the changeset viewer.