RPMs: Make sure to ship icingacli locally for setup/config

refs #6401
This commit is contained in:
Michael Friedrich 2014-11-14 00:27:26 +01:00
parent 1f680323e9
commit 9a7838987b
1 changed files with 5 additions and 4 deletions

View File

@ -31,7 +31,7 @@
%define prefixdir %{_datadir}/%{name} %define prefixdir %{_datadir}/%{name}
%define usermodparam -a -G %define usermodparam -a -G
%define logdir %{_localstatedir}/log/%{name} %define logdir %{_localstatedir}/log/%{name}
%define docdir %{sharedir}/log %define docdir %{sharedir}/doc
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%define phpname php5 %define phpname php5
@ -179,7 +179,8 @@ install -D -m0644 packages/rpm/etc/httpd/conf.d/icingaweb.conf %{buildroot}/%{ap
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/modules/monitoring %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/modules/monitoring
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/enabledModules %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}/enabledModules
%{__cp} -r application doc library modules public %{buildroot}/%{sharedir}/ # make sure to install local icingacli for setup wizard token generation & webserver config
%{__cp} -r application doc library modules public bin %{buildroot}/%{sharedir}/
## config ## config
# authentication is db only # authentication is db only
@ -194,8 +195,8 @@ install -D -m0644 packages/rpm/etc/%{name}/modules/monitoring/instances.ini %{bu
ln -s %{sharedir}/modules/monitoring %{buildroot}/%{_sysconfdir}/%{name}/enabledModules/monitoring ln -s %{sharedir}/modules/monitoring %{buildroot}/%{_sysconfdir}/%{name}/enabledModules/monitoring
## config ## config
# install icingacli # symlink icingacli
install -D -m0755 packages/rpm/usr/bin/icingacli %{buildroot}/usr/bin/icingacli ln -sf %{buildroot}/%{sharedir}/bin/icingacli %{buildroot}/usr/bin/icingacli
%pre %pre
# Add apacheuser in the icingacmd group # Add apacheuser in the icingacmd group