From: Gunnar Beutner <gunnar@beutner.name>
Date: Thu, 10 Oct 2013 17:59:51 +0000 (+0200)
Subject: Use icinga2-classicui-config package for Vagrant.
X-Git-Tag: v0.0.3~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0c7f485ad91a0e402f10199f51142de42b68bd1;p=icinga2

Use icinga2-classicui-config package for Vagrant.
---

diff --git a/tools/vagrant-bootstrap.sh b/tools/vagrant-bootstrap.sh
index be8ea6480..3f6dddf0b 100755
--- a/tools/vagrant-bootstrap.sh
+++ b/tools/vagrant-bootstrap.sh
@@ -8,7 +8,7 @@ rpm --import http://packages.icinga.org/icinga.key
 wget http://packages.icinga.org/epel/6/snapshot/ICINGA-snapshot.repo -O /etc/yum.repos.d/ICINGA-snapshot.repo
 yum makecache
 yum install -y httpd
-yum install -y --nogpgcheck icinga2 icinga-gui
+yum install -y --nogpgcheck icinga2 icinga2-classicui-config icinga-gui
 chkconfig httpd on
 chkconfig icinga2 on
 
@@ -22,21 +22,10 @@ yum install -y /tmp/epel.rpm
 rm -f /tmp/epel.rpm
 yum install -y nagios-plugins-all
 
-# Remove once icinga2-classicui-config works
-ln -sf /var/cache/icinga2/status.dat /var/spool/icinga/status.dat
-ln -sf /var/cache/icinga2/objects.cache /var/spool/icinga/objects.cache
-ln -sf /var/run/icinga2/cmd/icinga2.cmd /var/icinga/cmd/icinga.cmd
-ln -sf /var/log/icinga2/compat/icinga.log /var/log/icinga/icinga.log
-rm -Rf /var/log/icinga/archives
-ln -s /var/log/icinga2/compat/archives /var/log/icinga/
-
 i2enfeature statusdat
 i2enfeature compat-log
 i2enfeature command
 
-# Remove once the plugin path is fixed
-sed -i 's/lib/lib64/' /etc/icinga2/conf.d/macros.conf
-
 # 4845
 sed -i 's/^SELINUX=.*/SELINUX=permissive/' /etc/sysconfig/selinux
 setenforce Permissive