From 8fe0fcc523cc81aa8195ecf78bf0d9f8e4bb666e Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Wed, 29 Apr 2015 17:33:47 +0200
Subject: [PATCH] MT#12487 debian: fixes

- install repoapi.ini file into uwsgi/apps-available
- venv_prod should be at /var/lib/repoapi
- wrap-and-short -a

Change-Id: I31c491103c35b22ee585424d739e7afe8db7249d
---
 debian/control            |  6 ++++--
 debian/install            |  1 +
 debian/links              |  1 -
 repoapi.ini               | 11 +++++++++++
 repoapi/repoapi_uwsgi.ini | 26 --------------------------
 5 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 debian/links
 create mode 100644 repoapi.ini
 delete mode 100644 repoapi/repoapi_uwsgi.ini

diff --git a/debian/control b/debian/control
index b19ae11..143d99c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,9 @@
 Source: repoapi
 Priority: extra
 Maintainer: Sipwise Development Team <support@sipwise.com>
-Build-Depends: debhelper (>= 8~), python-virtualenv, python-dev
+Build-Depends: debhelper (>= 8~),
+               python-dev,
+               python-virtualenv
 Standards-Version: 3.9.6
 Section: python
 Homepage: http://sipwise.com/
@@ -10,10 +12,10 @@ Package: repoapi
 Section: python
 Architecture: all
 Depends: make,
-         uwsgi-plugin-python,
          python,
          python-virtualenv,
          sqlite3,
+         uwsgi-plugin-python,
          ${misc:Depends}
 Description: REST API webapp
  This package provides repoapi webapp.
diff --git a/debian/install b/debian/install
index c68f192..665c8d8 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,6 @@
 Makefile usr/share/repoapi
 manage.py usr/share/repoapi
 repoapi usr/share/repoapi
+repoapi.ini etc/uwsgi/apps-available
 requirements usr/share/repoapi
 static_media usr/share/repoapi
diff --git a/debian/links b/debian/links
deleted file mode 100644
index ee1fa24..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/repoapi/repoapi/repoapi_uwsgi.ini /etc/uwsgi/apps-available/repoapi.ini
diff --git a/repoapi.ini b/repoapi.ini
new file mode 100644
index 0000000..c0dfa50
--- /dev/null
+++ b/repoapi.ini
@@ -0,0 +1,11 @@
+[uwsgi]
+
+# Django-related settings
+# the base directory (full path)
+chdir           = /usr/share/repoapi
+# Django's wsgi file
+module          = repoapi.wsgi:application
+# the virtualenv (full path)
+home            = /var/lib/repoapi/venv_prod
+# django setting
+env = DJANGO_SETTINGS_MODULE=repoapi.settings.prod
diff --git a/repoapi/repoapi_uwsgi.ini b/repoapi/repoapi_uwsgi.ini
deleted file mode 100644
index 98eebb5..0000000
--- a/repoapi/repoapi_uwsgi.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[uwsgi]
-
-# Django-related settings
-# the base directory (full path)
-chdir           = /usr/share/repoapi
-# Django's wsgi file
-module          = repoapi.wsgi:application
-# the virtualenv (full path)
-home            = /usr/share/repoapi/venv_prod
-# django setting
-env = DJANGO_SETTINGS_MODULE=repoapi.settings.prod
-
-# This is defined by default on uwsgi
-# process-related settings
-# master
-#master          = true
-# maximum number of worker processes
-#processes       = 5
-# the socket (use the full path to be safe
-#socket          = /usr/share/repoapi/venv_prod/run/repoapi.sock
-# ... with appropriate permissions - may be needed
-# chmod-socket    = 664
-# clear environment on exit
-#vacuum          = true
-#logto = /var/log/uwsgi-repoapi.log
-