[SCM] Samba Shared Repository - branch v3-6-test updated
Karolin Seeger
kseeger at samba.org
Wed Nov 9 11:58:04 MST 2011
The branch, v3-6-test has been updated
via 81823a0 systemd: Fix dependencies.
via a29a1be pkg: add comments to the systemd sysconfig file
via 7c2ec92 Add systemd service files.
from d0272d6 s3:libsmb: the workgroup in the non-extended-security negprot is not aligned (#8573)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 81823a0e9d6cadd21e14c9f9ce16cc7ebf849e90
Author: Andreas Schneider <asn at samba.org>
Date: Wed Nov 2 16:53:27 2011 +0100
systemd: Fix dependencies.
Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date: Fri Nov 4 12:36:04 CET 2011 on sn-devel-104
(cherry picked from commit 4f3e86f62398218c454b979aaad75c7d7d3d8546)
The last 3 patches address bug #8575 (Add systemd files to 3.6).
commit a29a1be90608541c1f9f0142bb5b05965a2c4a34
Author: David Disseldorp <ddiss at suse.de>
Date: Thu Nov 3 12:54:00 2011 +0100
pkg: add comments to the systemd sysconfig file
Autobuild-User: David Disseldorp <ddiss at samba.org>
Autobuild-Date: Thu Nov 3 15:11:27 CET 2011 on sn-devel-104
(cherry picked from commit 0f61eb5e299abfa0ffe5e0dd92a40e582021a5b2)
commit 7c2ec923a1b904ceec7d5c18abb58d498ae201f4
Author: Andreas Schneider <asn at samba.org>
Date: Thu Oct 27 17:11:19 2011 +0200
Add systemd service files.
Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date: Fri Oct 28 11:34:27 CEST 2011 on sn-devel-104
(cherry picked from commit 7d7ba3ba40895090d9bd791f210f89c5d5d2582e)
-----------------------------------------------------------------------
Summary of changes:
packaging/systemd/nmb.service | 12 ++++++++++++
packaging/systemd/samba.sysconfig | 14 ++++++++++++++
packaging/systemd/smb.service | 13 +++++++++++++
packaging/systemd/winbind.service | 12 ++++++++++++
4 files changed, 51 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
Changeset truncated at 500 lines:
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..5950b13
--- /dev/null
+++ b/packaging/systemd/samba.sysconfig
@@ -0,0 +1,14 @@
+## 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=""
diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
new file mode 100644
index 0000000..70d9842
--- /dev/null
+++ b/packaging/systemd/smb.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Samba SMB Daemon
+After=syslog.target network.target nmb.service winbind.service
+
+[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..9ce1b52
--- /dev/null
+++ b/packaging/systemd/winbind.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba Winbind Daemon
+After=syslog.target network.target nmb.service
+
+[Service]
+Type=forking
+PIDFile=/run/winbindd.pid
+EnvironmentFile=-/etc/sysconfig/samba
+ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
+
+[Install]
+WantedBy=multi-user.target
--
Samba Shared Repository
More information about the samba-cvs
mailing list