From e583b71a99086fa56b18bc85ae069f0df6246a31 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 5 Nov 2019 11:51:26 +0100 Subject: [PATCH 1/2] missaligned tips --- pandora_console/extensions/quick_shell.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php index 8c87577abc..3b1e2db1ba 100644 --- a/pandora_console/extensions/quick_shell.php +++ b/pandora_console/extensions/quick_shell.php @@ -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', From dc565d2575225408601c7f54f6ffc4cc21d163e6 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 5 Nov 2019 12:01:58 +0100 Subject: [PATCH 2/2] pandora_websocket_engine installation in RPM/DEB packages --- pandora_console/DEBIAN/postinst | 6 ++++++ pandora_console/pandora_console.rhel7.spec | 6 ++++++ pandora_console/pandora_console.spec | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/pandora_console/DEBIAN/postinst b/pandora_console/DEBIAN/postinst index eb8e4872f3..731af15219 100755 --- a/pandora_console/DEBIAN/postinst +++ b/pandora_console/DEBIAN/postinst @@ -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." diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index 91f5bebedf..553b604e9d 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -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. diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 1aa902495e..335caf8001 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -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.