From 154f128fb202ccff35fa2e95630d8a890b39663c Mon Sep 17 00:00:00 2001 From: Simon Shi Date: Wed, 8 Nov 2017 07:13:30 +0000 Subject: [PATCH] Fix typo (#65) --- debian/control | 2 +- debian/install | 2 +- debian/overture.postinst | 42 ---------------------------------------- debian/overture.service | 2 +- debian/rules | 2 -- 5 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 debian/overture.postinst diff --git a/debian/control b/debian/control index 522033b..c9e983c 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: overture Section: net Priority: optional -Maintainer: Debian Go Packaging Team +Maintainer: Simon Shi Uploaders: Simon Shi Build-Depends: debhelper (>= 10), dh-golang, diff --git a/debian/install b/debian/install index b3f5856..39ffb0c 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,2 @@ -debian/config.json usr/share/overture +debian/config.json etc/overture debian/overture.service lib/systemd/system diff --git a/debian/overture.postinst b/debian/overture.postinst deleted file mode 100644 index 3984c5c..0000000 --- a/debian/overture.postinst +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -# POSIX-compliant maint function recommend by devref -# to check for the existence of a command -# https://www.debian.org/doc/manuals/developers-reference/ch06.html#bpp-debian-maint-scripts -pathfind() { - OLDIFS="$IFS" - IFS=: - for p in $PATH; do - if [ -x "$p/$*" ]; then - IFS="$OLDIFS" - return 0 - fi - done - IFS="$OLDIFS" - return 1 -} - -case "$1" in - configure|reconfigure) - pathfind setcap && setcap \ - cap_net_bind_service+ep /usr/bin/overture - if [ ! -f /etc/overture/config.json ]; then - mkdir -p /etc/overture - cat /usr/share/overture/config.json \ - > /etc/overture/config.json - fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) - exit 0 - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/overture.service b/debian/overture.service index c6554a7..219bf96 100644 --- a/debian/overture.service +++ b/debian/overture.service @@ -12,7 +12,7 @@ After=network.target User=nobody Group=nogroup LimitNOFILE=32768 -EnvironmentFile=/etc/default/overture +EnvironmentFile=-/etc/default/overture CapabilityBoundingSet=CAP_NET_BIND_SERVICE ExecStart=/usr/bin/overture -c ${CONFFILE} ${DAEMON_ARGS} Restart=always diff --git a/debian/rules b/debian/rules index db61bd2..845b257 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export DH_VERBOSE=1 - export DH_GOPKG := github.com/shawn1m/overture export GOPATH := $(CURDIR)/obj-$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)