Merge remote-tracking branch 'origin/ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF

This commit is contained in:
fbsanchez 2019-11-06 15:37:45 +01:00
commit ddd370f7c5
4 changed files with 24 additions and 3 deletions

View File

@ -11,4 +11,10 @@ echo Restart the apache.
/etc/init.d/apache2 restart
fi
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
echo "You can now start the Pandora FMS Websocket service by executing"
echo " /etc/init.d/pandora_websocket_engine start"
echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it."

View File

@ -392,7 +392,8 @@ function quickShellSettings()
'inputs' => [
[
'label' => __('Gotty path').ui_print_help_tip(
__('Leave blank if using an external Gotty service')
__('Leave blank if using an external Gotty service'),
true
),
'arguments' => [
'type' => 'text',
@ -426,7 +427,8 @@ function quickShellSettings()
],
[
'label' => __('Gotty user').ui_print_help_tip(
__('Optional, set a user to access gotty service')
__('Optional, set a user to access gotty service'),
true
),
'arguments' => [
'type' => 'text',
@ -436,7 +438,8 @@ function quickShellSettings()
],
[
'label' => __('Gotty password').ui_print_help_tip(
__('Optional, set a password to access gotty service')
__('Optional, set a password to access gotty service'),
true
),
'arguments' => [
'type' => 'password',

View File

@ -57,6 +57,12 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
rm -rf $RPM_BUILD_ROOT
%post
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
echo "You can now start the Pandora FMS Websocket service by executing"
echo " /etc/init.d/pandora_websocket_engine start"
# Has an install already been done, if so we only want to update the files
# push install.php aside so that the console works immediately using existing
# configuration.

View File

@ -58,6 +58,12 @@ fi
rm -rf $RPM_BUILD_ROOT
%post
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
echo "You can now start the Pandora FMS Websocket service by executing"
echo " /etc/init.d/pandora_websocket_engine start"
# Has an install already been done, if so we only want to update the files
# push install.php aside so that the console works immediately using existing
# configuration.