Rename distro/ to systemd/.

Systemd service files are not supposed to be distribution-specific.

diff --git a/.gitignore b/.gitignore
index 41d240d4c5f1437bccb99284a2256733fccc2f5e..3c8c4d3373a2a67271c8baabc6705a4065af0dbf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,6 @@ stamp-h1
 /doc/*.html
 /doc/*.pdf
 /doc/*.t2p
+/systemd/*.service
 /ChangeLog
 core*

diff --git a/Makefile.am b/Makefile.am
index bfaf557d9ba0708253704fefeb42d421a374648f..8e43fe52673a99944e414974bbf0789a5b9559c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = src doc distro
+SUBDIRS = src doc systemd
 
 ACLOCAL_AMFLAGS = -I m4 
 

diff --git a/configure.ac b/configure.ac
index ff577553a52afa727c1dfe6903dcd8ad3081acb6..c6b2563e4ad06fb10a6f5d2a647cdadc5bd3945b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -242,6 +242,6 @@ if test "x$runstatedir" = "x"; then
   AC_SUBST([runstatedir], ['${localstatedir}/run'])
 fi
 
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile distro/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile systemd/Makefile])
 
 AC_OUTPUT

diff --git a/distro/Makefile.am b/distro/Makefile.am
deleted file mode 100644 (file)
index dac2b73..0000000
--- a/distro/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-EXTRA_DIST = tinc.service.in tinc@.service.in
-
-CLEANFILES = tinc.service tinc@.service
-
-if WITH_SYSTEMD
-systemddir = @systemd_path@
-nodist_systemd_DATA = tinc.service tinc@.service
-endif
-
-substitute = sed \
-        -e s,'@sbindir\@',"$(sbindir)",g \
-        -e s,'@sysconfdir\@',"$(sysconfdir)",g
-
-tinc.service: $(srcdir)/tinc.service.in
-       $(AM_V_GEN)$(substitute) $(srcdir)/tinc.service.in > $@
-
-tinc@.service: $(srcdir)/tinc@.service.in
-       $(AM_V_GEN)$(substitute) $(srcdir)/tinc@.service.in > $@

diff --git a/distro/tinc.service.in b/distro/tinc.service.in
deleted file mode 100644 (file)
index b671042..0000000
--- a/distro/tinc.service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is a mostly empty service, but allows commands like stop, start, reload
-# to propagate to all tinc@ service instances.
-
-[Unit]
-Description=Tinc VPN
-Documentation=info:tinc
-Documentation=man:tinc(8) man:tinc.conf(5)
-Documentation=http://tinc-vpn.org/docs/
-After=network.target
-Wants=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-WorkingDirectory=@sysconfdir@/tinc
-
-[Install]
-WantedBy=multi-user.target

diff --git a/distro/tinc@.service.in b/distro/tinc@.service.in
deleted file mode 100644 (file)
index 8fbf551..0000000
--- a/distro/tinc@.service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Tinc net %i
-Documentation=info:tinc
-Documentation=man:tinc(8) man:tinc.conf(5)
-Documentation=http://tinc-vpn.org/docs/
-PartOf=tinc.service
-ReloadPropagatedFrom=tinc.service
-
-[Service]
-Type=simple
-WorkingDirectory=@sysconfdir@/tinc/%i
-ExecStart=@sbindir@/tincd -n %i -D
-ExecReload=@sbindir@/tincd -n %i -kHUP
-KillMode=mixed
-Restart=on-failure
-RestartSec=5
-TimeoutStopSec=5
-
-[Install]
-WantedBy=tinc.service

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
new file mode 100644 (file)
index 0000000..dac2b73
--- /dev/null
+++ b/systemd/Makefile.am
@@ -0,0 +1,18 @@
+EXTRA_DIST = tinc.service.in tinc@.service.in
+
+CLEANFILES = tinc.service tinc@.service
+
+if WITH_SYSTEMD
+systemddir = @systemd_path@
+nodist_systemd_DATA = tinc.service tinc@.service
+endif
+
+substitute = sed \
+        -e s,'@sbindir\@',"$(sbindir)",g \
+        -e s,'@sysconfdir\@',"$(sysconfdir)",g
+
+tinc.service: $(srcdir)/tinc.service.in
+       $(AM_V_GEN)$(substitute) $(srcdir)/tinc.service.in > $@
+
+tinc@.service: $(srcdir)/tinc@.service.in
+       $(AM_V_GEN)$(substitute) $(srcdir)/tinc@.service.in > $@

diff --git a/systemd/tinc.service.in b/systemd/tinc.service.in
new file mode 100644 (file)
index 0000000..b671042
--- /dev/null
+++ b/systemd/tinc.service.in
@@ -0,0 +1,20 @@
+# This is a mostly empty service, but allows commands like stop, start, reload
+# to propagate to all tinc@ service instances.
+
+[Unit]
+Description=Tinc VPN
+Documentation=info:tinc
+Documentation=man:tinc(8) man:tinc.conf(5)
+Documentation=http://tinc-vpn.org/docs/
+After=network.target
+Wants=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecReload=/bin/true
+WorkingDirectory=@sysconfdir@/tinc
+
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/tinc@.service.in b/systemd/tinc@.service.in
new file mode 100644 (file)
index 0000000..8fbf551
--- /dev/null
+++ b/systemd/tinc@.service.in
@@ -0,0 +1,20 @@
+[Unit]
+Description=Tinc net %i
+Documentation=info:tinc
+Documentation=man:tinc(8) man:tinc.conf(5)
+Documentation=http://tinc-vpn.org/docs/
+PartOf=tinc.service
+ReloadPropagatedFrom=tinc.service
+
+[Service]
+Type=simple
+WorkingDirectory=@sysconfdir@/tinc/%i
+ExecStart=@sbindir@/tincd -n %i -D
+ExecReload=@sbindir@/tincd -n %i -kHUP
+KillMode=mixed
+Restart=on-failure
+RestartSec=5
+TimeoutStopSec=5
+
+[Install]
+WantedBy=tinc.service