diff --git a/extras/build_rpm_rhel7.sh b/extras/build_rpm_rhel7.sh index 6bb65d816d..3684bd42e5 100755 --- a/extras/build_rpm_rhel7.sh +++ b/extras/build_rpm_rhel7.sh @@ -11,16 +11,16 @@ echo "Creating RPM packages in $RPMHOME/RPMS" rpmbuild -ba $CODEHOME/pandora_console/pandora_console.rhel7.spec || exit 1 # Server -rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1 +#rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1 # Unix agent -rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.rhel7.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 # Enterprise server -rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.rhel7.spec || exit 1 +#rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.rhel7.spec || exit 1 exit 0 diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index b78e3c5dc4..433ad42c36 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -21,11 +21,11 @@ Source0: %{name}-%{version}.tar.gz URL: http://www.pandorafms.com Group: Productivity/Networking/Web/Utilities Packager: Sancho Lerena -Prefix: /var/www/html +Prefix: /opt/rh/httpd24/root/var/www/html/ BuildRoot: %{_tmppath}/%{name} BuildArch: noarch AutoReq: 0 -Requires: %{httpd_name} >= 2.0.0 +Requires: httpd24-httpd Requires: httpd24-mod_php >= 7.2 Requires: rh-php72-php-gd, rh-php72-php-ldap, rh-php72-php-snmp, rh-php72-php-session, rh-php72-php-gettext Requires: rh-php72-php-mysqlnd, rh-php72-php-mbstring, rh-php72-php-zip, rh-php72-php-zlib, rh-php72-php-curl diff --git a/pandora_server/bin/PandoraFMS b/pandora_server/bin/PandoraFMS deleted file mode 120000 index 404b77b915..0000000000 --- a/pandora_server/bin/PandoraFMS +++ /dev/null @@ -1 +0,0 @@ -../lib/PandoraFMS \ No newline at end of file diff --git a/pandora_server/bin/PandoraFMS b/pandora_server/bin/PandoraFMS new file mode 100644 index 0000000000..404b77b915 --- /dev/null +++ b/pandora_server/bin/PandoraFMS @@ -0,0 +1 @@ +../lib/PandoraFMS \ No newline at end of file diff --git a/pandora_server/util/PandoraFMS b/pandora_server/util/PandoraFMS deleted file mode 120000 index fde1b9ac41..0000000000 --- a/pandora_server/util/PandoraFMS +++ /dev/null @@ -1 +0,0 @@ -../bin/PandoraFMS/ \ No newline at end of file diff --git a/pandora_server/util/PandoraFMS b/pandora_server/util/PandoraFMS new file mode 100644 index 0000000000..fde1b9ac41 --- /dev/null +++ b/pandora_server/util/PandoraFMS @@ -0,0 +1 @@ +../bin/PandoraFMS/ \ No newline at end of file diff --git a/pandora_server/util/recon_scripts/PandoraFMS b/pandora_server/util/recon_scripts/PandoraFMS deleted file mode 120000 index d77e8a956e..0000000000 --- a/pandora_server/util/recon_scripts/PandoraFMS +++ /dev/null @@ -1 +0,0 @@ -../../bin/PandoraFMS/ \ No newline at end of file diff --git a/pandora_server/util/recon_scripts/PandoraFMS b/pandora_server/util/recon_scripts/PandoraFMS new file mode 100644 index 0000000000..d77e8a956e --- /dev/null +++ b/pandora_server/util/recon_scripts/PandoraFMS @@ -0,0 +1 @@ +../../bin/PandoraFMS/ \ No newline at end of file