File tree 3 files changed +14
-0
lines changed
3 files changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -100,6 +100,8 @@ packaging:
100
100
* Remove Deploy & Collect tasks from Typical installation on windows
101
101
* On MacOSX, by default, only enable inventory task on MacOSX. You'll have now to
102
102
explicitely enable required tasks in an "etc/conf.d" ".cfg" file.
103
+ * Windows MSI installer now supports AGENTMONITOR_NEWTICKET_URL as option to configure
104
+ GLPI-AgentMonitor new ticket url.
103
105
104
106
1.7.3 Wed, 03 Apr 2024
105
107
Original file line number Diff line number Diff line change @@ -586,6 +586,9 @@ sub _tree2xml {
586
586
# Add registry entry dedicated to deployment vbs check
587
587
$result .= $ident ." " . qq[ <RegistryValue Name="Version" Type="string" Value="$installversion " />\n ] ;
588
588
$result .= $ident ." " . qq[ </RegistryKey>\n ] ;
589
+ $result .= $ident ." " . qq[ <RegistryKey Root="HKLM" Key="$regpath \\ Monitor">\n ] ;
590
+ $result .= $ident ." " . qq[ <RegistryValue Name="NewTicket-URL" Type="string" Value="[AGENTMONITOR_NEWTICKET_URL]" />\n ] ;
591
+ $result .= $ident ." " . qq[ </RegistryKey>\n ] ;
589
592
}
590
593
$result .= $ident ." " . qq[ </Component>\n ] ;
591
594
}
Original file line number Diff line number Diff line change 57
57
<SetProperty Id =" CMDLINE_AGENTMONITOR" Before =" AppSearch" Value =" [AGENTMONITOR]" />
58
58
<SetProperty Id =" AGENTMONITOR" After =" AppSearch" Value =" [CMDLINE_AGENTMONITOR]" ><![CDATA[ CMDLINE_AGENTMONITOR<>"" OR CMDLINE_CONFIG="reset"]]> </SetProperty >
59
59
60
+ <Property Id =" AGENTMONITOR_NEWTICKET_URL" Secure =" yes" >
61
+ <RegistrySearch Id =" NewTicket-URL" Root =" HKLM" Key =" [%agent_regpath%]\Monitor" Name =" NewTicket-URL" Type =" raw" />
62
+ </Property >
63
+ <SetProperty Id =" CMDLINE_AGENTMONITOR_NEWTICKET_URL" Before =" AppSearch" Value =" [AGENTMONITOR_NEWTICKET_URL]" />
64
+ <SetProperty Id =" AGENTMONITOR_NEWTICKET_URL" After =" AppSearch" Value =" [CMDLINE_AGENTMONITOR_NEWTICKET_URL]" ><![CDATA[ CMDLINE_AGENTMONITOR_NEWTICKET_URL<>"" OR CMDLINE_CONFIG="reset"]]> </SetProperty >
65
+
60
66
<Property Id =" ADD_FIREWALL_EXCEPTION" Secure =" yes" >
61
67
<RegistrySearch Id =" AddFirewallException" Root =" HKLM" Key =" [%agent_regpath%]\Installer" Name =" AddFirewallException" Type =" raw" />
62
68
</Property >
358
364
<SetProperty Id =" TASK_HOURLY_MODIFIER" Action =" TASK_HOURLY_MODIFIER_Default" After =" LaunchConditions" Value =" 1" ><![CDATA[ NOT TASK_HOURLY_MODIFIER]]> </SetProperty >
359
365
<SetProperty Id =" TASK_DAILY_MODIFIER" Action =" TASK_DAILY_MODIFIER_Default" After =" LaunchConditions" Value =" 1" ><![CDATA[ NOT TASK_DAILY_MODIFIER]]> </SetProperty >
360
366
367
+ <!-- Monitor configuration defaults -->
368
+ <SetProperty Id =" AGENTMONITOR_NEWTICKET_URL" Action =" AGENTMONITOR_NEWTICKET_URL_Default" After =" LaunchConditions" Value =" " ><![CDATA[ NOT AGENTMONITOR_NEWTICKET_URL]]> </SetProperty >
369
+
361
370
<!-- Fix properties handled as a checkbox, they must be undefined to uncheck the CB -->
362
371
<SetProperty Id =" QUICKINSTALL" Sequence =" ui" Action =" QUICKINSTALL_Unset" After =" CostFinalize" Value =" " ><![CDATA[ QUICKINSTALL<>"1"]]> </SetProperty >
363
372
<SetProperty Id =" NO_HTTPD" Sequence =" ui" Action =" NO_HTTPD_Unset" After =" CostFinalize" Value =" " ><![CDATA[ NO_HTTPD<>"0"]]> </SetProperty >
You can’t perform that action at this time.
0 commit comments