From d05a22ef43b4e290767869541f119e69d7d267c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Thu, 31 Mar 2016 18:32:49 +0000 Subject: [PATCH 1/2] add native Debian packaging --- .gitignore | 5 +++++ debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 14 ++++++++++++++ debian/ot-recorder.dirs | 2 ++ debian/ot-recorder.docs | 3 +++ debian/ot-recorder.postinst | 3 +++ debian/ot-recorder.service | 11 +++++++++++ debian/ot-recorder.tmpfile | 3 +++ debian/rules | 11 +++++++++++ debian/source/format | 1 + 11 files changed, 59 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/ot-recorder.dirs create mode 100644 debian/ot-recorder.docs create mode 100644 debian/ot-recorder.postinst create mode 100644 debian/ot-recorder.service create mode 100644 debian/ot-recorder.tmpfile create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/.gitignore b/.gitignore index de8eda8..d022958 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,8 @@ codesign.sh sundry/ *.lua kick*.sh +/debian/*\.debhelper +/debian/*\.debhelper.log +/debian/debhelper.log +/debian/*\.substvars +/debian/files diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8980139 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +ot-recorder (0.6.2) unstable; urgency=medium + + * Initial release. + + -- Thomas Weißschuh Wed, 30 Mar 2016 16:46:45 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..56afc6f --- /dev/null +++ b/debian/control @@ -0,0 +1,14 @@ +Source: ot-recorder +Priority: optional +Section: net +Maintainer: JP Mens +Build-Depends: debhelper (>= 9), libcurl3-dev, libmosquitto-dev, liblua5.2-dev, libconfig8-dev, libsodium-dev +Standards-Version: 3.9.6 +Vcs-Git: https://github.com/owntracks/recorder +Vcs-Browser: https://github.com/owntracks/recorder +Homepage: https://github.com/owntracks/recorder + +Package: ot-recorder +Architecture: any +Description: Lightweight back-end for consuming OwnTracks data from an MQTT Broker +Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/ot-recorder.dirs b/debian/ot-recorder.dirs new file mode 100644 index 0000000..6d5ed16 --- /dev/null +++ b/debian/ot-recorder.dirs @@ -0,0 +1,2 @@ +/var/spool/owntracks +/var/spool/owntracks/recorder/store diff --git a/debian/ot-recorder.docs b/debian/ot-recorder.docs new file mode 100644 index 0000000..d1997cc --- /dev/null +++ b/debian/ot-recorder.docs @@ -0,0 +1,3 @@ +LICENSE +Changelog +README.md diff --git a/debian/ot-recorder.postinst b/debian/ot-recorder.postinst new file mode 100644 index 0000000..3c13734 --- /dev/null +++ b/debian/ot-recorder.postinst @@ -0,0 +1,3 @@ +#!/bin/sh + +adduser --system --home /var/spool/owntracks owntracks diff --git a/debian/ot-recorder.service b/debian/ot-recorder.service new file mode 100644 index 0000000..89bca56 --- /dev/null +++ b/debian/ot-recorder.service @@ -0,0 +1,11 @@ +[Unit] +Description=OwnTracks Recorder +After=network.target + +[Service] +Type=simple +User=owntracks +ExecStart=/usr/sbin/ot-recorder + +[Install] +WantedBy=multi-user.target diff --git a/debian/ot-recorder.tmpfile b/debian/ot-recorder.tmpfile new file mode 100644 index 0000000..f0380c5 --- /dev/null +++ b/debian/ot-recorder.tmpfile @@ -0,0 +1,3 @@ +d /var/spool/owntracks - owntracks owntracks +d /var/spool/owntracks/recorder - owntracks owntracks +d /var/spool/owntracks/recorder/store - owntracks owntracks diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..08ba891 --- /dev/null +++ b/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +DPKG_EXPORT_BUILDFLAGS=1 +include /usr/share/dpkg/default.mk + +%: + dh $@ + +override_dh_auto_clean: + cp etc/debian/config.mk.in config.mk + dh_auto_clean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) From b08c36cd47166097897d787d4ee072e38e125922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Thu, 31 Mar 2016 18:33:03 +0000 Subject: [PATCH 2/2] use more idomatic config for Debian --- etc/debian/config.mk.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/debian/config.mk.in b/etc/debian/config.mk.in index 08f6627..56ec935 100644 --- a/etc/debian/config.mk.in +++ b/etc/debian/config.mk.in @@ -1,7 +1,7 @@ #(@)config.mk for Debian 8 (x86_64) -INSTALLDIR = /usr/local -CONFIGFILE = /etc/default/ot-recorder +INSTALLDIR = /usr/ +CONFIGFILE = /etc/ot-recorder/ot-recorder.conf WITH_MQTT ?= yes WITH_HTTP ?= yes @@ -12,7 +12,7 @@ WITH_ENCRYPT ?= yes WITH_GREENWICH ?= yes STORAGEDEFAULT = /var/spool/owntracks/recorder/store -DOCROOT = /var/spool/owntracks/recorder/htdocs +DOCROOT = /usr/share/owntracks/recorder/htdocs GHASHPREC = 7 JSON_INDENT ?= no MOSQUITTO_INC = -I/usr/include