Vagrant box configure icingaweb source

refs #4926
This commit is contained in:
Marius Hein 2013-10-22 11:39:06 +02:00
parent c4efe02f8f
commit 8b419e15c4
6 changed files with 960 additions and 989 deletions

View File

@ -1,4 +1,4 @@
<Directory "/var/www/html/icinga2-web">
<Directory "/var/www/html/icingaweb">
Options -Indexes
AllowOverride All

View File

@ -329,14 +329,22 @@ cmmi { 'icinga2':
make_timeout => 900
}
file { 'icinga2-web-public':
configure { 'icingaweb':
path => '/vagrant',
flags => '--prefix=/vagrant \
--with-icinga-commandpipe="/usr/local/icinga-mysql/var/rw/icinga.cmd" \
--with-statusdat-file="/usr/local/icinga-mysql/var/status.dat" \
--with-httpd-config-path="/etc/httpd/conf.d"'
}
file { 'icingaweb-public':
ensure => '/vagrant/public',
path => '/var/www/html/icinga2-web',
path => '/var/www/html/icingaweb',
require => Class['apache']
}
file { '/etc/httpd/conf.d/icinga2-web.conf':
source => 'puppet:////vagrant/.vagrant-puppet/files/etc/httpd/conf.d/icinga2-web.conf',
file { '/etc/httpd/conf.d/icingaweb.conf':
source => 'puppet:////vagrant/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf',
require => Package['apache'],
notify => Service['apache']
}

View File

@ -0,0 +1,17 @@
# Define: configure
#
# Run a gnu configure to prepare software for environment
#
# Parameters:
# [*flags*] - configure options.
# [*path*] - Target and working dir
#
define configure(
$path,
$flags
) {
exec { "configure-${name}":
cwd => $path,
command => "sh ./configure ${flags}"
}
}

1886
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -31,8 +31,8 @@ AC_CHECK_PHP_MODULE([sockets json])
#
AC_ARG_WITH([icingaweb_config_path],
AS_HELP_STRING([--with-icingaweb-config-path=PATH], [Configuration path for icinga web (default $prefix/config)]),
icingaweb_config_path="'$withval'",
icingaweb_config_path="'$prefix/config/'"
icingaweb_config_path=$withval,
icingaweb_config_path=$prefix/config
)
#

View File

@ -14,4 +14,4 @@ require_once dirname(__FILE__). '/../library/Icinga/Application/Web.php';
use Icinga\Application\Web;
Web::start(@icingaweb_config_path@)->dispatch();
Web::start('@icingaweb_config_path@')->dispatch();