From 58b509b8eec0efde5016e2441777aaf88195b917 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 6 Jun 2014 10:48:22 +0200
Subject: [PATCH] Puppet: Use /vagrant directory to deliver web files

Apache uses now /vagrant/public instead of /var/www/html
symlinks.

fixes #6421
---
 .../files/etc/httpd/conf.d/icingaweb.conf     |  4 +-
 .vagrant-puppet/manifests/default.pp          | 47 -------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf
index 462689ce9..0b45bea1f 100644
--- a/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf
+++ b/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf
@@ -1,4 +1,6 @@
-<Directory "/var/www/html/icingaweb">
+Alias /icingaweb    /vagrant/public
+
+<Directory "/vagrant/public/">
     Options FollowSymLinks
     AllowOverride None
     Order allow,deny
diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
index 040e5574b..dcfbad7a3 100644
--- a/.vagrant-puppet/manifests/default.pp
+++ b/.vagrant-puppet/manifests/default.pp
@@ -716,54 +716,7 @@ exec { 'populate-icinga_web-mysql-db':
   require => [ Exec['create-mysql-icinga_web-db'], Cmmi['icinga-web'] ]
 }
 
-#
-# Development environment (Feature #5554)
-#
 file { '/var/www/html/icingaweb':
-  ensure    => 'directory',
-  owner     => 'apache',
-  group     => 'apache'
-}
-
-file { '/var/www/html/icingaweb/css':
-  ensure    => 'link',
-  target    => '/vagrant/public/css',
-  owner     => 'apache',
-  group     => 'apache',
-}
-
-file { '/var/www/html/icingaweb/svg':
-  ensure    => 'link',
-  target    => '/vagrant/public/svg',
-  owner     => 'apache',
-  group     => 'apache',
-}
-
-file { '/var/www/html/icingaweb/img':
-  ensure    => 'link',
-  target    => '/vagrant/public/img',
-  owner     => 'apache',
-  group     => 'apache',
-}
-
-file { '/var/www/html/icingaweb/js':
-  ensure    => 'link',
-  target    => '/vagrant/public/js',
-  owner     => 'apache',
-  group     => 'apache',
-}
-
-file { '/var/www/html/icingaweb/index.php':
-  source    => 'puppet:////vagrant/.vagrant-puppet/files/var/www/html/icingaweb/index.php',
-  owner     => 'apache',
-  group     => 'apache',
-}
-
-file { '/var/www/html/icingaweb/js.php':
-  ensure => absent,
-}
-
-file { '/var/www/html/icingaweb/css.php':
   ensure => absent,
 }