xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move edex service mngr from awips2-edex RPM to awips2(version) RPM

Browse source
This commit is contained in:
mjames-upc 2018-03-16 09:16:16 -06:00
parent 4a714699ed
commit e7bac3b316
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpms/awips2.edex/Installer.edex/component.spec
View file

@ -57,8 +57,7 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
# Unidata programs 'edex' and 'qpidNotify.py' /bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/qpidNotify.py ${RPM_BUILD_ROOT}/awips2/edex/bin/
/bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/* ${RPM_BUILD_ROOT}/awips2/edex/bin/
DEPLOY_SCRIPT="deploy.edex.awips2/deploy/deploy-esb-configuration.xml" DEPLOY_SCRIPT="deploy.edex.awips2/deploy/deploy-esb-configuration.xml"
# use deploy-install to deploy edex-configuration. # use deploy-install to deploy edex-configuration.
@ -159,6 +158,5 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(755,awips,fxalpha,755) %defattr(755,awips,fxalpha,755)
%dir /awips2/edex/bin %dir /awips2/edex/bin
/awips2/edex/bin/*.sh /awips2/edex/bin/*.sh
%attr(755,awips,fxalpha) /awips2/edex/bin/edex
%attr(755,awips,fxalpha) /awips2/edex/bin/qpidNotify.py %attr(755,awips,fxalpha) /awips2/edex/bin/qpidNotify.py
%attr(744,root,root) /etc/init.d/* %attr(744,root,root) /etc/init.d/*

7
rpms/awips2.upc/Installer.awips/component.spec
View file

@ -42,11 +42,17 @@ fi
%build %build
%install %install
mkdir -p %{_build_root}/usr/bin
if [ $? -ne 0 ]; then
exit 1
fi
mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
/bin/cp -r %{_baseline_workspace}/rpms/awips2.upc/Installer.awips/programs/edex ${RPM_BUILD_ROOT}/usr/bin/
/bin/cp %{_baseline_workspace}/rpms/awips2.upc/Installer.awips/scripts/profile.d/* ${RPM_BUILD_ROOT}/etc/profile.d /bin/cp %{_baseline_workspace}/rpms/awips2.upc/Installer.awips/scripts/profile.d/* ${RPM_BUILD_ROOT}/etc/profile.d
@ -60,5 +66,6 @@ fi
rm -rf ${RPM_BUILD_ROOT}/* rm -rf ${RPM_BUILD_ROOT}/*
%files %files
%attr(755,awips,fxalpha) /usr/bin/edex
%attr(755,root,root) /etc/profile.d/awips2.csh %attr(755,root,root) /etc/profile.d/awips2.csh
%attr(755,root,root) /etc/profile.d/awips2.sh %attr(755,root,root) /etc/profile.d/awips2.sh

4
rpms/awips2.edex/Installer.edex/programs/edex → rpms/awips2.upc/Installer.awips/programs/edex
View file

@ -363,10 +363,10 @@ edex_purge_reset() {
su - awips -c 'psql metadata -c "update purgejobs set failedcount = 0;"' >& /dev/null su - awips -c 'psql metadata -c "update purgejobs set failedcount = 0;"' >& /dev/null
} }
edex_qpid() { edex_qpid() {
su - awips -c "qpid-stat -q -S msgIn" qpid-stat -q -S msgIn
} }
edex_cleanup() { edex_cleanup() {
rm -rf /awips2/qpid/edexMessageStore/edex/ rm -rf /awips2/qpid/edexMessageStore/edex/
} }
edex_users(){ edex_users(){
if [ "${args[1]}" != '' ]; then if [ "${args[1]}" != '' ]; then