fixes for plugins

diff --git a/files/etc/init.d/install-mediagoblin/DEFAULT b/files/etc/init.d/install-mediagoblin/DEFAULT
index ac0f8b6cc0a261ed4aed718769f4e6cd44dfae62..1e1b751181d9cde40b1b56b57641a4e153b4c773 100755 (executable)
--- a/files/etc/init.d/install-mediagoblin/DEFAULT
+++ b/files/etc/init.d/install-mediagoblin/DEFAULT
@@ -19,10 +19,12 @@ if [ ! -d mediagoblin ]; then
 
     if [ ! -d mediagoblin-piwik ]; then
        sudo -u mediagoblin git clone https://github.com/ayleph/mediagoblin-piwik
 
     if [ ! -d mediagoblin-piwik ]; then
        sudo -u mediagoblin git clone https://github.com/ayleph/mediagoblin-piwik

+       cp -r mediagoblin-piwik/piwik mediagoblin/mediagoblin/plugins/

     fi
 
     if [ ! -d mediagoblin-libreplanet ]; then
        sudo -u mediagoblin git clone https://vcs.fsf.org/git/mediagoblin-libreplanet.git
     fi
 
     if [ ! -d mediagoblin-libreplanet ]; then
        sudo -u mediagoblin git clone https://vcs.fsf.org/git/mediagoblin-libreplanet.git

+       cp -r mediagoblin-libreplanet/mediagoblin-libreplanet mediagoblin/mediagoblin/plugins/libreplanet

     fi
 
     cd mediagoblin
     fi
 
     cd mediagoblin


@@ -34,6 +36,9 @@ if [ ! -d mediagoblin ]; then
 
     sudo -u mediagoblin cp /etc/mediagoblin-templates/mediagoblin.ini mediagoblin_local.ini
 
 
     sudo -u mediagoblin cp /etc/mediagoblin-templates/mediagoblin.ini mediagoblin_local.ini
 

+    # https://issues.mediagoblin.org/ticket/5373
+    sudo -u mediagoblin ./bin/easy_install flup==1.0.3.dev-20110405
+

     sudo -u mediagoblin ./bin/gmg dbupdate
 
     update-rc.d mediagoblin-paster defaults
     sudo -u mediagoblin ./bin/gmg dbupdate
 
     update-rc.d mediagoblin-paster defaults

diff --git a/files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT b/files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT
index 3311372c2015e899fbc436bf456fc8e240cd0bff..42bab35ec2d5ca6a72401079915174e0720580cd 100644 (file)
--- a/files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT
+++ b/files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT
@@ -67,8 +67,8 @@ mime_types = video/webm, application/ogg
 dimensions_match = False
 video_codecs = VP8 video, Theora
 [[mediagoblin.media_types.pdf]]
 dimensions_match = False
 video_codecs = VP8 video, Theora
 [[mediagoblin.media_types.pdf]]

-[[mediagoblin_libreplanet]]
-[[mediagoblin_piwik]]
+[[mediagoblin.plugins.libreplanet]]
+[[mediagoblin.plugins.piwik]]

 PIWIK_DOMAIN = '*.media.libreplanet.org'
 PIWIK_LOCATION = 'piwik.fsf.org'
 PIWIK_SITEID = 11
 PIWIK_DOMAIN = '*.media.libreplanet.org'
 PIWIK_LOCATION = 'piwik.fsf.org'
 PIWIK_SITEID = 11