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

Revert "Vagrant: slapd must be running, add provision hint to docs"

Browse Source 
This reverts commit f0fc8b8e901ab741071ca5c15cdae6f287bbff50.

I'll fix this by introducing dependencies for the schema import.

refs #9453
This commit is contained in:
Eric Lippmann 2015-07-31 15:56:49 +02:00
parent bba7cb1463
commit cc1b26be0c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ class openldap {
exec { "slapd-schema-${schema}": exec { "slapd-schema-${schema}":
command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif", command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif",
group => 'root', group => 'root',
require => [ Package['openldap-servers'], Service['slapd'] ], require => Package['openldap-servers'],
unless => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"", unless => "test -n \"$(find /etc/openldap/slapd.d/cn=config/cn=schema/ -name cn={*}${schema}.ldif -print -quit)\"",
user => 'root', user => 'root',
} }

2
doc/vagrant.md
View File

@ -24,8 +24,6 @@ vagrant up
> you'll download a plain CentOS base box and Vagrant will automatically > you'll download a plain CentOS base box and Vagrant will automatically
> provision the environment on the first go. > provision the environment on the first go.
If the LDAP schema import fails, rerun `vagrant provision`.
After you should be able to browse [localhost:8080/icingaweb2](http://localhost:8080/icingaweb2). After you should be able to browse [localhost:8080/icingaweb2](http://localhost:8080/icingaweb2).
## Log into Icinga Web 2 ## Log into Icinga Web 2