From 55450af109ca6e5e55e5f1569b68649097a95a61 Mon Sep 17 00:00:00 2001 From: Lisa Marie Maginnis Date: Sun, 28 Feb 2016 16:40:50 -0500 Subject: [PATCH] fixes for plugins --- files/etc/init.d/install-mediagoblin/DEFAULT | 5 +++++ files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/files/etc/init.d/install-mediagoblin/DEFAULT b/files/etc/init.d/install-mediagoblin/DEFAULT index ac0f8b6..1e1b751 100755 --- 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 + 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 + cp -r mediagoblin-libreplanet/mediagoblin-libreplanet mediagoblin/mediagoblin/plugins/libreplanet fi cd mediagoblin @@ -34,6 +36,9 @@ if [ ! -d mediagoblin ]; then 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 diff --git a/files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT b/files/etc/mediagoblin-templates/mediagoblin.ini/DEFAULT index 3311372..42bab35 100644 --- 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]] -[[mediagoblin_libreplanet]] -[[mediagoblin_piwik]] +[[mediagoblin.plugins.libreplanet]] +[[mediagoblin.plugins.piwik]] PIWIK_DOMAIN = '*.media.libreplanet.org' PIWIK_LOCATION = 'piwik.fsf.org' PIWIK_SITEID = 11 -- 2.25.1