2006-11-27 Raúl Mateos <raulofpandora@gmail.com>

* pandora_server/data_in: Removed old directory.

	* pandora_server/config/pandora_server.conf: Changed data_in directory to
	/var/spool/pandora/data_in.

	* pandora_agents/win32/installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe: 	Updated with last binary file.
	
	* pandora_agents/win32/installer/pandora.mpi: Update installer script file.
	
	* pandora_agents/win32/installer/Pandora Windows Agent-1.2 Beta3-Setup.exe: 		deleted old file.

	* pandora_agents/win32/bin/pandora_agent.conf: Changed path in server to
	/var/spool/pandora/data_in.

	* pandora_console/general/footer.php: Add variable $time to get time from server 		which PHP < 5.1. Style correction.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@285 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2006-11-27 21:35:13 +00:00
parent 611d7e3e1e
commit 10c8253981
9 changed files with 46 additions and 12 deletions

View File

@ -1,3 +1,15 @@
2006-11-27 Raul Mateos <raulofpandora@gmail.com>
* installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe: Updated with last
binary file.
* installer/pandora.mpi: Update installer script file.
* installer/Pandora Windows Agent-1.2 Beta3-Setup.exe: deleted old file.
* bin/pandora_agent.conf: Changed path in server to
/var/spool/pandora/data_in.
2006-11-27 Esteban Sánchez <estebans@artica.es> 2006-11-27 Esteban Sánchez <estebans@artica.es>
* pandora_strutils.h, pandora_strutils.cc: strtoulong() now returns an * pandora_strutils.h, pandora_strutils.cc: strtoulong() now returns an

View File

@ -14,8 +14,8 @@
# ================== # ==================
server_ip 127.0.0.1 server_ip 127.0.0.1
server_path /opt/pandora_server/data_in server_path /var/spool/pandora/data_in
temporal "C:\temp" temporal "C:\windows\temp"
interval 10 interval 10
agent_name localhost agent_name localhost
pandora_debug 1 pandora_debug 1

View File

@ -51,7 +51,7 @@ IncludeDebugging
Yes Yes
InstallVersion InstallVersion
1.0.0.1 1.0.0.2
LaunchApplication LaunchApplication
Yes Yes
@ -60,7 +60,7 @@ ProjectID
9A2D5834-BB98-4916-89A5-06C81E368C0A 9A2D5834-BB98-4916-89A5-06C81E368C0A
ProjectVersion ProjectVersion
1.0.3.0 1.0.4.0
ShortAppName ShortAppName
{Pandora FMS} {Pandora FMS}
@ -184,7 +184,7 @@ InstallComponent 9595B40E-22BA-4E6D-AB81-1292E482FB6F -setup Install -title {Ins
InstallComponent 062A52B5-D9BA-43E7-A6B4-3C3FBD33ED83 -setup Install -title {Install Windows Shortcut} -component InstallWindowsShortcut -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623 InstallComponent 062A52B5-D9BA-43E7-A6B4-3C3FBD33ED83 -setup Install -title {Install Windows Shortcut} -component InstallWindowsShortcut -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
InstallComponent 26BC0EC8-61D5-41BC-93EA-C4D5C62F25E4 -setup Install -title {Install Windows Shortcut} -component InstallWindowsShortcut -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623 InstallComponent 26BC0EC8-61D5-41BC-93EA-C4D5C62F25E4 -setup Install -title {Install Windows Shortcut} -component InstallWindowsShortcut -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
InstallComponent E8082112-E869-4AAC-918A-3C5307CB6423 -setup Install -title {Message Box} -component MessageBox -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623 InstallComponent E8082112-E869-4AAC-918A-3C5307CB6423 -setup Install -title {Message Box} -component MessageBox -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
InstallComponent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -setup Install -conditions {87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 1FF15B8D-813C-40C8-876D-156505470C6B} -title {Execute External Program} -component ExecuteExternalProgram -command insert -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623 InstallComponent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -setup Install -conditions {87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 1FF15B8D-813C-40C8-876D-156505470C6B} -title {Execute External Program} -component ExecuteExternalProgram -command reorder -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
Condition 87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 -active Yes -parent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -title {Ask Yes or No} -component AskYesOrNo Condition 87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 -active Yes -parent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -title {Ask Yes or No} -component AskYesOrNo
Condition 1FF15B8D-813C-40C8-876D-156505470C6B -active Yes -parent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -title {String Is Condition} -component StringIsCondition Condition 1FF15B8D-813C-40C8-876D-156505470C6B -active Yes -parent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -title {String Is Condition} -component StringIsCondition
InstallComponent D651AEE7-E69C-44FD-B111-8DE881B83843 -setup Install -conditions 3E668536-AEF9-48A5-A5D0-1DE224E0D276 -title {Execute External Program} -component ExecuteExternalProgram -command insert -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623 InstallComponent D651AEE7-E69C-44FD-B111-8DE881B83843 -setup Install -conditions 3E668536-AEF9-48A5-A5D0-1DE224E0D276 -title {Execute External Program} -component ExecuteExternalProgram -command insert -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
@ -884,7 +884,7 @@ AC33C2B4-AB01-4572-802B-BA89E7661C04,Name
Pandora Pandora
AC33C2B4-AB01-4572-802B-BA89E7661C04,Size AC33C2B4-AB01-4572-802B-BA89E7661C04,Size
7669132 7100188
B1313CDD-A5DA-4A72-ABCF-59E341F46E5A,FailureMessage B1313CDD-A5DA-4A72-ABCF-59E341F46E5A,FailureMessage
{Error initiating service} {Error initiating service}
@ -1391,6 +1391,9 @@ E8082112-E869-4AAC-918A-3C5307CB6423,Message
E8082112-E869-4AAC-918A-3C5307CB6423,Title E8082112-E869-4AAC-918A-3C5307CB6423,Title
{Public and Private Key Generation} {Public and Private Key Generation}
F1A35B0F-4ED6-4687-8D6B-92BF1D209A25,Caption
{Setup has enough information to start copying the program files. If you want to review or change any settings, click Back. If you are satisfied with the settings, click Next to begin copying files.}
FD4A35A5-930C-464A-BF60-2E721C498270,Text FD4A35A5-930C-464A-BF60-2E721C498270,Text
<%CreateDesktopShortcutText%> <%CreateDesktopShortcutText%>

View File

@ -1,3 +1,8 @@
2006-11-27 Raul Mateos <raulofpandora@gmail.com>
* general/footer.php: Add variable $time to get time from server which
PHP < 5.1. Style correction.
2006-11-23 Raul Mateos <raulofpandora@gmail.com> 2006-11-23 Raul Mateos <raulofpandora@gmail.com>
* general/footer.php: Changed text from Pandora to Pandora FMS. * general/footer.php: Changed text from Pandora to Pandora FMS.

View File

@ -20,14 +20,21 @@
<div id="foot"> <div id="foot">
<?php <?php
echo '<a target="_new" href="general/license/pandora_info_'.$language_code.'.html">Pandora FMS '; echo '<a target="_new" href="general/license/pandora_info_'
echo $pandora_version." Build "; .$language_code.'.html">Pandora FMS ';
echo $build_version." "; echo $pandora_version." Build ".$build_version." ";
echo $lang_label["gpl_notice"]; echo $lang_label["gpl_notice"];
echo '</a><br>'; echo '</a><br>';
if (isset($_SESSION['id_usuario'])) { if (isset($_SESSION['id_usuario'])) {
echo $lang_label["gen_date"]." ".date("D F d, Y H:i:s",$_SERVER['REQUEST_TIME'])."<br>";
if (isset($_SERVER['REQUEST_TIME'])) {
$time = $_SERVER['REQUEST_TIME'];
} else {
$time = time();
}
echo $lang_label["gen_date"]." ".date("D F d, Y H:i:s", $time)."<br>";
} }
?> ?>
<i>Pandora FMS is a <a target="_new" href="http://pandora.sourceforge.net">SourceForge registered project</a></i> <i>Pandora FMS is a <a target="_new" href="http://pandora.sourceforge.net">
SourceForge registered project</a></i>
</div> </div>

View File

@ -1,3 +1,10 @@
2006-11-27 Raul Mateos <raulofpandora@gmail.com>
* pandora_server/data_in: Removed old directory.
* pandora_server/config/pandora_server.conf: Changed data_in directory to
/var/spool/pandora/data_in.
2006-11-27 Manuel Arostegui <marostegui@artica.es> 2006-11-27 Manuel Arostegui <marostegui@artica.es>
* pandora_server/specs/fedoracore5/perl-Pandora-1.2-beta3.spec: * pandora_server/specs/fedoracore5/perl-Pandora-1.2-beta3.spec:

View File

@ -7,7 +7,7 @@ servername localhost
# incomingdir: Defines directory where incoming data packets are stored # incomingdir: Defines directory where incoming data packets are stored
# You could set directory relative to base path or absolute, starting with / # You could set directory relative to base path or absolute, starting with /
incomingdir ./data_in incomingdir /var/spool/pandora/data_in
# log_file: Main logfile for pandora_server # log_file: Main logfile for pandora_server
# You could set file relative to base path or absolute, starting with / # You could set file relative to base path or absolute, starting with /