From 9e139847d1fbc9be8896c2dd64cb205afd9e2168 Mon Sep 17 00:00:00 2001
From: HAT <hat@fa2.so-net.ne.jp>
Date: Sat, 4 Feb 2012 00:26:01 +0900
Subject: [PATCH] experimental systemd service files: always run both afpd and
 cnid_metad

---
 NEWS                                          |  1 +
 distrib/systemd/Makefile.am                   |  2 +-
 distrib/systemd/README                        | 24 +++++++++++++------
 ...id_metad.service => netatalk-cnid.service} |  5 +++-
 ...netatalk-afpd.service => netatalk.service} |  4 +++-
 5 files changed, 26 insertions(+), 10 deletions(-)
 rename distrib/systemd/{netatalk-cnid_metad.service => netatalk-cnid.service} (65%)
 rename distrib/systemd/{netatalk-afpd.service => netatalk.service} (79%)

diff --git a/NEWS b/NEWS
index d364b0ea..7a9153bb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Changes in ?.?.?
 ================
 
 * UPD: based on Unicode 6.1.0
+* UPD: experimental systemd service files: always run both afpd and cnid_metad
 
 Changes in 2.2.2
 ================
diff --git a/distrib/systemd/Makefile.am b/distrib/systemd/Makefile.am
index ff8c5cde..2fad3e55 100644
--- a/distrib/systemd/Makefile.am
+++ b/distrib/systemd/Makefile.am
@@ -1,3 +1,3 @@
 # Makefile for distrib/systemd/
 
-EXTRA_DIST = README netatalk-afpd.service netatalk-cnid_metad.service
+EXTRA_DIST = README netatalk.service netatalk-cnid.service
diff --git a/distrib/systemd/README b/distrib/systemd/README
index 8d52e8d5..15c83bf1 100644
--- a/distrib/systemd/README
+++ b/distrib/systemd/README
@@ -1,15 +1,25 @@
 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.
+
+Two experimental files are for future netatalk 3.0.
+
+    netatalk.service
+    netatalk-cnid.service
+
+You can control starting/stopping by netatalk.service only
+because netatalk-cnid.service is controlled automatically.
+
+    # systemctl enable|disable netatalk.service
+    # systemctl start|stop|restart netatalk.service
 
 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
+    ATALK_NAME:       set in afpd.conf instead
+    AFPD_MAX_CLIENTS: set in netatalk.service by using -c
+    AFPD_UAMLIST:     set in afpd.conf instead
+    AFPD_GUEST:       set in afpd.conf instead
+    CNID_CONFIG:      set in netatalk-cnid.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.
+because AppleTalk feature is due to be abolished in netatalk 3.0.
diff --git a/distrib/systemd/netatalk-cnid_metad.service b/distrib/systemd/netatalk-cnid.service
similarity index 65%
rename from distrib/systemd/netatalk-cnid_metad.service
rename to distrib/systemd/netatalk-cnid.service
index 6438229c..8edfcbab 100644
--- a/distrib/systemd/netatalk-cnid_metad.service
+++ b/distrib/systemd/netatalk-cnid.service
@@ -2,8 +2,10 @@
 # See distrib/systemd/README
 
 [Unit]
-Description=Netatalk CNID database daemon for afpd
+Description=Netatalk CNID database daemon for AFP fileserver
 After=syslog.target network.target
+Before=netatalk.service
+Requires=netatalk.service
 
 [Service]
 Type=forking
@@ -14,3 +16,4 @@ RestartSec=1
 
 [Install]
 WantedBy=multi-user.target
+Also=netatalk.service
diff --git a/distrib/systemd/netatalk-afpd.service b/distrib/systemd/netatalk.service
similarity index 79%
rename from distrib/systemd/netatalk-afpd.service
rename to distrib/systemd/netatalk.service
index 7af238bb..7c6857c1 100644
--- a/distrib/systemd/netatalk-afpd.service
+++ b/distrib/systemd/netatalk.service
@@ -3,7 +3,8 @@
 
 [Unit]
 Description=Netatalk AFP fileserver for Macintosh clients
-After=syslog.target network.target slpd.service avahi-daemon.service netatalk-cnid_metad.service
+After=syslog.target network.target slpd.service avahi-daemon.service netatalk-cnid.service
+Requires=netatalk-cnid.service
 
 [Service]
 Type=forking
@@ -14,3 +15,4 @@ RestartSec=1
 
 [Install]
 WantedBy=multi-user.target
+Also=netatalk-cnid.service
-- 
2.39.2