Bob Mottram před 8 roky
rodič
revize
cb729529ef
1 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 3
    3
      src/freedombone

+ 3
- 3
src/freedombone Zobrazit soubor

@@ -10002,7 +10002,7 @@ function install_media_server {
10002 10002
 		echo $'No data directory found'
10003 10003
 		exit 625728
10004 10004
 	fi
10005
-	cp -a $MEDIA_SERVER_WORKING_DIRECTORY/data $MEDIA_SERVER_WORKING_DIRECTORY
10005
+	cp -r $MEDIA_SERVER_WORKING_DIRECTORY/data/* $MEDIA_SERVER_WORKING_DIRECTORY
10006 10006
 	paster setup-app deployment.ini
10007 10007
 
10008 10008
 	# add uwsgi to deployment.ini
@@ -10022,8 +10022,8 @@ function install_media_server {
10022 10022
 	# script to be called by the daemon
10023 10023
 	echo '#!/bin/bash' > /usr/bin/start-mediadrop
10024 10024
 	echo "cd ${MEDIA_SERVER_WORKING_DIRECTORY}" >> /usr/bin/start-mediadrop
10025
-	echo "uwsgi --ini-paste deployment.ini" >> /usr/bin/start-mediadrop
10026
-	echo "paster serve --reload deployment.ini" >> /usr/bin/start-mediadrop
10025
+	echo "${MEDIA_SERVER_WORKING_DIRECTORY}/deployment-scripts/uwsgi --ini-paste ${MEDIA_SERVER_BASE_DIRECTORY}/deployment.ini" >> /usr/bin/start-mediadrop
10026
+	echo "${MEDIA_SERVER_BASE_DIRECTORY}/venv/bin/paster serve --reload ${MEDIA_SERVER_BASE_DIRECTORY}/deployment.ini" >> /usr/bin/start-mediadrop
10027 10027
 	chmod +x /usr/bin/start-mediadrop
10028 10028
 
10029 10029
 	# create daemon