tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove pandorawmic binaries from the repo. 

For portability reasons, pandorawmic will be treated as an external
dependency, like wmic.
This commit is contained in:
Ramon Novoa 2022-04-11 09:45:57 +02:00
parent 2471cc2bee
commit 93031d08d7
7 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/Makefile.PL
View File

@ -2,7 +2,7 @@ use 5.000;
use ExtUtils::MakeMaker;
my %ARGV = map { my @r = split /=/,$_; defined $r[1] or $r[1]=1; @r } @ARGV;
my @exe_files = qw(bin/pandora_server bin/pandora_exec bin/pandorawmic);
my @exe_files = qw(bin/pandora_server bin/pandora_exec);
$ARGV{WITHOUT_TENTACLE} or push @exe_files, 'bin/tentacle_server';
WriteMakefile(

3
pandora_server/bin/pandorawmic
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddbbe474e77f02d5ff3fda0ed048fe1a1ca185cbc53094a14b77bd93eb838272
size 10548264

3
pandora_server/bin/pandorawmic.exe
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:287a2caeb2b730eb3e10df3b90ccbb3aab0da8e8c8d4a39b60ded4b7b53b4087
size 8898831

2
pandora_server/pandora_server.redhat.spec
View File

@ -67,7 +67,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/perl5/
# All binaries go to %{_bindir}
cp -aRf bin/pandora_server $RPM_BUILD_ROOT%{_bindir}/
cp -aRf bin/pandora_exec $RPM_BUILD_ROOT%{_bindir}/
cp -aRf bin/pandorawmic $RPM_BUILD_ROOT%{_bindir}/
install -m 0755 bin/tentacle_server $RPM_BUILD_ROOT%{_bindir}/
cp -aRf conf/* $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/
@ -205,7 +204,6 @@ exit 0
%{_bindir}/pandora_server
%{_bindir}/tentacle_server
%{_bindir}/pandora_ha
%{_bindir}/pandorawmic
%dir %{_sysconfdir}/pandora
%dir %{_localstatedir}/spool/pandora

4
pandora_server/pandora_server.spec
View File

@ -73,7 +73,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/
cp -aRf bin/pandora_server $RPM_BUILD_ROOT/usr/bin/
cp -aRf bin/pandora_exec $RPM_BUILD_ROOT/usr/bin/
cp -aRf bin/tentacle_server $RPM_BUILD_ROOT/usr/bin/
cp -aRf bin/pandorawmic $RPM_BUILD_ROOT/usr/bin/
cp -aRf conf/pandora_* $RPM_BUILD_ROOT%{prefix}/pandora_server/conf/
cp -aRf conf/pandora_server.conf.new $RPM_BUILD_ROOT/etc/pandora/
@ -194,7 +193,7 @@ rm -Rf /etc/pandora/pandora_server.conf*
rm -Rf /etc/tentacle/tentacle_server.conf*
rm -Rf /var/spool/pandora
rm -Rf /etc/init.d/pandora_server /etc/init.d/tentacle_serverd
rm -Rf /usr/bin/pandora_exec /usr/bin/pandora_server /usr/bin/tentacle_server /usr/bin/pandorawmic
rm -Rf /usr/bin/pandora_exec /usr/bin/pandora_server /usr/bin/tentacle_server
rm -Rf /usr/bin/pandora_ha
rm -Rf /etc/cron.hourly/pandora_db
rm -Rf /etc/logrotate.d/pandora_server
@ -212,7 +211,6 @@ rm -Rf /usr/share/man/man1/tentacle_server.1.gz
/usr/bin/pandora_server
/usr/bin/tentacle_server
/usr/bin/pandora_ha
/usr/bin/pandorawmic
%defattr(755,pandora,root,755)
/usr/lib/perl5/PandoraFMS/

2
pandora_server/pandora_server_installer
View File

@ -263,7 +263,6 @@ install () {
ln -s /usr/local/bin/pandora_exec $DESTDIR$PREFIX/bin
ln -s /usr/local/bin/tentacle_server $DESTDIR$PREFIX/bin
ln -s /usr/local/bin/tentacle_client $DESTDIR$PREFIX/bin
ln -s /usr/local/bin/pandorawmic $DESTDIR$PREFIX/bin
fi
fi
fi
@ -535,7 +534,6 @@ uninstall () {
rm -f $DESTDIR$PANDORA_SERVER 2> /dev/null
rm -f $DESTDIR$PREFIX/bin/pandora_server 2> /dev/null
rm -f $DESTDIR$PREFIX/bin/pandora_exec 2> /dev/null
rm -f $DESTDIR$PREFIX/bin/pandorawmic 2> /dev/null
# Do not remove tentacle files if agent is still installed...
[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f $DESTDIR$PREFIX/bin/tentacle_server 2> /dev/null
[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f $DESTDIR$PREFIX/bin/tentacle_client 2> /dev/null

1
pandora_server/pandora_server_upgrade
View File

@ -33,7 +33,6 @@ install () {
echo "Rebuilding links /usr/local/bin -> /usr/bin"
ln -s /usr/local/bin/pandora_server /usr/bin/pandora_server 2> /dev/null
ln -s /usr/local/bin/pandora_exec /usr/bin/pandora_exec 2> /dev/null
ln -s /usr/local/bin/pandorawmic /usr/bin/pandorawmic 2> /dev/null
if [ -d /etc/logrotate.d ]; then
echo "Creating logrotate.d entry for Pandora FMS log management"