hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed RPM dependencies

Browse Source 
The RPMs depended on Perl due to the Nagios scripts that are installed.
This dependency is not needed and should be managed by some other means.
This commit is contained in:
Markus Makela
2016-03-21 10:42:12 +02:00
parent 4ee1f304ca
commit 5f1b46d298
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
etc/postinst.in
View File

@ -65,4 +65,11 @@ then
cp -n @MAXSCALE_CONFDIR@/maxscale.cnf.template @MAXSCALE_CONFDIR@/maxscale.cnf cp -n @MAXSCALE_CONFDIR@/maxscale.cnf.template @MAXSCALE_CONFDIR@/maxscale.cnf
fi fi
# This will allow us to install the Perl scripts as executable files
# without adding the Perl dependencies
for i in $(find @MAXSCALE_SHAREDIR@/plugins/nagios -name '*.pl')
do
chmod ug+x $i
done
/sbin/ldconfig /sbin/ldconfig

6
plugins/CMakeLists.txt
View File

@ -1,5 +1,5 @@
install(PROGRAMS nagios/check_maxscale_monitors.pl DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios) install(FILES nagios/check_maxscale_monitors.pl DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios)
install(PROGRAMS nagios/check_maxscale_resources.pl DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios) install(FILES nagios/check_maxscale_resources.pl DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios)
install(PROGRAMS nagios/check_maxscale_threads.pl DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios) install(FILES nagios/check_maxscale_threads.pl DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios)
install(FILES nagios/maxscale_commands.cfg DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios) install(FILES nagios/maxscale_commands.cfg DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios)
install(FILES nagios/server1.cfg DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios) install(FILES nagios/server1.cfg DESTINATION ${MAXSCALE_SHAREDIR}/plugins/nagios)