misc packaging

README

@@ -9,10 +9,10 @@ In order to allow clients writes :
 
 1. on the server :
 
-  echo 'create role rsyslog login password 'ohGh6iec';
+  echo "create role rsyslog with login password 'ohGh6iec';
     grant connect on database logtracker to rsyslog;
     grant insert on table journal_entry to rsyslog;
-    grant usage, select on sequence journal_entry_id_seq TO rsyslog; ' | sudo -u postgres psql logtracker
+    grant usage, select on sequence journal_entry_id_seq TO rsyslog; " | sudo -u postgres psql logtracker
 
 2. install rsyslog-logtracker, then
     copy and adapt debian/rsyslog-logtracker.conf-example to debian/rsyslog-logtracker.conf

debian/bin/logtracker

@@ -1,12 +1,8 @@
 #!/bin/sh
 
 if [ "$(whoami)" != "logtracker" ]; then
-    if sudo -v -u logtracker; then
-        sudo -H -u logtracker logtracker-manage.py "$@"
-        exit $?
-    fi
-    echo "You must run this script with logtracker user"
-    exit 1
+    sudo -H -u logtracker logtracker-manage $args
+    exit $?
 fi
 
-logtracker-manage.py $*
+/usr/bin/logtracker-manage $args

debian/logtracker.install

@@ -1,5 +1,5 @@
 debian/settings.py        /etc/logtracker
 debian/uwsgi.ini          /etc/logtracker
 debian/nginx/logtracker-example.conf /etc/nginx/sites-available
-debian/bin/logtracker-manage /usr/bin
-debian/bin/logtracker       /usr/bin
+debian/logtracker-manage  /usr/bin
+debian/bin/logtracker     /usr/bin

debian/rules

@@ -8,7 +8,3 @@ export PYBUILD_INSTALL_ARGS_python3=--install-scripts=/usr/lib/logtracker/
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
-
-override_dh_install:
-	dh_install
-	mv $(CURDIR)/debian/python3-logtracker/usr/bin/manage.py $(CURDIR)/debian/logtracker/usr/lib/logtracker/manage.py