diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin index 9c797de0..78bb84d5 100755 --- a/src/freedombone-app-mediagoblin +++ b/src/freedombone-app-mediagoblin @@ -210,7 +210,7 @@ function install_mediagoblin { install_nodejs mediagoblin apt-get install -yq python python-dev python-lxml python-imaging python-virtualenv - apt-get install -yq automake perl sqlite + apt-get install -yq automake perl sqlite python-paste python-pastedeploy python-pastescript useradd -c "GNU MediaGoblin system account" -d /var/lib/mediagoblin -m -r -g www-data mediagoblin groupadd mediagoblin usermod --append -G mediagoblin mediagoblin @@ -225,7 +225,7 @@ function install_mediagoblin { su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ./bootstrap.sh" -mediagoblin su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ./configure" - mediagoblin su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && make" - mediagoblin - su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && bin/easy_install flup==1.0.3.dev-20110405" - mediaGoblin + su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && bin/easy_install flup==1.0.3.dev-20110405" - mediagoblin su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ln -s /var/lib/mediagoblin user_dev" - mediagoblin su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && bash -c 'cp -av mediagoblin.ini mediagoblin_local.ini && cp -av paste.ini paste_local.ini'" - mediagoblin su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && perl -pi -e 's|.*sql_engine = .*|sql_engine = sqlite:////var/lib/mediagoblin/mediagoblin.db|' mediagoblin_local.ini" - mediagoblin @@ -253,6 +253,7 @@ function install_mediagoblin { MEDIAGOBLIN_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})" fi fi + ${PROJECT_NAME}-pass -u $MY_USERNAME -a mediagoblin -p "$MEDIAGOBLIN_ADMIN_PASSWORD" MEDIAGOBLIN_ONION_HOSTNAME=$(add_onion_service mediagoblin 80 ${MEDIAGOBLIN_ONION_PORT}) set_completion_param "mediagoblin domain" "${MEDIAGOBLIN_DOMAIN_NAME}" @@ -399,8 +400,6 @@ function install_mediagoblin { function_check add_ddns_domain add_ddns_domain $MEDIAGOBLIN_DOMAIN_NAME - ${PROJECT_NAME}-pass -u $MY_USERNAME -a mediagoblin -p "$MEDIAGOBLIN_ADMIN_PASSWORD" - APP_INSTALLED=1 }