From b6359ed68d611cfa11b11e0591eb6186351793bd Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 9 Feb 2017 18:01:40 +0100
Subject: [pkg] add systemd service file to master

this is to ease the packaging flow used in some environments like
Pixelated, that use a debian branch against different branches.

- Resolves: #8762
---
 server/pkg/soledad-server.service | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 server/pkg/soledad-server.service

(limited to 'server/pkg/soledad-server.service')

diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service
new file mode 100644
index 00000000..ccd03b97
--- /dev/null
+++ b/server/pkg/soledad-server.service
@@ -0,0 +1,31 @@
+[Unit]
+Description=Soledad Server
+
+[Service]
+Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin
+Environment=CLASS=leap.soledad.server.resource.SoledadResource
+Environment=HTTPS_PORT=2424
+Environment=CERT_PATH=/etc/soledad/soledad-server.pem
+Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key
+Environment=HOME=/var/lib/soledad/
+Environment=SSL_METHOD=SSLv23_METHOD
+EnvironmentFile=-/etc/default/soledad
+
+ExecStart=/usr/bin/twistd \
+  --nodaemon \
+  --pidfile= \
+  --syslog \
+  --prefix=soledad-server \
+  web \
+  --class=${CLASS} \
+  --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
+
+WorkingDirectory=/var/lib/soledad/
+
+User=soledad
+Group=soledad
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3


From cfc0dadc7cc927dd9ee6df8c07c1094ccfdc53c5 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 10 Feb 2017 00:15:25 +0100
Subject: [bug] fix typo in the resource path

---
 server/pkg/soledad-server.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/pkg/soledad-server.service')

diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service
index ccd03b97..85a156b5 100644
--- a/server/pkg/soledad-server.service
+++ b/server/pkg/soledad-server.service
@@ -3,7 +3,7 @@ Description=Soledad Server
 
 [Service]
 Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin
-Environment=CLASS=leap.soledad.server.resource.SoledadResource
+Environment=CLASS=leap.soledad.server._resource.SoledadResource
 Environment=HTTPS_PORT=2424
 Environment=CERT_PATH=/etc/soledad/soledad-server.pem
 Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key
-- 
cgit v1.2.3


From 3b41a4de9c0d0f32815fbd11df3b379bc8688069 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 10 Feb 2017 22:45:40 +0100
Subject: [pkg] use the entrypoint from the systemd script too

---
 server/pkg/soledad-server.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/pkg/soledad-server.service')

diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service
index 85a156b5..30c4bf88 100644
--- a/server/pkg/soledad-server.service
+++ b/server/pkg/soledad-server.service
@@ -3,7 +3,7 @@ Description=Soledad Server
 
 [Service]
 Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin
-Environment=CLASS=leap.soledad.server._resource.SoledadResource
+Environment=CLASS=leap.soledad.server.entrypoint.SoledadEntrypoint
 Environment=HTTPS_PORT=2424
 Environment=CERT_PATH=/etc/soledad/soledad-server.pem
 Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key
-- 
cgit v1.2.3