diff options
| author | Alexander Bokovoy <ab@samba.org> | 2014-03-25 12:53:04 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-05-20 11:47:41 +0200 |
| commit | 2c616189a9f037d26dbdceb34b950002888bb23f (patch) | |
| tree | 6ea6c1e9b08cff353ff89e5456312ebd5645b947 /packaging | |
| parent | 79825000597b9772bae4f9e52cd3a3fc5ccb0257 (diff) | |
| download | samba-2c616189a9f037d26dbdceb34b950002888bb23f.tar.gz | |
add systemd integration
Add --with-systemd / --without-systemd options to check whether
libsystemd-daemon library is available and use it to report service
startup status to systemd for smbd/winbindd/nmbd and AD DC.
The problem it solves is correct reporting of the Samba services
at the point when they are ready to serve clients, important for
high availability software integration.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10517
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 54b5d9a7384ae27b2a26586ff909128427c05abe)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/systemd/nmb.service | 3 | ||||
| -rw-r--r-- | packaging/systemd/samba.service | 3 | ||||
| -rw-r--r-- | packaging/systemd/smb.service | 3 | ||||
| -rw-r--r-- | packaging/systemd/winbind.service | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service index e5e81a1fc7..3d71a7dacd 100644 --- a/packaging/systemd/nmb.service +++ b/packaging/systemd/nmb.service @@ -3,7 +3,8 @@ Description=Samba NMB Daemon After=syslog.target network.target [Service] -Type=forking +Type=notify +NotifyAccess=all PIDFile=/run/nmbd.pid EnvironmentFile=-/etc/sysconfig/samba ExecStart=/usr/sbin/nmbd $NMBDOPTIONS diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service index e2878d1a5e..824f89c203 100644 --- a/packaging/systemd/samba.service +++ b/packaging/systemd/samba.service @@ -3,7 +3,8 @@ Description=Samba AD Daemon After=syslog.target network.target [Service] -Type=forking +Type=notify +NotifyAccess=all PIDFile=/run/samba.pid LimitNOFILE=16384 EnvironmentFile=-/etc/sysconfig/samba diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service index d0d945aae7..9810891e8c 100644 --- a/packaging/systemd/smb.service +++ b/packaging/systemd/smb.service @@ -3,7 +3,8 @@ Description=Samba SMB Daemon After=syslog.target network.target nmb.service winbind.service [Service] -Type=forking +Type=notify +NotifyAccess=all PIDFile=/run/smbd.pid LimitNOFILE=16384 EnvironmentFile=-/etc/sysconfig/samba diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service index eff266f0d8..f711a17f04 100644 --- a/packaging/systemd/winbind.service +++ b/packaging/systemd/winbind.service @@ -3,7 +3,8 @@ Description=Samba Winbind Daemon After=syslog.target network.target nmb.service [Service] -Type=forking +Type=notify +NotifyAccess=all PIDFile=/run/winbindd.pid EnvironmentFile=-/etc/sysconfig/samba ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS" |