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

Merge branch 'feature/vagrant-icinga-box-9453'

Browse Source 
resolves #9453
This commit is contained in:
Eric Lippmann 2015-07-31 16:26:13 +02:00
commit 226dcd90d5
5 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.puppet/modules/openldap/manifests/init.pp
View File

@ -24,14 +24,11 @@ class openldap {
} }
if versioncmp($::operatingsystemmajrelease, '7') >= 0 { if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
['core', 'cosine', 'inetorgperson', 'nis', 'misc', 'openldap'].each |String $schema| { openldap::schema{ 'core': }
exec { "slapd-schema-${schema}": -> openldap::schema{ 'cosine': }
command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif", -> openldap::schema{ 'inetorgperson': }
group => 'root', -> openldap::schema{ 'nis': }
require => Package['openldap-servers'], -> openldap::schema{ 'misc': }
unless => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"", -> openldap::schema{ 'openldap': }
user => 'root',
}
}
} }
} }

24
.puppet/modules/openldap/manifests/schema.pp Normal file
View File

@ -0,0 +1,24 @@
# define: openldap::schema
#
# Install a schema.
#
# Parameters:
#
# Actions:
#
# Requires:
#
# Sample Usage:
#
define openldap::schema {
include openldap
exec { "openldap-schema-${name}":
command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${name}.ldif",
group => 'root',
require => Service['slapd'],
unless => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${name}.ldif -print -quit)\"",
user => 'root',
}
}

4
.puppet/modules/php/manifests/init.pp
View File

@ -24,7 +24,5 @@ class php {
require => Package['apache'], require => Package['apache'],
} }
php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]: php::phpd { ['error_reporting', 'timezone', 'xdebug_settings' ]: }
require => Package['php'],
}
} }

1
.puppet/modules/php/manifests/phpd.pp
View File

@ -17,5 +17,6 @@ define php::phpd {
file { "/etc/php.d/$name.ini": file { "/etc/php.d/$name.ini":
content => template("php/$name.ini.erb"), content => template("php/$name.ini.erb"),
notify => Service['apache'], notify => Service['apache'],
require => Package['php'],
} }
} }

4
Vagrantfile vendored
View File

@ -22,9 +22,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh" config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh"
config.vm.provider :virtualbox do |v, override| config.vm.provider :virtualbox do |v, override|
override.vm.box = "puppetlabs/centos-7.0-64-puppet" override.vm.box = "centos-71-x64-vbox"
override.vm.box_url = "http://boxes.icinga.org/centos-71-x64-vbox.box"
v.customize ["modifyvm", :id, "--memory", "1024"] v.customize ["modifyvm", :id, "--memory", "1024"]
v.customize ["modifyvm", :id, "--cpus", "2"]
end end
config.vm.provider :parallels do |p, override| config.vm.provider :parallels do |p, override|