experimental systemd service files: always run both afpd and cnid_metad

diff --git a/NEWS b/NEWS
index d364b0ea531e456237ce80c33cb652491fe4675d..7a9153bbaa628b807724664291ea9025adbac769 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Changes in ?.?.?
 ================
 
 * UPD: based on Unicode 6.1.0
 ================
 
 * UPD: based on Unicode 6.1.0

+* UPD: experimental systemd service files: always run both afpd and cnid_metad

 
 Changes in 2.2.2
 ================
 
 Changes in 2.2.2
 ================

diff --git a/distrib/systemd/Makefile.am b/distrib/systemd/Makefile.am
index ff8c5cde376c7c534c3959ec2cc3d1aa1d1cb92b..2fad3e55c93c874c25ef189288f08561e60c4ffe 100644 (file)
--- a/distrib/systemd/Makefile.am
+++ b/distrib/systemd/Makefile.am
@@ -1,3 +1,3 @@
 # Makefile for distrib/systemd/
 
 # 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 8d52e8d5cc7ef46e3cadf886a0ae3575d31d3f07..15c83bf1cd243925fcf1b507c8c4b3c85d478da2 100644 (file)
--- 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".
 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.
 
 
 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
 
 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-afpd.service b/distrib/systemd/netatalk-afpd.service
deleted file mode 100644 (file)
index 7af238b..0000000
--- a/distrib/systemd/netatalk-afpd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is experimental service file.
-# See distrib/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/distrib/systemd/netatalk-cnid.service b/distrib/systemd/netatalk-cnid.service
new file mode 100644 (file)
index 0000000..8edfcba
--- /dev/null
+++ b/distrib/systemd/netatalk-cnid.service
@@ -0,0 +1,19 @@
+# This is experimental service file.
+# See distrib/systemd/README
+
+[Unit]
+Description=Netatalk CNID database daemon for AFP fileserver
+After=syslog.target network.target
+Before=netatalk.service
+Requires=netatalk.service
+
+[Service]
+Type=forking
+GuessMainPID=no
+ExecStart=/usr/sbin/cnid_metad -l log_note
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
+Also=netatalk.service

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