From 99c79d353d3379539b4c4c0f56b9ce03b55c52ce Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Sat, 28 Feb 2015 19:09:41 +0000 Subject: [PATCH] teamplayer: Don't "pip install -e" the package It always irks me when I see other people do this in deployments and here I am doing it myself. --- appliances/teamplayer/Makefile | 5 ++--- appliances/teamplayer/nginx.conf | 2 +- appliances/teamplayer/package.use | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appliances/teamplayer/Makefile b/appliances/teamplayer/Makefile index babb0e2..7e32ef3 100644 --- a/appliances/teamplayer/Makefile +++ b/appliances/teamplayer/Makefile @@ -32,15 +32,14 @@ ifeq ($(AVAHI),YES) cp teamplayer.service $(CHROOT)/etc/avahi/services $(inroot) ln -sf /etc/init.d/avahi-daemon $(rcdefault)/avahi-daemon endif - $(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv + $(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv dev-vcs/mercurial $(inroot) getent passwd $(TP_USER) || \ $(inroot) useradd -c "Teamplayer Server" -G postgres -U -d $(TP_HOME) $(TP_USER) rm -rf $(CHROOT)/$(TP_HOME) mkdir -p $(CHROOT)/$(TP_HOME) - hg clone -u $(TP_BRANCH) $(TP_REPO) $(CHROOT)/$(TP_HOME)/teamplayer cp bash_profile $(CHROOT)$(TP_HOME)/.bash_profile $(inroot) virtualenv $(TP_HOME) - $(inroot) bash -c ". $(TP_HOME)/bin/activate ; pip install -e $(TP_HOME)/teamplayer" + $(inroot) bash -c ". $(TP_HOME)/bin/activate ; LANG=en_US.utf8 pip install hg+$(TP_REPO)@$(TP_BRANCH)" $(inroot) bash -c ". $(TP_HOME)/bin/activate ; pip install psycopg2 uwsgi Whoosh setproctitle" $(inroot) bash -c ". $(TP_HOME)/bin/activate ; django-admin.py startproject project $(TP_HOME)" chmod +x $(CHROOT)/$(TP_HOME)/manage.py diff --git a/appliances/teamplayer/nginx.conf b/appliances/teamplayer/nginx.conf index 14c8daf..378be91 100644 --- a/appliances/teamplayer/nginx.conf +++ b/appliances/teamplayer/nginx.conf @@ -51,7 +51,7 @@ http { server_name HOSTNAME; location /static/ { - alias TP_HOME/teamplayer/teamplayer/static/; + alias TP_HOME/static/; } location / { diff --git a/appliances/teamplayer/package.use b/appliances/teamplayer/package.use index ad11cdd..8de9329 100644 --- a/appliances/teamplayer/package.use +++ b/appliances/teamplayer/package.use @@ -3,6 +3,7 @@ dev-db/postgresql server dev-db/sqlite extensions dev-lang/python sqlite ssl threads xml dev-util/pkgconfig internal-glib +dev-vcs/mercurial python_targets_python2_7 media-libs/flac ogg media-sound/mpd faad audiofile ffmpeg flac inotify id3tag lame network ogg vorbis mad soup sqlite unicode media-video/ffmpeg avx cpudetection mmx mmxext mp3 network ssse3 x264