experimental systemd service files in contrib/systemd/ , suggested by eindl Harald

diff --git a/NEWS b/NEWS
index 7441ac856c1cb6039d7719ff0a1e24be09ca5c7f..d2cacd1d323770e79edb93414cc4f1a26ebae268 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,9 +3,11 @@ Changes in 2.2.2
 
 * NEW: afpd: New option "adminauthuser". Specifying eg "-adminauthuser root"
        whenever a normal user login fails, afpd tries to authenticate as
-       the specified adminauthuser. If this succeeds, a normal session is created
-       for the original connecting user. Said differently: if you know the
-       password of adminauthuser, you can authenticate as any other user.
+       the specified adminauthuser. If this succeeds, a normal session is
+       created for the original connecting user. Said differently: if you
+       know the password of adminauthuser, you can authenticate as any other
+       user.
+* NEW: experimental systemd service files in contrib/systemd/
 * UPD: afpd: Enhanced POSIX ACL mapping semantics, from Laura Mueller
 * UPD: afpd: Reset options every time a :DEFAULT: line is found in a
        AppleVolumes file
@@ -13,13 +15,14 @@ Changes in 2.2.2
        encoding
 * UPD: afpd: Don't set ATTRBIT_SHARED flag for directories
 * FIX: afpd: ACL access checking
-* FIX: afpd: Fix an error when duplicating files that lacked an AppleDouble file
-       which lead to a possible Finder crash
+* FIX: afpd: Fix an error when duplicating files that lacked an AppleDouble
+       file which lead to a possible Finder crash
 * FIX: afpd: Read-only filesystems lead to afpd processes running as root
 * FIX: afpd: Fix for filesystem without NFSv4 ACL support on Solaris
 * FIX: afpd: Fix catsearch bug, NetAFP Bug ID #12
 * FIX: afpd: Fix dircache bug, NetAFP Bug ID #13
-* FIX: dbd: Better checking for duplicated or bogus CNIDs from AppleDouble files
+* FIX: dbd: Better checking for duplicated or bogus CNIDs from AppleDouble
+       files
 * FIX: Fix compilation error when AppleTalk support is disabled
 * FIX: Portability fixes
 

diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644 (file)
index 0000000..eb624e9
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,3 @@
+# Makefile for contrib/systemd/
+
+EXTRA_DIST = README netatalk-afpd.service netatalk-cnid_metad.service

diff --git a/contrib/systemd/README b/contrib/systemd/README
new file mode 100644 (file)
index 0000000..8d52e8d
--- /dev/null
+++ b/contrib/systemd/README
@@ -0,0 +1,15 @@
+The service file of the current Netatalk is not appropriate because it use
+a shell-script "netatalk.sh".
+Two experimental files are for future netatalk.
+
+These files start daemons directly and do not read "netatalk.conf".
+Therefore, you need to edit files for setting options.
+
+ATALK_NAME:       set in afpd.conf instead
+AFPD_MAX_CLIENTS: set in netatalk-afpd.service by using -c
+AFPD_UAMLIST:     set in afpd.conf instead
+AFPD_GUEST:       set in afpd.conf instead
+CNID_CONFIG:      set in netatalk-cnid_metad.service by using -l and -f options
+
+There are no service files for atalkd, papd, timelord and a2boot
+because AppleTalk feature is due to be abolished in the future.

diff --git a/contrib/systemd/netatalk-afpd.service b/contrib/systemd/netatalk-afpd.service
new file mode 100644 (file)
index 0000000..2256343
--- /dev/null
+++ b/contrib/systemd/netatalk-afpd.service
@@ -0,0 +1,16 @@
+# This is experimental service file.
+# See contrib/systemd/README
+
+[Unit]
+Description=Netatalk AFP fileserver for Macintosh clients
+After=syslog.target network.target slpd.service avahi-daemon.service netatalk-cnid_metad.service
+
+[Service]
+Type=forking
+GuessMainPID=no
+ExecStart=/usr/sbin/afpd -c 20
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target

diff --git a/contrib/systemd/netatalk-cnid_metad.service b/contrib/systemd/netatalk-cnid_metad.service
new file mode 100644 (file)
index 0000000..e5ba2e6
--- /dev/null
+++ b/contrib/systemd/netatalk-cnid_metad.service
@@ -0,0 +1,16 @@
+# This is experimental service file.
+# See contrib/systemd/README
+
+[Unit]
+Description=Netatalk CNID database daemon for afpd
+After=syslog.target network.target
+
+[Service]
+Type=forking
+GuessMainPID=no
+ExecStart=/usr/sbin/cnid_metad -l log_note
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target

diff --git a/distrib/initscripts/rc.atalk.redhat-systemd.tmpl b/distrib/initscripts/rc.atalk.redhat-systemd.tmpl
index 58f197aed36f8a98949ab991df974e0105ca5e61..e0bd7fb1484d6855b27d9485a3c6fc641b504b7a 100644 (file)
--- a/distrib/initscripts/rc.atalk.redhat-systemd.tmpl
+++ b/distrib/initscripts/rc.atalk.redhat-systemd.tmpl
@@ -2,6 +2,9 @@
 
 # Netatalk :NETATALK_VERSION: startup script for systemd.
 
+# The method of using this script is not suitable.
+# This script will be deleted in the future.
+
 ATALK_BIN=:BINDIR:
 ATALK_CONF_DIR=:ETCDIR:
 ATALK_SBIN=:SBINDIR:

diff --git a/distrib/initscripts/service.atalk.redhat-systemd.tmpl b/distrib/initscripts/service.atalk.redhat-systemd.tmpl
index cd7a3dfcfb4e798a32d2e9bbb7f6a1a2918f5576..87cdf3833d37544c04b34a7afdce86f792e06dff 100644 (file)
--- a/distrib/initscripts/service.atalk.redhat-systemd.tmpl
+++ b/distrib/initscripts/service.atalk.redhat-systemd.tmpl
@@ -1,5 +1,9 @@
 # This file is part of netatalk :NETATALK_VERSION:.
 
+# The method of using shell-script "netatalk.sh" is not suitable.
+# The future service files are due to start daemons directly.
+# See netatalk-xxx/contrib/systemd/ directory in tarball.
+
 [Unit]
 Description=File and Printer sharing for Macintosh clients
 After=syslog.target network.target