use one version of ffmpeg for all tasks, remove avconv dependency, fixes #2606
This commit is contained in:
parent
e44703854e
commit
e1bc418e0c
6 changed files with 61 additions and 161 deletions
25
README
25
README
|
|
@ -3,9 +3,9 @@ pan.do/ra - open media archive
|
|||
for more information on pan.do/ra visit our website at https://pan.do/ra
|
||||
|
||||
== SETUP ==
|
||||
pan.do/ra is known to work with Ubuntu 12.04,
|
||||
pan.do/ra is known to work with Ubuntu 14.04,
|
||||
but other distributions should also work.
|
||||
The instructions below are for Ubuntu 12.04.
|
||||
The instructions below are for Ubuntu 14.04.
|
||||
All commans given expect that you are root.
|
||||
|
||||
To run pan.do/ra you need to install and setup:
|
||||
|
|
@ -18,7 +18,7 @@ To run pan.do/ra you need to install and setup:
|
|||
* Installing required packages
|
||||
1) add pandora ppa to get all packages in the required version
|
||||
|
||||
apt-get install python-software-properties
|
||||
apt-get install software-properties-common
|
||||
add-apt-repository ppa:j/pandora
|
||||
apt-get update
|
||||
|
||||
|
|
@ -28,9 +28,8 @@ To run pan.do/ra you need to install and setup:
|
|||
python-dev python-imaging python-numpy python-psycopg2 \
|
||||
python-geoip python-html5lib python-lxml \
|
||||
postgresql postgresql-contrib rabbitmq-server \
|
||||
ffmpeg2theora libav-tools libavcodec-extra-53 melt \
|
||||
python-ox oxframe imagemagick poppler-utils mkvtoolnix gpac
|
||||
|
||||
poppler-utils mkvtoolnix gpac imagemagick \
|
||||
python-ox oxframe ffmpeg
|
||||
|
||||
* Prepare Environment
|
||||
1) add pandora user and set permissions
|
||||
|
|
@ -44,7 +43,7 @@ To run pan.do/ra you need to install and setup:
|
|||
exit
|
||||
|
||||
3) Setup RabbitMQ
|
||||
Important: "use_your_own" is a password and you have to use the same value here and below for BROKER_PASSWORD
|
||||
Important: "use_your_own" is a password and you have to use the same value here and below for BROKER_URL
|
||||
|
||||
rabbitmqctl add_user pandora use_your_own
|
||||
rabbitmqctl add_vhost /pandora
|
||||
|
|
@ -77,7 +76,7 @@ Important: "use_your_own" is a password and you have to use the same value here
|
|||
}
|
||||
}
|
||||
DB_GIN_TRGM = True
|
||||
BROKER_PASSWORD = "use_your_own"
|
||||
BROKER_URL = 'amqp://pandora:<use_your_own>@localhost:5672//pandora'
|
||||
|
||||
#with apache x-sendfile or lighttpd set this to True
|
||||
XSENDFILE = False
|
||||
|
|
@ -143,14 +142,10 @@ To update a pandora installation get the latest version from bzr by running
|
|||
|
||||
this will update pandora/oxjs/python-ox and list possible upgrades to the db
|
||||
|
||||
to update your database tables, use
|
||||
to update your database run:
|
||||
su pandora
|
||||
cd /srv/pandora/pandora
|
||||
./manage.py sqldiff -a
|
||||
to check if there are changes and
|
||||
./manage.py sqldiff -a | ./manage.py dbshell
|
||||
to apply them.
|
||||
|
||||
cd /srv/pandora
|
||||
./update.py db
|
||||
|
||||
=== Development ===
|
||||
in one terminal:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue