Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log

This commit is contained in:
fbsanchez 2020-09-14 16:20:26 +02:00
commit fcb23b1efc
55 changed files with 193 additions and 110 deletions

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, AIX version
# Version 7.0NG.749, AIX version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, FreeBSD Version
# Version 7.0NG.749, FreeBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, HP-UX Version
# Version 7.0NG.749, HP-UX Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, GNU/Linux
# Version 7.0NG.749, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, GNU/Linux
# Version 7.0NG.749, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, Solaris Version
# Version 7.0NG.749, Solaris Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent
# (c) 2006-2010 Artica Soluciones Tecnologicas
# Version 7.0NG.748
# Version 7.0NG.749
# This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
# Version 7.0NG.748, AIX version
# Version 7.0NG.749, AIX version
# General Parameters
# ==================

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
# Version 7.0NG.748
# Version 7.0NG.749
# FreeBSD/IPSO version
# Licenced under GPL licence, 2003-2007 Sancho Lerena

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
# Version 7.0NG.748, HPUX Version
# Version 7.0NG.749, HPUX Version
# General Parameters
# ==================

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748
# Version 7.0NG.749
# Licensed under GPL license v2,
# (c) 2003-2010 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748
# Version 7.0NG.749
# Licensed under GPL license v2,
# (c) 2003-2009 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748
# Version 7.0NG.749
# Licensed under GPL license v2,
# please visit http://pandora.sourceforge.net

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents
# Version 7.0NG.748, Solaris version
# Version 7.0NG.749, Solaris version
# General Parameters
# ==================

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, AIX version
# Version 7.0NG.749, AIX version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.748-200907
Version: 7.0NG.749-200914
Architecture: all
Priority: optional
Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.748-200907"
pandora_version="7.0NG.749-200914"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
@ -81,6 +81,9 @@ cp -aRf man/man1/* temp_package/usr/share/man/man1/
# Relocate plugins to the final dir and delete
cp temp_package/usr/share/pandora_agent/plugins/* temp_package/etc/pandora/plugins
# Make sure the plugins have execution privileges
chmod 755 temp_package/etc/pandora/plugins/*
echo "Official plugins are placed on /etc/pandora/plugins" > temp_package/usr/share/pandora_agent/plugins/README
#Disabled, now the package overwrite the previous files.

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, GNU/Linux
# Version 7.0NG.749, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, FreeBSD Version
# Version 7.0NG.749, FreeBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, HP-UX Version
# Version 7.0NG.749, HP-UX Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, GNU/Linux
# Version 7.0NG.749, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, GNU/Linux
# Version 7.0NG.749, GNU/Linux
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, NetBSD Version
# Version 7.0NG.749, NetBSD Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents
# Version 7.0NG.748, Solaris Version
# Version 7.0NG.749, Solaris Version
# Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -54,8 +54,8 @@ my $Sem = undef;
# Semaphore used to control the number of threads
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.748';
use constant AGENT_BUILD => '200907';
use constant AGENT_VERSION => '7.0NG.749';
use constant AGENT_BUILD => '200914';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
@ -108,8 +108,27 @@ mkdir -p /var/spool/pandora/data_out
if [ ! -d /var/log/pandora ]; then
mkdir -p /var/log/pandora
fi
/sbin/chkconfig --add pandora_agent_daemon
/sbin/chkconfig pandora_agent_daemon on
if [ `command -v systemctl` ];
then
echo "Copying new version of pandora_agent_daemon service"
cp -f /usr/share/pandora_agent/pandora_agent_daemon.service /usr/lib/systemd/system/
chmod -x /usr/lib/systemd/system/pandora_agent_daemon.service
# Enable the services on SystemD
systemctl enable pandora_agent_daemon.service
else
/sbin/chkconfig --add pandora_agent_daemon
/sbin/chkconfig pandora_agent_daemon on
fi
if [ "$1" -gt 1 ]
then
echo "If Pandora Agent daemon was running with init.d script,"
echo "please stop it manually and start the service with systemctl"
fi
%preun

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
@ -98,11 +98,27 @@ fi
cp -aRf /usr/share/pandora_agent/pandora_agent_logrotate /etc/logrotate.d/pandora_agent
# Enable the service on SystemD
systemctl enable pandora_agent_daemon.service
mkdir -p /var/spool/pandora/data_out
chkconfig pandora_agent_daemon on
if [ `command -v systemctl` ];
then
echo "Copying new version of pandora_agent_daemon service"
cp -f /usr/share/pandora_agent/pandora_agent_daemon.service /usr/lib/systemd/system/
chmod -x /usr/lib/systemd/system/pandora_agent_daemon.service
# Enable the services on SystemD
systemctl enable pandora_agent_daemon.service
else
chkconfig pandora_agent_daemon on
fi
if [ "$1" -gt 1 ]
then
echo "If Pandora Agent daemon was running with init.d script,"
echo "please stop it manually and start the service with systemctl"
fi
%preun

View File

@ -4,6 +4,8 @@ After=network-online.target
[Service]
ExecStart=/usr/bin/pandora_agent /etc/pandora
Restart=on-failure
RestartPreventExitStatus=1
[Install]
WantedBy=multi-user.target

View File

@ -9,8 +9,8 @@
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
# **********************************************************************
PI_VERSION="7.0NG.748"
PI_BUILD="200907"
PI_VERSION="7.0NG.749"
PI_BUILD="200914"
OS_NAME=`uname -s`
FORCE=0

View File

@ -460,15 +460,19 @@ close (FILE);
$Mode = 'LSHW';
$Separator = '\s+\*\-';
my @hwinfo;
my $lshwpath = $0 =~ s/inventory/lshw/r ;
if (is_enabled $AIX) {
$Separator = '^\s*$';
@hwinfo=`prtconf 2>/dev/null`;
} else {
@hwinfo = `lshw 2>/dev/null`;
if ($? != 0) {
$Mode = 'HWINFO';
$Separator = 'Hardware Class:';
@hwinfo = `hwinfo --cpu --memory --gfxcard --netcard --cdrom --disk 2>/dev/null`;
@hwinfo = `$lshwpath 2>/dev/null`;
if ($? != 0) {
$Mode = 'HWINFO';
$Separator = 'Hardware Class:';
@hwinfo = `hwinfo --cpu --memory --gfxcard --netcard --cdrom --disk 2>/dev/null`;
}
}
}

View File

@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent
# (c) 2006-2017 Artica Soluciones Tecnologicas
# Version 7.0NG.748
# Version 7.0NG.749
# This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software

View File

@ -3,7 +3,7 @@ AllowLanguageSelection
{Yes}
AppName
{Pandora FMS Windows Agent v7.0NG.748}
{Pandora FMS Windows Agent v7.0NG.749}
ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{200907}
{200914}
ViewReadme
{Yes}

View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.748(Build 200907)")
#define PANDORA_VERSION ("7.0NG.749(Build 200914)")
string pandora_path;
string pandora_dir;

View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.748(Build 200907))"
VALUE "ProductVersion", "(7.0NG.749(Build 200914))"
VALUE "FileVersion", "1.0.0.0"
END
END

View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.748-200907
Version: 7.0NG.749-200914
Architecture: all
Priority: optional
Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.748-200907"
pandora_version="7.0NG.749-200914"
package_pear=0
package_pandora=1

View File

@ -20,8 +20,8 @@
/**
* Pandora build version and version
*/
$build_version = 'PC200907';
$pandora_version = 'v7.0NG.748';
$build_version = 'PC200914';
$pandora_version = 'v7.0NG.749';
// Do not overwrite default timezone set if defined.
$script_tz = @date_default_timezone_get();

View File

@ -128,8 +128,8 @@
</div>
<div style='height: 10px'>
<?php
$version = '7.0NG.748';
$build = '200907';
$version = '7.0NG.749';
$build = '200914';
$banner = "v$version Build $build";
error_reporting(0);

View File

@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
# User and Group under which Apache is running
%define httpd_name httpd

View File

@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
# User and Group under which Apache is running
%define httpd_name httpd

View File

@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

View File

@ -9,7 +9,7 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
PI_VERSION="7.0NG.748"
PI_VERSION="7.0NG.749"
FORCE=0
DESTDIR=""
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`

View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.748-200907
Version: 7.0NG.749-200914
Architecture: all
Priority: optional
Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.748-200907"
pandora_version="7.0NG.749-200914"
package_cpan=0
package_pandora=1

View File

@ -111,9 +111,6 @@ sub pandora_startup () {
# Start the event replication thread. Do not start with start_server_thread, this thread may exit on its own.
threads->create(\&pandora_process_event_replication, \%Config) if($Config{'__enterprise_enabled'} == 1 && $Config{'event_replication'} == 1);
# Update the agent cache. Do not start with start_server_thread, this thread updates the agent cache and exits.
threads->create(\&enterprise_hook, 'update_agent_cache', [\%Config])->detach() if ($Config{'node_metaconsole'} == 1);
pandora_audit (\%Config, $Config{'rb_product_name'} . ' Server Daemon starting', 'SYSTEM', 'System', $DBH);
# Load servers
@ -288,11 +285,21 @@ sub pandora_server_tasks ($) {
# Get the console DB connection
my $dbh = db_connect ($pa_config->{'dbengine'}, $pa_config->{'dbname'}, $pa_config->{'dbhost'}, $pa_config->{'dbport'},
$pa_config->{'dbuser'}, $pa_config->{'dbpass'});
$pa_config->{'dbuser'}, $pa_config->{'dbpass'});
my $counter = 0;
my $first_run = 1;
while ($THRRUN == 1) {
if (pandora_is_master($pa_config) == 1) {
# TASKS EXECUTED ONCE
# -------------------
if ($first_run == 1) {
$first_run = 0;
# Update the agent cache.
enterprise_hook('update_agent_cache', [\%Config]);
}
# TASKS EXECUTED EVERY 5 SECONDS (Low latency tasks)
# --------------------------------------------------
if (($counter % 5) == 0) {

View File

@ -1,7 +1,7 @@
#############################################################################
# Pandora FMS Server Parameters
# Pandora FMS, the Flexible Monitoring System.
# Version 7.0NG.748
# Version 7.0NG.749
# Licensed under GPL license v2,
# (c) 2003-2017 Artica Soluciones Tecnologicas
# http://www.pandorafms.com

View File

@ -44,8 +44,8 @@ our @EXPORT = qw(
);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.748";
my $pandora_build = "200907";
my $pandora_version = "7.0NG.749";
my $pandora_build = "200914";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

View File

@ -1717,9 +1717,9 @@ sub pandora_process_module ($$$$$$$$$;$) {
my $last_error = defined ($module->{'last_error'}) ? $module->{'last_error'} : $agent_status->{'last_error'};
my $ff_start_utimestamp = $agent_status->{'ff_start_utimestamp'};
my $mark_for_update = 0;
# tagente_estado.last_try defaults to NULL, should default to '1970-01-01 00:00:00'
$agent_status->{'last_try'} = '1970-01-01 00:00:00' unless defined ($agent_status->{'last_try'});
$agent_status->{'last_try'} = '1970-01-01 00:00:00' unless defined ($agent_status->{'last_try'});
$agent_status->{'datos'} = "" unless defined($agent_status->{'datos'});
# Do we have to save module data?
@ -1732,24 +1732,13 @@ sub pandora_process_module ($$$$$$$$$;$) {
my $last_try = ($1 == 0) ? 0 : strftime("%s", $6, $5, $4, $3, $2 - 1, $1 - 1900);
my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < ($utimestamp - 86400))) ? 1 : 0;
# Received stale data. Save module data if needed and return.
if ($pa_config->{'dataserver_lifo'} == 1 && $utimestamp <= $agent_status->{'utimestamp'}) {
logger($pa_config, "Received stale data from agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 10);
# Save module data. Async and log4x modules are not compressed.
if ($module_type =~ m/(async)|(log4x)/ || $save == 1) {
# If previous timestamp data changes, save the last one to avoid errors on SLA or graphs.
if($last_data_value ne $processed_data) {
my $last_data_timestamp = $agent_status->{'utimestamp'};
my $last_data_object;
$last_data_object->{'data'} = $last_data_value;
save_module_data ($last_data_object, $module, $module_type, $last_data_timestamp, $dbh);
}
# Save module data. Compression does not work for stale data.
if ($module->{'history_data'} == 1) {
save_module_data ($data_object, $module, $module_type, $utimestamp, $dbh);
}

View File

@ -32,8 +32,8 @@ use base 'Exporter';
our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.748";
my $pandora_build = "200907";
my $pandora_version = "7.0NG.749";
my $pandora_build = "200914";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

View File

@ -2,8 +2,8 @@
# Pandora FMS Server
#
%define name pandorafms_server
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
Summary: Pandora FMS Server
Name: %{name}
@ -110,20 +110,34 @@ exit 0
%post
# Initial installation
if [ "$1" = 1 ]; then
/sbin/chkconfig --add pandora_server
/sbin/chkconfig --add tentacle_serverd
/sbin/chkconfig pandora_server on
/sbin/chkconfig tentacle_serverd on
# Run when not uninstalling
if [ "$1" -ge 1 ]
then
if [ `command -v systemctl` ]
then
echo "Copying new version for tentacle_serverd service"
cp -f /usr/share/pandora_server/util/tentacle_serverd.service /usr/lib/systemd/system/
chmod -x /usr/lib/systemd/system/tentacle_serverd.service
# Enable the services on SystemD
systemctl enable tentacle_serverd.service
else
/sbin/chkconfig --add tentacle_serverd
/sbin/chkconfig tentacle_serverd on
fi
echo "Pandora FMS Server configuration is %{_sysconfdir}/pandora/pandora_server.conf"
echo "Pandora FMS Server main directory is %{prefix}/pandora_server/"
echo "The manual can be reached at: man pandora or man pandora_server"
echo "Pandora FMS Documentation is in: http://pandorafms.org"
echo " "
/sbin/chkconfig --add pandora_server
/sbin/chkconfig pandora_server on
systemctl enable pandora_server.service
echo "Pandora FMS Server configuration is %{_sysconfdir}/pandora/pandora_server.conf"
echo "Pandora FMS Server main directory is %{prefix}/pandora_server/"
echo "The manual can be reached at: man pandora or man pandora_server"
echo "Pandora FMS Documentation is in: http://pandorafms.org"
echo " "
fi
# This will avoid confi files overwritting on UPGRADES.
# This will avoid config files overwritting on UPGRADES.
# Main configuration file
if [ ! -e "/etc/pandora/pandora_server.conf" ]
then
@ -144,6 +158,14 @@ fi
echo "Don't forget to start Tentacle Server daemon if you want to receive"
echo "data using tentacle"
if [ "$1" -gt 1 ]
then
echo "If Tentacle Server daemon was running with init.d script,"
echo "please stop it manually and start the service with systemctl"
fi
%preun
# Upgrading

View File

@ -2,8 +2,8 @@
# Pandora FMS Server
#
%define name pandorafms_server
%define version 7.0NG.748
%define release 200907
%define version 7.0NG.749
%define release 200914
Summary: Pandora FMS Server
Name: %{name}
@ -102,11 +102,21 @@ fi
exit 0
%post
chkconfig pandora_server on
chkconfig tentacle_serverd on
if [ `command -v systemctl` ];
then
echo "Copying new version for tentacle_serverd service"
cp -f /usr/share/pandora_server/util/tentacle_serverd.service /usr/lib/systemd/system/
chmod -x /usr/lib/systemd/system/tentacle_serverd.service
# Enable the services on SystemD
systemctl enable tentacle_serverd.service
# Enable the service on SystemD
systemctl enable tentacle_serverd.service
else
chkconfig tentacle_serverd on
fi
chkconfig pandora_server on
# Enable the service on SystemD
systemctl enable pandora_server.service
@ -139,6 +149,14 @@ fi
echo "Don't forget to start Tentacle Server daemon if you want to receive"
echo "data using tentacle"
if [ "$1" -gt 1 ]
then
echo "If Tentacle Server daemon was running with init.d script,"
echo "please stop it manually and start the service with systemctl"
fi
exit 0
%preun

View File

@ -8,8 +8,8 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
PI_VERSION="7.0NG.748"
PI_BUILD="200907"
PI_VERSION="7.0NG.749"
PI_BUILD="200914"
MODE=$1
if [ $# -gt 1 ]; then

View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.748 PS200907";
my $version = "7.0NG.749 PS200914";
# Pandora server configuration
my %conf;

View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.748 PS200907";
my $version = "7.0NG.749 PS200914";
# save program name for logging
my $progname = basename($0);

View File

@ -1,11 +1,14 @@
[Unit]
Description=Tentacle server daemon
After=network-online.target
Requires=network.target
[Service]
Type=forking
ExecStart=/usr/bin/tentacle_server -F /etc/tentacle/tentacle_server.conf
User=pandora
Restart=on-failure
RestartPreventExitStatus=1
[Install]
WantedBy=multi-user.target