free
/
freedombone
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

Tidying

Bob Mottram hace 8 años
padre
ad05d58df9
commit
9d7e850a3e
Se han modificado 1 ficheros con 11 adiciones y 9 borrados
Dividir vista Mostrar estadísticas de diff
  1. 11
    9
      src/freedombone

+ 11
- 9
src/freedombone Ver fichero 

@@ -9909,8 +9909,10 @@ function install_media_server {
9909 9909 
 		return
9910 9910 
 	fi
9911 9911
9912 
+	echo $'Installing media server'
9913 
+
9912 9914 
 	apt-get -y install git-core python python-dev python-lxml python-pil
9913 
-	apt-get -y install python-virtualenv npm nodejs-legacy automake
9915 
+	apt-get -y install python-virtualenv automake
9914 9916 
 	apt-get -y install fcgiwrap libmysqlclient-dev
9915 9917 
 	apt-get -y install libjpeg-dev zlib1g-dev libfreetype6-dev
9916 9918 
 	apt-get -y install python-setuptools python-virtualenv
 
@@ -10035,15 +10037,15 @@ function install_media_server {
10035 10037 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10036 10038 
 		echo '  client_max_body_size 1500M;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10037 10039 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10038 
-		echo "  root ${$MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10040 
+		echo "  root ${MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10039 10041 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10040 10042 
 		echo '  location ~* ^/(appearance)/ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10041 
-		echo "      root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10043 
+		echo "      root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10042 10044 
 		echo '      break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10043 10045 
 		echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10044 10046 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10045 10047 
 		echo '  location ~* ^(/images\/media|images\/podcasts) {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10046 
-		echo "      root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10048 
+		echo "      root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10047 10049 
 		echo '      break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10048 10050 
 		echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10049 10051 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
 
@@ -10054,7 +10056,7 @@ function install_media_server {
10054 10056 
 		echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10055 10057 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10056 10058 
 		echo '  location /__mediacore_serve__ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10057 
-		echo "      alias ${$MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10059 
+		echo "      alias ${MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10058 10060 
 		echo '      internal;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10059 10061 
 		echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10060 10062 
 		echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
 
@@ -10079,15 +10081,15 @@ function install_media_server {
10079 10081 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10080 10082 
 	echo '  client_max_body_size 1500M;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10081 10083 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10082 
-	echo "  root ${$MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10084 
+	echo "  root ${MEDIA_SERVER_WORKING_DIRECTORY}/public;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10083 10085 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10084 10086 
 	echo '  location ~* ^/(appearance)/ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10085 
-	echo "      root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10087 
+	echo "      root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10086 10088 
 	echo '      break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10087 10089 
 	echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10088 10090 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10089 10091 
 	echo '  location ~* ^(/images\/media|images\/podcasts) {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10090 
-	echo "      root ${$MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10092 
+	echo "      root ${MEDIA_SERVER_WORKING_DIRECTORY}/data ;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10091 10093 
 	echo '      break;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10092 10094 
 	echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10093 10095 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
 
@@ -10098,7 +10100,7 @@ function install_media_server {
10098 10100 
 	echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10099 10101 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10100 10102 
 	echo '  location /__mediacore_serve__ {' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10101 
-	echo "      alias ${$MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10103 
+	echo "      alias ${MEDIA_SERVER_WORKING_DIRECTORY}/data/media;" >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10102 10104 
 	echo '      internal;' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10103 10105 
 	echo '  }' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME
10104 10106 
 	echo '' >> /etc/nginx/sites-available/$MEDIA_SERVER_DOMAIN_NAME