Add workarounds for systemd socket activation

Fixes #14
bodgit · Oct 6, 2018 · d781f8b · d781f8b
1 parent 0a67af7
commit d781f8b
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 3 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -94,4 +94,39 @@
       * => $attributes,
     }
   }
+
+  if $::service_provider == 'systemd' {
+    ensure_resource('exec', 'systemctl daemon-reload', {
+      refreshonly => true,
+      path        => $::path,
+    })
+
+    # EL7 ships some slightly broken systemd units for socket activation
+    ['autofs', 'pac', 'pam', 'ssh', 'sudo'].each |$service| {
+      file { "/etc/systemd/system/sssd-${service}.service.d":
+        ensure       => directory,
+        owner        => 0,
+        group        => 0,
+        mode         => '0644',
+        force        => true,
+        purge        => true,
+        recurse      => true,
+        recurselimit => 1,
+      }
+
+      file { "/etc/systemd/system/sssd-${service}.service.d/override.conf":
+        ensure  => file,
+        owner   => 0,
+        group   => 0,
+        mode    => '0644',
+        content => @(EOS/L),
+          [Service]
+          ExecStartPre=
+          User=
+          Group=
+          | EOS
+        notify  => Exec['systemctl daemon-reload'],
+      }
+    }
+  }
 }
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -339,7 +339,8 @@
     if has_key($::sssd::socket_services, $service) {
       Array($::sssd::socket_services[$service], true).each |String $x| {
         service { $x:
-          enable => true,
+          enable  => true,
+          require => Exec['systemctl daemon-reload'],
         }
       }
     }
@@ -350,8 +351,9 @@
       if has_key($::sssd::socket_services, $service) {
         Array($::sssd::socket_services[$service], true).each |String $x| {
           service { $x:
-            ensure => stopped,
-            enable => false,
+            ensure  => stopped,
+            enable  => false,
+            require => Exec['systemctl daemon-reload'],
           }
         }
       }

diff --git a/spec/classes/sssd_spec.rb b/spec/classes/sssd_spec.rb
@@ -93,6 +93,23 @@
       it { is_expected.to contain_sssd_conf('sssd/reconnection_retries').with_value('3') }
       it { is_expected.to contain_sssd_conf('sssd/try_inotify').with_value('true') }
       it { is_expected.to contain_sssd_conf('sssd/user').with_value('sssd') }
+
+      case facts[:operatingsystemmajrelease]
+      when '6'
+        # noop
+      else
+        it { is_expected.to contain_exec('systemctl daemon-reload') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-autofs.service.d') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-autofs.service.d/override.conf') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-pac.service.d') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-pac.service.d/override.conf') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-pam.service.d') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-pam.service.d/override.conf') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-ssh.service.d') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-ssh.service.d/override.conf') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-sudo.service.d') }
+        it { is_expected.to contain_file('/etc/systemd/system/sssd-sudo.service.d/override.conf') }
+      end
     end
   end
 end