X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fbase_installation%2Fmanifests%2Fpuppet.pp;h=05fe9a1f2f45fd4b264008e6da91981ff705839e;hb=c8511b2019b44360887d33a9626ec14c81736aee;hp=c64ddfdccf141095002805c97498f2cd1dc248b2;hpb=cdbbfd477be98497ca89233ca8b8b1c1e27e184b;p=perso%2FImmae%2FProjets%2FPuppet.git

diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp
index c64ddfd..05fe9a1 100644
--- a/modules/base_installation/manifests/puppet.pp
+++ b/modules/base_installation/manifests/puppet.pp
@@ -27,6 +27,12 @@ class base_installation::puppet (
   }
   ###
 
+  file { '/usr/local/sbin/i_puppet_lock':
+    mode   => "0755",
+    ensure => present,
+    source => "puppet:///modules/base_installation/scripts/puppet_lock"
+  }
+
   file { '/usr/local/sbin/i_puppet_reset_and_apply':
     mode   => "0755",
     ensure => present,
@@ -76,6 +82,7 @@ class base_installation::puppet (
     }
 
     $xmpp = lookup("base_installation::notify_xmpp", { "default_value" => {} })
+    $slack = lookup("base_installation::notify_slack", { "default_value" => {} })
 
     file { "$base_installation::puppet_conf_path/puppet.conf":
       content => template("base_installation/puppet/puppet.conf.erb"),
@@ -89,6 +96,18 @@ class base_installation::puppet (
       }
     }
 
+    unless empty($slack) {
+      file { "$base_installation::puppet_conf_path/slack.yaml":
+        content => template("base_installation/puppet/slack.yaml.erb"),
+        require => File[$base_installation::puppet_conf_path],
+      }
+    }
+
+    if file("$base_installation::puppet_conf_path/host_ldap.info", "/dev/null") != "" and
+      empty($facts["ldapvar"]) {
+        fail("LDAP was activated but facts are not available")
+    }
+
     $ips = lookup("ips", { 'default_value' => undef })
     file { "$base_installation::puppet_conf_path/host_ldap.info":
       content => template("base_installation/puppet/host_ldap.info.erb"),