From 398cbe88201205f0456eb1f0c9bbfd387405bce1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 27 Oct 2011 17:11:19 +0200 Subject: [PATCH 1/3] Add systemd service files. Autobuild-User: Andreas Schneider Autobuild-Date: Fri Oct 28 11:34:27 CEST 2011 on sn-devel-104 (cherry picked from commit 7d7ba3ba40895090d9bd791f210f89c5d5d2582e) --- packaging/systemd/nmb.service | 12 ++++++++++++ packaging/systemd/samba.sysconfig | 6 ++++++ packaging/systemd/smb.service | 13 +++++++++++++ packaging/systemd/winbind.service | 13 +++++++++++++ 4 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 packaging/systemd/nmb.service create mode 100644 packaging/systemd/samba.sysconfig create mode 100644 packaging/systemd/smb.service create mode 100644 packaging/systemd/winbind.service diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service new file mode 100644 index 0000000..a2ecd22 --- /dev/null +++ b/packaging/systemd/nmb.service @@ -0,0 +1,12 @@ +[Unit] +Description=Samba NMB Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/nmbd.pid +EnvironmentFile=-/etc/sysconfig/samba +ExecStart=/usr/sbin/nmbd $NMBDOPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/packaging/systemd/samba.sysconfig b/packaging/systemd/samba.sysconfig new file mode 100644 index 0000000..944b72f --- /dev/null +++ b/packaging/systemd/samba.sysconfig @@ -0,0 +1,6 @@ +# Options to smbd +SMBDOPTIONS="-D" +# Options to nmbd +NMBDOPTIONS="-D" +# Options for winbindd +WINBINDOPTIONS="" diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service new file mode 100644 index 0000000..7d765db --- /dev/null +++ b/packaging/systemd/smb.service @@ -0,0 +1,13 @@ +[Unit] +Description=Samba SMB Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/smbd.pid +LimitNOFILE=16384 +EnvironmentFile=-/etc/sysconfig/samba +ExecStart=/usr/sbin/smbd $SMBDOPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service new file mode 100644 index 0000000..91f9112 --- /dev/null +++ b/packaging/systemd/winbind.service @@ -0,0 +1,13 @@ +[Unit] +Description=Samba Winbind Daemon +Requires=smb.service nmb.service +After=syslog.target network.target smb.service nmb.service + +[Service] +Type=forking +PIDFile=/run/winbindd.pid +EnvironmentFile=-/etc/sysconfig/samba +ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS" + +[Install] +WantedBy=multi-user.target -- 1.7.7 From 5dfea46a346e4961c656f1de1d1b47ed06bb4dfe Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 3 Nov 2011 12:54:00 +0100 Subject: [PATCH 2/3] pkg: add comments to the systemd sysconfig file Autobuild-User: David Disseldorp Autobuild-Date: Thu Nov 3 15:11:27 CET 2011 on sn-devel-104 (cherry picked from commit 0f61eb5e299abfa0ffe5e0dd92a40e582021a5b2) --- packaging/systemd/samba.sysconfig | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packaging/systemd/samba.sysconfig b/packaging/systemd/samba.sysconfig index 944b72f..5950b13 100644 --- a/packaging/systemd/samba.sysconfig +++ b/packaging/systemd/samba.sysconfig @@ -1,6 +1,14 @@ -# Options to smbd -SMBDOPTIONS="-D" -# Options to nmbd -NMBDOPTIONS="-D" -# Options for winbindd +## Path: Network/Samba +## Description: Samba process options +## Type: string +## Default: "" +## ServiceRestart: smb +SMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: nmb +NMBDOPTIONS="" +## Type: string +## Default: "" +## ServiceRestart: winbind WINBINDOPTIONS="" -- 1.7.7 From 64a4a0070b9215c579f25232cbaec24ea130d426 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 2 Nov 2011 16:53:27 +0100 Subject: [PATCH 3/3] systemd: Fix dependencies. Autobuild-User: Andreas Schneider Autobuild-Date: Fri Nov 4 12:36:04 CET 2011 on sn-devel-104 (cherry picked from commit 4f3e86f62398218c454b979aaad75c7d7d3d8546) --- packaging/systemd/smb.service | 2 +- packaging/systemd/winbind.service | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service index 7d765db..70d9842 100644 --- a/packaging/systemd/smb.service +++ b/packaging/systemd/smb.service @@ -1,6 +1,6 @@ [Unit] Description=Samba SMB Daemon -After=syslog.target network.target +After=syslog.target network.target nmb.service winbind.service [Service] Type=forking diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service index 91f9112..9ce1b52 100644 --- a/packaging/systemd/winbind.service +++ b/packaging/systemd/winbind.service @@ -1,7 +1,6 @@ [Unit] Description=Samba Winbind Daemon -Requires=smb.service nmb.service -After=syslog.target network.target smb.service nmb.service +After=syslog.target network.target nmb.service [Service] Type=forking -- 1.7.7