tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 17:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Puppet: Use /vagrant directory to deliver web files

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

fixes #6421
This commit is contained in:
Marius Hein 2014-06-06 10:48:22 +02:00
parent e01629fe0b
commit 58b509b8ee
2 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf
View File

@ -1,4 +1,6 @@
<Directory "/var/www/html/icingaweb"> Alias /icingaweb /vagrant/public
<Directory "/vagrant/public/">
Options FollowSymLinks Options FollowSymLinks
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny

47
.vagrant-puppet/manifests/default.pp
View File

@ -716,54 +716,7 @@ exec { 'populate-icinga_web-mysql-db':
require => [ Exec['create-mysql-icinga_web-db'], Cmmi['icinga-web'] ] require => [ Exec['create-mysql-icinga_web-db'], Cmmi['icinga-web'] ]
} }
#
# Development environment (Feature #5554)
#
file { '/var/www/html/icingaweb': 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, ensure => absent,
} }