VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Merge in fix from stable branch.

This commit is contained in:
Albert Hopkins 2015-02-28 20:11:16 +00:00
parent d66a465456 99c79d353d
commit 829eeb5806
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
appliances/teamplayer/Makefile
View File

@ -31,15 +31,14 @@ ifeq ($(AVAHI),YES)
cp teamplayer.service $(CHROOT)/etc/avahi/services cp teamplayer.service $(CHROOT)/etc/avahi/services
$(inroot) systemctl enable avahi-daemon.service $(inroot) systemctl enable avahi-daemon.service
endif endif
$(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv $(inroot) $(EMERGE) -1n $(USEPKG) dev-python/virtualenv dev-vcs/mercurial
$(inroot) getent passwd $(TP_USER) || \ $(inroot) getent passwd $(TP_USER) || \
$(inroot) useradd -c "Teamplayer Server" -G postgres -U -d $(TP_HOME) $(TP_USER) $(inroot) useradd -c "Teamplayer Server" -G postgres -U -d $(TP_HOME) $(TP_USER)
rm -rf $(CHROOT)/$(TP_HOME) rm -rf $(CHROOT)/$(TP_HOME)
mkdir -p $(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 cp bash_profile $(CHROOT)$(TP_HOME)/.bash_profile
$(inroot) virtualenv $(TP_HOME) $(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 ; pip install psycopg2 uwsgi Whoosh setproctitle"
$(inroot) bash -c ". $(TP_HOME)/bin/activate ; django-admin.py startproject project $(TP_HOME)" $(inroot) bash -c ". $(TP_HOME)/bin/activate ; django-admin.py startproject project $(TP_HOME)"
chmod +x $(CHROOT)/$(TP_HOME)/manage.py chmod +x $(CHROOT)/$(TP_HOME)/manage.py

2
appliances/teamplayer/nginx.conf
View File

@ -51,7 +51,7 @@ http {
server_name HOSTNAME; server_name HOSTNAME;
location /static/ { location /static/ {
alias TP_HOME/teamplayer/teamplayer/static/; alias TP_HOME/static/;
} }
location / { location / {

1
appliances/teamplayer/package.use
View File

@ -3,6 +3,7 @@ dev-db/postgresql server
dev-db/sqlite extensions dev-db/sqlite extensions
dev-lang/python sqlite ssl threads xml dev-lang/python sqlite ssl threads xml
dev-util/pkgconfig internal-glib dev-util/pkgconfig internal-glib
dev-vcs/mercurial python_targets_python2_7
media-libs/flac ogg media-libs/flac ogg
media-sound/mpd faad audiofile ffmpeg flac inotify id3tag lame network ogg vorbis mad soup sqlite unicode 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 media-video/ffmpeg avx cpudetection mmx mmxext mp3 network ssse3 x264