tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5108-ws-cookie-parser' into 'develop'

Browse Source 
Ent 5108 ws cookie parser

See merge request artica/pandorafms!2964
This commit is contained in:
Alejandro Fraguas 2019-12-16 17:02:13 +01:00
commit f59f044c1c
10 changed files with 7 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extras/build_deb.sh
View File

@ -8,19 +8,8 @@ fi
echo "Creating DEB packages in $RPMHOME/DEB"
# Console
# Extra files to be added to rpm.
if [ "$X86_64" == "" ]; then
# Fake gotty.
echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
chmod +x pandora_console/gotty
else
cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
fi
cd $CODEHOME/pandora_console/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1
# Cleanup.
rm -f pandora_console/gotty
# Server
cd $CODEHOME/pandora_server/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1

12
extras/build_rpm.sh
View File

@ -8,20 +8,8 @@ fi
echo "Creating RPM packages in $RPMHOME/RPMS"
# Console
# Extra files to be added to rpm.
if [ "$X86_64" == "" ]; then
# Fake gotty.
echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
chmod +x pandora_console/gotty
else
cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
fi
rpmbuild -ba $CODEHOME/pandora_console/pandora_console.spec || exit 1
# Cleanup.
rm -f pandora_console/gotty
# Server
rpmbuild -ba $CODEHOME/pandora_server/pandora_server.spec || exit 1

12
extras/build_rpm_redhat.sh
View File

@ -8,20 +8,8 @@ fi
echo "Creating RPM packages in $RPMHOME/RPMS"
# Console
# Extra files to be added to rpm.
if [ "$X86_64" == "" ]; then
# Fake gotty.
echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
chmod +x pandora_console/gotty
else
cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
fi
rpmbuild -ba $CODEHOME/pandora_console/pandora_console.redhat.spec || exit 1
# Cleanup.
rm -f pandora_console/gotty
# Server
rpmbuild -ba $CODEHOME/pandora_server/pandora_server.redhat.spec || exit 1

16
extras/build_rpm_rhel7.sh
View File

@ -8,25 +8,13 @@ fi
echo "Creating RPM packages in $RPMHOME/RPMS"
# Console
# Extra files to be added to rpm.
if [ "$X86_64" == "" ]; then
# Fake gotty.
echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
chmod +x pandora_console/gotty
else
cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
fi
rpmbuild -ba $CODEHOME/pandora_console/pandora_console.rhel7.spec || exit 1
# Cleanup.
rm -f pandora_console/gotty
# Server
rpmbuild -ba $CODEHOME/pandora_server/pandora_server.redhat.spec || exit 1
#rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1
# Unix agent
rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec || exit 1
#rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.rhel7.spec || exit 1
# Enterprise console
rpmbuild -ba $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec || exit 1

3
pandora_console/DEBIAN/postinst
View File

@ -10,9 +10,6 @@ if [ -f /etc/init.d/apache2 ]; then
echo Restart the apache.
/etc/init.d/apache2 restart
fi
# Install GoTTY binary file.
cp -pf %{prefix}/pandora_console/gotty /usr/bin/
chmod +x /usr/bin/gotty
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/

5
pandora_console/extensions/quick_shell.php
View File

@ -398,7 +398,8 @@ function quickShellSettings()
$t->width = '100%';
$t->class = 'databox filters';
$t->data = [];
$t->style[0] = 'font-weight: bold';
$t->style = [];
$t->style[0] = 'font-weight: bold; width: 40%;';
$t->data[0][0] = __('Gotty path');
$t->data[0][1] = html_print_input_text(
@ -445,7 +446,7 @@ function quickShellSettings()
$hidden->width = '100%';
$hidden->class = 'databox filters';
$hidden->data = [];
$hidden->style[0] = 'font-weight: bold';
$hidden->style[0] = 'font-weight: bold;width: 40%;';
$hidden->data[0][0] = __('Gotty user').ui_print_help_tip(
__('Optional, set a user to access gotty service'),

8
pandora_console/godmode/menu.php
View File

@ -316,12 +316,8 @@ if (check_acl($config['id_user'], 0, 'PM')) {
$sub2['godmode/setup/setup&section=notifications']['text'] = __('Notifications');
$sub2['godmode/setup/setup&section=notifications']['refr'] = 0;
// Enable only if quickshell is enabled.
if (function_exists('quickShellSettings') === true) {
$sub2['godmode/setup/setup&section=quickshell']['text'] = __('QuickShell');
$sub2['godmode/setup/setup&section=quickshell']['refr'] = 0;
}
$sub2['godmode/setup/setup&section=websocket_engine']['text'] = __('Websocket Engine');
$sub2['godmode/setup/setup&section=websocket_engine']['refr'] = 0;
if ($config['activate_gis']) {
$sub2['godmode/setup/gis']['text'] = __('Map conections GIS');

4
pandora_console/pandora_console.redhat.spec
View File

@ -57,10 +57,6 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
rm -rf $RPM_BUILD_ROOT
%post
# Install GoTTY binary file.
cp -pf %{prefix}/pandora_console/gotty /usr/bin/
chmod +x /usr/bin/gotty
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
chmod +x /etc/init.d/pandora_websocket_engine

4
pandora_console/pandora_console.rhel7.spec
View File

@ -57,10 +57,6 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
rm -rf $RPM_BUILD_ROOT
%post
# Install GoTTY binary file.
cp -pf %{prefix}/pandora_console/gotty /usr/bin/
chmod +x /usr/bin/gotty
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
chmod +x /etc/init.d/pandora_websocket_engine

4
pandora_console/pandora_console.spec
View File

@ -58,10 +58,6 @@ fi
rm -rf $RPM_BUILD_ROOT
%post
# Install GoTTY binary file.
cp -pf %{prefix}/pandora_console/gotty /usr/bin/
chmod +x /usr/bin/gotty
# Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
chmod +x /etc/init.d/pandora_websocket_engine