free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

This commit is contained in:
Bob Mottram 2016-06-16 21:38:54 +01:00
parent ad05d58df9
commit 9d7e850a3e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/freedombone
View File

@ -9909,8 +9909,10 @@ function install_media_server {
return return
fi fi
echo $'Installing media server'
apt-get -y install git-core python python-dev python-lxml python-pil apt-get -y install git-core python python-dev python-lxml python-pil
apt-get -y install python-virtualenv npm nodejs-legacy automake apt-get -y install python-virtualenv automake
apt-get -y install fcgiwrap libmysqlclient-dev apt-get -y install fcgiwrap libmysqlclient-dev
apt-get -y install libjpeg-dev zlib1g-dev libfreetype6-dev apt-get -y install libjpeg-dev zlib1g-dev libfreetype6-dev
apt-get -y install python-setuptools python-virtualenv apt-get -y install python-setuptools python-virtualenv
@ -10035,15 +10037,15 @@ function install_media_server {
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' client_max_body_size 1500M;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' client_max_body_size 1500M;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " root ${$MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " root ${MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' location ~* ^/(appearance)/ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' location ~* ^/(appearance)/ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' location ~* ^(/images\/media|images\/podcasts) {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' location ~* ^(/images\/media|images\/podcasts) {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
@ -10054,7 +10056,7 @@ function install_media_server {
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' location /__mediacore_serve__ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' location /__mediacore_serve__ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " alias ${$MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " alias ${MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' internal;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' internal;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
@ -10079,15 +10081,15 @@ function install_media_server {
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' client_max_body_size 1500M;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' client_max_body_size 1500M;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " root ${$MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " root ${MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' location ~* ^/(appearance)/ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' location ~* ^/(appearance)/ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' location ~* ^(/images\/media|images\/podcasts) {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' location ~* ^(/images\/media|images\/podcasts) {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
@ -10098,7 +10100,7 @@ function install_media_server {
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' location /__mediacore_serve__ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' location /__mediacore_serve__ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo " alias ${$MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo " alias ${MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' internal;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' internal;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo ' }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME