tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-12-13 Ramon Novoa <rnovoa@artica.es> 

* win32/pandora_windows_service.cc: Brokers do not need to
	  modify the path.

	* win32/installer/pandora.mpi,
	  win32/pandora.cc,
	  unix/DEBIAN/control,
	  unix/DEBIAN/make_deb_package.sh,
	  unix/pandora_agent.spec,
	  unix/pandora_agent: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5250 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2011-12-13 14:10:51 +00:00
parent 7872dcde1e
commit 26ee70a3ec
8 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_agents/ChangeLog
View File

@ -1,3 +1,15 @@
2011-12-13 Ramon Novoa <rnovoa@artica.es>
* win32/pandora_windows_service.cc: Brokers do not need to
modify the path.
* win32/installer/pandora.mpi,
win32/pandora.cc,
unix/DEBIAN/control,
unix/DEBIAN/make_deb_package.sh,
unix/pandora_agent.spec,
unix/pandora_agent: Updated version strings.
2011-11-01 Junichi Satoh <junichi@rworks.jp> 2011-11-01 Junichi Satoh <junichi@rworks.jp>
* android/res/values-ja/strings.xml: Updated the help text. * android/res/values-ja/strings.xml: Updated the help text.

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 4.0 Version: final
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="4.0" pandora_version="final"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

4
pandora_agents/unix/pandora_agent
View File

@ -52,8 +52,8 @@ if (!$@) {
threads::shared::share (\$Sem); threads::shared::share (\$Sem);
} }
use constant AGENT_VERSION => '4.0'; use constant AGENT_VERSION => 'final';
use constant AGENT_BUILD => '111104'; use constant AGENT_BUILD => '111213';
# Commands to retrieve total memory information in kB # Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => { use constant TOTALMEMORY_CMDS => {

2
pandora_agents/unix/pandora_agent.spec
View File

@ -2,7 +2,7 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 4.0 %define version final
%define release 1 %define release 1
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version

6
pandora_agents/win32/installer/pandora.mpi
View File

@ -3,7 +3,7 @@ AllowLanguageSelection
{Yes} {Yes}
AppName AppName
{Pandora FMS Windows Agent v4.0} {Pandora FMS Windows Agent vfinal}
ApplicationID ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F} {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@ -75,7 +75,7 @@ InstallPassword
{} {}
InstallVersion InstallVersion
{4.0.0.0} {final.0.0}
Language,ca Language,ca
{No} {No}
@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{110923} {111213}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("4.0RC1(Build 110819)") #define PANDORA_VERSION ("final(Build 111213)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

9
pandora_agents/win32/pandora_windows_service.cc
View File

@ -125,15 +125,6 @@ Pandora_Windows_Service::pandora_init_broker (string file_conf) {
string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr; string udp_server_enabled, udp_server_port, udp_server_addr, udp_server_auth_addr;
int pos; int pos;
/*setPandoraDebug (true);*/
// Add the util subdirectory to the PATH
util_dir = Pandora::getPandoraInstallDir ();
util_dir += "util";
path = getenv ("PATH");
env = "PATH=" + path + ";" + util_dir;
putenv (env.c_str ());
name_agent = "PANDORA_AGENT=" + checkAgentName(file_conf); name_agent = "PANDORA_AGENT=" + checkAgentName(file_conf);
putenv(name_agent.c_str()); putenv(name_agent.c_str());