diff --git a/.puppet/modules/openldap/manifests/init.pp b/.puppet/modules/openldap/manifests/init.pp index 62b9d1e34..11cc2b42a 100644 --- a/.puppet/modules/openldap/manifests/init.pp +++ b/.puppet/modules/openldap/manifests/init.pp @@ -28,7 +28,7 @@ class openldap { exec { "slapd-schema-${schema}": command => "ldapadd -Y EXTERNAL -H ldapi:// -f /etc/openldap/schema/${schema}.ldif", 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)\"", user => 'root', } diff --git a/doc/vagrant.md b/doc/vagrant.md index 148e6aeb8..b1b98b436 100644 --- a/doc/vagrant.md +++ b/doc/vagrant.md @@ -24,8 +24,6 @@ vagrant up > you'll download a plain CentOS base box and Vagrant will automatically > 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). ## Log into Icinga Web 2