contrib/systemd/ move to distrib/systemd/

diff --git a/NEWS b/NEWS
index d2cacd1d323770e79edb93414cc4f1a26ebae268..626aa3e8be1543d443427ec93b60361a73b9a0cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Changes in 2.2.2
        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/
+* NEW: experimental systemd service files in distrib/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

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

diff --git a/contrib/systemd/README b/contrib/systemd/README
deleted file mode 100644 (file)
index 8d52e8d..0000000
--- a/contrib/systemd/README
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644 (file)
index 2256343..0000000
--- a/contrib/systemd/netatalk-afpd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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
deleted file mode 100644 (file)
index e5ba2e6..0000000
--- a/contrib/systemd/netatalk-cnid_metad.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/Makefile.am b/distrib/Makefile.am
index 765af279125f6f94cce45f0276e614a7be1bbfe3..5d9bda826dc9e0427fa7fdf3efe9178d42ab885e 100644 (file)
--- a/distrib/Makefile.am
+++ b/distrib/Makefile.am
@@ -1,3 +1,3 @@
 # Makefile.am for distrib/
 
-SUBDIRS = config initscripts m4
+SUBDIRS = config initscripts m4 systemd

diff --git a/distrib/initscripts/service.atalk.redhat-systemd.tmpl b/distrib/initscripts/service.atalk.redhat-systemd.tmpl
index 87cdf3833d37544c04b34a7afdce86f792e06dff..1af8576758b732d436ac2f4c4162005cec6de6ff 100644 (file)
--- a/distrib/initscripts/service.atalk.redhat-systemd.tmpl
+++ b/distrib/initscripts/service.atalk.redhat-systemd.tmpl
@@ -2,7 +2,7 @@
 
 # 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.
+# See netatalk-xxx/distrib/systemd/ directory in tarball.
 
 [Unit]
 Description=File and Printer sharing for Macintosh clients

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

diff --git a/distrib/systemd/README b/distrib/systemd/README
new file mode 100644 (file)
index 0000000..8d52e8d
--- /dev/null
+++ b/distrib/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/distrib/systemd/netatalk-afpd.service b/distrib/systemd/netatalk-afpd.service
new file mode 100644 (file)
index 0000000..7af238b
--- /dev/null
+++ b/distrib/systemd/netatalk-afpd.service
@@ -0,0 +1,16 @@
+# 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_metad.service b/distrib/systemd/netatalk-cnid_metad.service
new file mode 100644 (file)
index 0000000..6438229
--- /dev/null
+++ b/distrib/systemd/netatalk-cnid_metad.service
@@ -0,0 +1,16 @@
+# 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