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

Merge branch 'ent-10100-rpm-de-la-consola-no-aplica-el-updatemr-con-rpm-u-ni-con-dnf-install' into 'develop'

Browse Source 
10100 deleting if congition and add the exec to update section where config php exist

See merge request artica/pandorafms!5488
This commit is contained in:
Matias Didier 2023-02-06 13:01:38 +00:00
commit 3ebb22d5f8
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/pandora_console.redhat.spec
View File

@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}
BuildArch: noarch BuildArch: noarch
AutoReq: 0 AutoReq: 0
Requires: %{httpd_name} >= 2.0.0 Requires: %{httpd_name} >= 2.0.0
Requires: mod_php >= 7.0 Requires: php >= 8.0
Requires: php-gd, php-ldap, php-snmp, php-session, php-gettext Requires: php-gd, php-ldap, php-snmp, php-session, php-gettext
Requires: php-mysqlnd, php-mbstring, php-zip, php-zlib, php-curl Requires: php-mysqlnd, php-mbstring, php-zip, php-zlib, php-curl
Requires: xorg-x11-fonts-75dpi, xorg-x11-fonts-misc, php-pecl-zip Requires: xorg-x11-fonts-75dpi, xorg-x11-fonts-misc, php-pecl-zip
@ -77,6 +77,11 @@ echo " /etc/init.d/pandora_websocket_engine start"
# #
if [ -f %{prefix}/pandora_console/include/config.php ] ; then if [ -f %{prefix}/pandora_console/include/config.php ] ; then
mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done
# Upgrading MR.
echo "Updating the database schema."
/usr/bin/php %{prefix}/pandora_console/godmode/um_client/updateMR.php 2>/dev/null
else else
echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it."
fi fi

10
pandora_console/pandora_console.rhel7.spec
View File

@ -57,11 +57,6 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
# Upgrading.
if [ "$1" -eq "1" ]; then
echo "Updating the database schema."
/usr/bin/php %{prefix}/pandora_console/godmode/um_client/updateMR.php 2>/dev/null
fi
# Install pandora_websocket_engine service. # Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/ cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
@ -76,6 +71,11 @@ echo " /etc/init.d/pandora_websocket_engine start"
# #
if [ -f %{prefix}/pandora_console/include/config.php ] ; then if [ -f %{prefix}/pandora_console/include/config.php ] ; then
mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done
# Upgrading MR.
echo "Updating the database schema."
/usr/bin/php %{prefix}/pandora_console/godmode/um_client/updateMR.php 2>/dev/null
else else
echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it."
fi fi

12
pandora_console/pandora_console.spec
View File

@ -29,7 +29,7 @@ BuildArch: noarch
AutoReq: 0 AutoReq: 0
Requires: apache2 Requires: apache2
Requires: apache2-mod_php7 Requires: apache2-mod_php7
Requires: php >= 7.0 Requires: php >= 8.0
Requires: php-gd, php-snmp, php-json, php-gettext Requires: php-gd, php-snmp, php-json, php-gettext
Requires: php-mysqlnd, php-ldap, php-mbstring, php Requires: php-mysqlnd, php-ldap, php-mbstring, php
Requires: graphviz, xorg-x11-fonts-core, graphviz-gd Requires: graphviz, xorg-x11-fonts-core, graphviz-gd
@ -58,11 +58,6 @@ fi
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
# Upgrading.
if [ "$1" -eq "1" ]; then
echo "Updating the database schema."
/usr/bin/php %{prefix}/pandora_console/godmode/um_client/updateMR.php 2>/dev/null
fi
# Install pandora_websocket_engine service. # Install pandora_websocket_engine service.
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/ cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
@ -77,6 +72,11 @@ echo " /etc/init.d/pandora_websocket_engine start"
# #
if [ -f %{prefix}/pandora_console/include/config.php ] ; then if [ -f %{prefix}/pandora_console/include/config.php ] ; then
mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done
# Upgrading MR.
echo "Updating the database schema."
/usr/bin/php %{prefix}/pandora_console/godmode/um_client/updateMR.php 2>/dev/null
else else
echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it."
fi fi