Tweak more sssd/FreeIPA/Debian stuff

diff --git a/personal_infra/puppet/site/01-ipa.pp b/personal_infra/puppet/site/01-ipa.pp
index 3e76d28ff781e1e1026bd269c39314e252465313..2f4aab4906fd715b06d8e7a408a3b40ed3d40bfd 100644 (file)
--- a/personal_infra/puppet/site/01-ipa.pp
+++ b/personal_infra/puppet/site/01-ipa.pp
@@ -15,21 +15,6 @@ if $facts['os']['family'] == 'Debian' and $facts['os']['release']['major'] == "1
   }
 }
 
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026008
-#
-# systems which were originally Debian 11 seem to not have this problem,
-# so I'll add hacks to new systems in their manifest :(
-if $facts['os']['family'] == 'Debian' and $facts['os']['release']['major'] == "12" {
-  Package[$ipa_client_package]
-  ->
-  service {['sssd-ssh.socket', 'sssd-nss.socket', 'sssd-sudo.socket', 'sssd-pam-priv.socket']:
-    ensure => stopped,
-    enable => mask,
-  }
-  ~>
-  Exec['/usr/bin/systemctl reset-failed']
-}
-
 package {$ipa_client_package:}
 package {'sudo':}
 

diff --git a/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp b/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp
index 0f453dd1f787e3e5e9034f4dc7d19079aea5c161..f7a1a79c74005dc295dbc94f590653055f6948ef 100644 (file)
--- a/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp
@@ -3,4 +3,14 @@ node 'hideo.mad.int.pdp7.net' {
   class {'incus':}
   class {'steam':}
   package {['zfs-dkms', 'sanoid']:}
+
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026008
+  Package[$ipa_client_package]
+  ->
+  service {['sssd-pam-priv.socket", "sssd-sudo.socket", "sssd-nss.socket']:
+    ensure => stopped,
+    enable => mask,
+  }
+  ~>
+  Exec['/usr/bin/systemctl reset-failed']
 }