From 69bd767cd63b7649229227329e0560e92d8a5385 Mon Sep 17 00:00:00 2001
From: Chris Cromer <chris@cromer.cl>
Date: Sat, 29 Aug 2020 11:03:49 -0400
Subject: [PATCH] add pid file to systemd unit and move services to data folder

---
 contrib/meson.build                             | 4 ----
 data/meson.build                                | 4 ++++
 {contrib => data}/openrc/meson.build            | 0
 {contrib => data}/openrc/tufmanager.in          | 0
 {contrib => data}/runit/meson.build             | 0
 {contrib => data}/runit/run.in                  | 0
 {contrib => data}/s6/dependencies               | 0
 {contrib => data}/s6/meson.build                | 0
 {contrib => data}/s6/run.in                     | 0
 {contrib => data}/s6/type                       | 0
 {contrib => data}/systemd/meson.build           | 0
 {contrib => data}/systemd/tufmanager.service.in | 1 +
 meson.build                                     | 3 +--
 13 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 contrib/meson.build
 rename {contrib => data}/openrc/meson.build (100%)
 rename {contrib => data}/openrc/tufmanager.in (100%)
 rename {contrib => data}/runit/meson.build (100%)
 rename {contrib => data}/runit/run.in (100%)
 rename {contrib => data}/s6/dependencies (100%)
 rename {contrib => data}/s6/meson.build (100%)
 rename {contrib => data}/s6/run.in (100%)
 rename {contrib => data}/s6/type (100%)
 rename {contrib => data}/systemd/meson.build (100%)
 rename {contrib => data}/systemd/tufmanager.service.in (82%)

diff --git a/contrib/meson.build b/contrib/meson.build
deleted file mode 100644
index 99977f9..0000000
--- a/contrib/meson.build
+++ /dev/null
@@ -1,4 +0,0 @@
-subdir('openrc')
-subdir('runit')
-subdir('s6')
-subdir('systemd')
diff --git a/data/meson.build b/data/meson.build
index be9b456..049a23d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,3 +26,7 @@ subdir('ui')
 subdir('icons')
 subdir('gschema')
 subdir('man')
+subdir('openrc')
+subdir('runit')
+subdir('s6')
+subdir('systemd')
diff --git a/contrib/openrc/meson.build b/data/openrc/meson.build
similarity index 100%
rename from contrib/openrc/meson.build
rename to data/openrc/meson.build
diff --git a/contrib/openrc/tufmanager.in b/data/openrc/tufmanager.in
similarity index 100%
rename from contrib/openrc/tufmanager.in
rename to data/openrc/tufmanager.in
diff --git a/contrib/runit/meson.build b/data/runit/meson.build
similarity index 100%
rename from contrib/runit/meson.build
rename to data/runit/meson.build
diff --git a/contrib/runit/run.in b/data/runit/run.in
similarity index 100%
rename from contrib/runit/run.in
rename to data/runit/run.in
diff --git a/contrib/s6/dependencies b/data/s6/dependencies
similarity index 100%
rename from contrib/s6/dependencies
rename to data/s6/dependencies
diff --git a/contrib/s6/meson.build b/data/s6/meson.build
similarity index 100%
rename from contrib/s6/meson.build
rename to data/s6/meson.build
diff --git a/contrib/s6/run.in b/data/s6/run.in
similarity index 100%
rename from contrib/s6/run.in
rename to data/s6/run.in
diff --git a/contrib/s6/type b/data/s6/type
similarity index 100%
rename from contrib/s6/type
rename to data/s6/type
diff --git a/contrib/systemd/meson.build b/data/systemd/meson.build
similarity index 100%
rename from contrib/systemd/meson.build
rename to data/systemd/meson.build
diff --git a/contrib/systemd/tufmanager.service.in b/data/systemd/tufmanager.service.in
similarity index 82%
rename from contrib/systemd/tufmanager.service.in
rename to data/systemd/tufmanager.service.in
index de64f29..1828bed 100644
--- a/contrib/systemd/tufmanager.service.in
+++ b/data/systemd/tufmanager.service.in
@@ -3,6 +3,7 @@ Description=TUF Manager Server
 
 [Service]
 Type=forking
+PIDFile=/run/tufmanager/pid
 ExecStart=@LIBEXECDIR@/tuf-server
 
 [Install]
diff --git a/meson.build b/meson.build
index 2bbd523..cad43ed 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
         'c',
         'vala'
     ],
-    version: '1.2.1',
+    version: '1.2.2',
     license: 'BSD-3',
     default_options:
     [
@@ -28,4 +28,3 @@ subdir('data')
 subdir('src')
 subdir('docs')
 subdir('script')
-subdir('contrib')