[icinga-checkins] icinga.org: icingaweb2/feature/redesign-7144: RPMs: Make sure to ship icingacli locally for setup/config

git at icinga.org git at icinga.org
Fri Nov 14 21:46:41 CET 2014


Module: icingaweb2
Branch: feature/redesign-7144
Commit: 9a7838987bc998edbc3f38d41fb7a1082a7fbbcb
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=9a7838987bc998edbc3f38d41fb7a1082a7fbbcb

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Fri Nov 14 00:27:26 2014 +0100

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

refs #6401

---

 icingaweb2.spec |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/icingaweb2.spec b/icingaweb2.spec
index db0929f..9d9e113 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -31,7 +31,7 @@
 %define prefixdir %{_datadir}/%{name}
 %define usermodparam -a -G
 %define logdir %{_localstatedir}/log/%{name}
-%define docdir %{sharedir}/log
+%define docdir %{sharedir}/doc
 
 %if "%{_vendor}" == "suse"
 %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}/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
 # 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
 ## config
 
-# install icingacli
-install -D -m0755 packages/rpm/usr/bin/icingacli %{buildroot}/usr/bin/icingacli
+# symlink icingacli
+ln -sf %{buildroot}/%{sharedir}/bin/icingacli %{buildroot}/usr/bin/icingacli
 
 %pre
 # Add apacheuser in the icingacmd group



More information about the icinga-checkins mailing list