Merge branch 'dev'

[perso/Immae/Projets/Puppet.git] / modules / base_installation / manifests / services.pp

diff --git a/modules/base_installation/manifests/services.pp b/modules/base_installation/manifests/services.pp
index 57fbfc35b22edcc39a4d7a1e274b1b056a214a95..f24b55f8cf79b875062f29d6b078c59bb322cb86 100644 (file)
--- a/modules/base_installation/manifests/services.pp
+++ b/modules/base_installation/manifests/services.pp
@@ -1,19 +1,21 @@
 class base_installation::services inherits base_installation {
 
-  if (empty($facts["in_chroot"])) {
+  if $facts["in_chroot"] == undef or empty($facts["in_chroot"]) {
     $ensure = "running"
   } else {
     $ensure = undef
   }
 
   service { "sshd":
-    ensure => $ensure,
-    enable => true,
+    ensure  => $ensure,
+    enable  => true,
+    require => Package["openssh"],
   }
 
   service { "atd":
-    ensure => $ensure,
-    enable => true
+    ensure  => $ensure,
+    enable  => true,
+    require => Package["at"],
   }
 
   service { "systemd-networkd":
@@ -32,8 +34,9 @@ class base_installation::services inherits base_installation {
   }
 
   service { "cronie":
-    ensure => $ensure,
-    enable => true,
+    ensure  => $ensure,
+    enable  => true,
+    require => Package["cronie"],
   }
 
   file { '/etc/systemd/system/getty@tty1.service.d/':