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

mediadrop in progress

This commit is contained in:
Bob Mottram 2016-06-15 08:23:32 +01:00
parent 0c1317b566
commit 6335678be7
1 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/freedombone
View File

@ -194,6 +194,16 @@ MEDIAGOBLIN_COMMIT='d1ac2d52fd8859c3f32fa38e4836ffe9615e5bba'
MEDIAGOBLIN_ADMIN_PASSWORD=
MEDIAGOBLIN_ONION_PORT=8096
#mediadrop
MEDIA_SERVER_DOMAIN_NAME=
MEDIA_SERVER_CODE=
MEDIA_SERVER_BASE_DIRECTORY=/var/www/media
MEDIA_SERVER_WORKING_DIRECTORY=${MEDIA_SERVER_BASE_DIRECTORY}/mediadrop
MEDIA_SERVER_REPO="https://github.com/mediadrop/mediadrop"
MEDIA_SERVER_COMMIT='ad44f47d99b5d57d3396a3afb80d68a4a182dadd'
MEDIA_SERVER_ONION_PORT=8098
MEDIA_SERVER_ADMIN_PASSWORD=
# Domain name for microblog installation
MICROBLOG_DOMAIN_NAME=
MICROBLOG_CODE=
@ -1309,6 +1319,21 @@ function read_configuration {
if grep -q "HWRNG_TYPE" $CONFIGURATION_FILE; then
HWRNG_TYPE=$(grep "HWRNG_TYPE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "MEDIA_SERVER_ADMIN_PASSWORD" $CONFIGURATION_FILE; then
MEDIA_SERVER_ADMIN_PASSWORD=$(grep "MEDIA_SERVER_ADMIN_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "MEDIA_SERVER_DOMAIN_NAME" $CONFIGURATION_FILE; then
MEDIA_SERVER_DOMAIN_NAME=$(grep "MEDIA_SERVER_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "MEDIA_SERVER_CODE" $CONFIGURATION_FILE; then
MEDIA_SERVER_CODE=$(grep "MEDIA_SERVER_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "MEDIA_SERVER_REPO" $CONFIGURATION_FILE; then
MEDIA_SERVER_REPO=$(grep "MEDIA_SERVER_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "MEDIA_SERVER_COMMIT" $CONFIGURATION_FILE; then
MEDIA_SERVER_COMMIT=$(grep "MEDIA_SERVER_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
if grep -q "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE; then
MEDIAGOBLIN_DOMAIN_NAME=$(grep "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
@ -3262,6 +3287,14 @@ function get_mariadb_password {
fi
}
function get_mariadb_media_server_admin_password {
if [ -f /home/$MY_USERNAME/README ]; then
if grep -q "MariaDB media server admin password" /home/$MY_USERNAME/README; then
MEDIA_SERVER_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB media server admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
fi
fi
}
function get_mariadb_gnusocial_admin_password {
if [ -f /home/$MY_USERNAME/README ]; then
if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
@ -9861,13 +9894,6 @@ function install_dlna_server {
echo 'install_dlna_server' >> $COMPLETION_FILE
}
MEDIA_SERVER_DOMAIN_NAME=
MEDIA_SERVER_BASE_DIRECTORY=/var/www
MEDIA_SERVER_WORKING_DIRECTORY=${MEDIA_SERVER_BASE_DIRECTORY}/mediadrop
MEDIA_SERVER_REPO="https://github.com/mediadrop/mediadrop"
MEDIA_SERVER_COMMIT='ad44f47d99b5d57d3396a3afb80d68a4a182dadd'
MEDIADROP_VERSION='0.11.0'
function install_media_server {
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
return
@ -9896,6 +9922,21 @@ function install_media_server {
mkdir -p $MEDIA_SERVER_BASE_DIRECTORY
fi
install_mariadb
get_mariadb_password
repair_databases_script
get_mariadb_media_server_admin_password
if [ ! $MEDIA_SERVER_ADMIN_PASSWORD ]; then
if [ -f $IMAGE_PASSWORD_FILE ]; then
MEDIA_SERVER_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
else
MEDIA_SERVER_ADMIN_PASSWORD="$(openssl rand -base64 32 | cut -c1-${MINIMUM_PASSWORD_LENGTH})"
fi
fi
create_database mediadrop "$MEDIA_SERVER_ADMIN_PASSWORD" $MY_USERNAME
# create python environment
cd $MEDIA_SERVER_BASE_DIRECTORY
virtualenv --distribute --no-site-packages venv