From 07986a3e73b4109eb85a22ee9decd1484d92e65f Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 28 Apr 2015 17:08:31 +0200
Subject: [PATCH] MT#12487 several fixes

- set static BASE_DIR on prod settings
- fix perms problems on make deploy and run

Change-Id: Ic5bac47bbfd9f0a545180a4d63e4141a1fd37177
---
 Makefile                 | 9 ++++++++-
 repoapi/settings/prod.py | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index acff254..e1c1a79 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,13 @@ deploy: venv_prod
 		ln -s $(shell pwd)/repoapi/repoapi_uwsgi.ini \
 			./venv_prod/etc/uwsgi/vassals/
 	touch ./venv_prod/etc/uwsgi/vassals/repoapi_uwsgi.ini
+	chown jenkins:www-data -R ./venv_prod/etc/uwsgi
+	source ./venv_prod/bin/activate && \
+		./manage.py collectstatic --noinput --settings="repoapi.settings.prod"
+	chown jenkins:www-data -R ./static_media/ && chmod 660 -R ./static_media/
+	touch /var/log/uwsgi-repoapi.log && \
+		chown jenkins:www-data /var/log/uwsgi-repoapi.log && \
+		chmod 664 /var/log/uwsgi-repoapi.log
 
 ###################################
 
@@ -43,7 +50,7 @@ run_dev: venv_dev
 
 run: deploy
 	mkdir -p ./venv_prod/run
-	chgrp www-data ./venv_prod/run && chmod 770 ./venv_prod/run
+	chown jenkins:www-data ./venv_prod/run && chmod 770 ./venv_prod/run
 	source ./venv_prod/bin/activate && \
 		uwsgi --emperor ./venv_prod/etc/uwsgi/vassals/ \
 			--uid www-data --gid www-data
diff --git a/repoapi/settings/prod.py b/repoapi/settings/prod.py
index d32615f..dba711a 100644
--- a/repoapi/settings/prod.py
+++ b/repoapi/settings/prod.py
@@ -16,7 +16,7 @@
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = '/srv/repoapi'
 
 
 # Quick-start development settings - unsuitable for production