Browse Source

Mediagoblin tweaks

Bob Mottram 10 years ago
parent
commit
e1e8b3772c
1 changed files with 11 additions and 3 deletions
  1. 11
    3
      src/freedombone

+ 11
- 3
src/freedombone View File

@@ -8369,8 +8369,9 @@ function install_mediagoblin {
8369 8369
   apt-get -y install git-core python python-dev python-lxml python-imaging python-virtualenv
8370 8370
   apt-get -y install postgresql postgresql-client python-psycopg2
8371 8371
   apt-get -y install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject
8372
-  apt-get -y install gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-libav
8372
+  apt-get -y install gstreamer1.0-plugins-good gstreamer1.0-libav libav-tools gstreamer0.10-tools
8373 8373
   apt-get -y install python-numpy python-scipy libsndfile1-dev python-gst0.10-dev
8374
+  apt-get -y install gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer1.0-tools
8374 8375
   su -c "createuser -A -D mediagoblin" - postgres
8375 8376
   su -c "createdb -E UNICODE -O mediagoblin mediagoblin" - postgres
8376 8377
   adduser --disabled-login --gecos 'Mediagoblin' mediagoblin
@@ -8401,6 +8402,7 @@ function install_mediagoblin {
8401 8402
   fi
8402 8403
   sed -i 's|# sql_engine.*|sql_engine = postgresql:///mediagoblin|g' $MEDIAGOBLIN_PATH/mediagoblin_local.ini
8403 8404
   sed -i "s/email_sender_address.*/email_sender_address = \"$MY_EMAIL_ADDRESS\"/g" $MEDIAGOBLIN_PATH/mediagoblin_local.ini
8405
+  sed -i 's|email_debug_mode.*|email_debug_mode = false|g' $MEDIAGOBLIN_PATH/mediagoblin_local.ini
8404 8406
 
8405 8407
   # add extra media types
8406 8408
   if ! grep -q "media_types.stl" $MEDIAGOBLIN_PATH/mediagoblin_local.ini; then
@@ -8413,6 +8415,8 @@ function install_mediagoblin {
8413 8415
       echo '[[mediagoblin.media_types.video]]' >> $MEDIAGOBLIN_PATH/mediagoblin_local.ini
8414 8416
   fi
8415 8417
 
8418
+  #su -c 'cd $MEDIAGOBLIN_PATH; ./bin/pip install scikits.audiolab' - mediagoblin
8419
+
8416 8420
   #su -c "cd $MEDIAGOBLIN_PATH; git submodule update && ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate" - mediagoblin
8417 8421
   su -c "cd $MEDIAGOBLIN_PATH; ./bin/gmg dbupdate" - mediagoblin
8418 8422
 
@@ -8427,10 +8431,13 @@ function install_mediagoblin {
8427 8431
   echo '    location / {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8428 8432
   echo '        proxy_pass http://localhost:6543;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8429 8433
   echo '    }' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8430
-  echo '    location ^~ /user/ {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8434
+  echo '    location ^~ /auth/ {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8435
+  echo '        rewrite ^ https://$server_name$request_uri?;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8436
+  echo '    }' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8437
+  echo '    location ^~ /u/ {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8431 8438
   echo '        rewrite ^ https://$server_name$request_uri?;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8432 8439
   echo '    }' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8433
-  echo '    location ^~ /admin/ {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8440
+  echo '    location ^~ /submit/ {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8434 8441
   echo '        rewrite ^ https://$server_name$request_uri?;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8435 8442
   echo '    }' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8436 8443
   echo '}' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
@@ -8484,6 +8491,7 @@ function install_mediagoblin {
8484 8491
   nginx_ensite $MEDIAGOBLIN_DOMAIN_NAME
8485 8492
   service php5-fpm restart
8486 8493
   service nginx restart
8494
+  /usr/sbin/nginx -s reload
8487 8495
 
8488 8496
   # update the dynamic DNS
8489 8497
   CURRENT_DDNS_DOMAIN=$MEDIAGOBLIN_DOMAIN_NAME