From 70ebc96b9ef1431ac1128d2dac6d08af237777a4 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 4 May 2016 15:59:57 -0400
Subject: work-in-progress fixes for mediagoblin

---
 roles/mediagoblin/tasks/mediagoblin.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'roles/mediagoblin/tasks')

diff --git a/roles/mediagoblin/tasks/mediagoblin.yml b/roles/mediagoblin/tasks/mediagoblin.yml
index b7df031..29929c3 100644
--- a/roles/mediagoblin/tasks/mediagoblin.yml
+++ b/roles/mediagoblin/tasks/mediagoblin.yml
@@ -6,6 +6,7 @@
     - python3-pil
     - python3-virtualenv
     - python3-babel
+    - python3-pip
     - virtualenv
     - automake
     - npm           # XXX: really? UGH
@@ -46,14 +47,6 @@
         state=directory
         owner={{ mediagoblin_user }}
 
-- name: Create virtualenv
-  shell: 
-    virtualenv --python=python3 --system-site-packages . 
-    chdir="{{mediagoblin_basedir}}/src"
-    creates="{{mediagoblin_basedir}}/src/bin/python"
-  sudo: yes
-  sudo_user: "{{ mediagoblin_user }}"
-
 - name: Build mediagoblin
   shell:
     ./bootstrap.sh && ./configure -with-python3 && make
@@ -62,10 +55,10 @@
   sudo: yes
   sudo_user: "{{ mediagoblin_user }}"
 
-- name: Install flup in virtualenv
-  easy_install: 
-    name=flup
-    virtualenv="{{ mediagoblin_basedir }}"/src
+- name: Install flup6 in virtualenv
+  shell: "{{ mediagoblin_basedir }}/src/bin/pip install flup6"
+  args:
+    chdir="{{ mediagoblin_basedir }}"/src
   sudo: yes
   sudo_user: "{{ mediagoblin_user }}"
 
@@ -78,11 +71,11 @@
 
 - name: Copy mediagoblin config
   template: src=mediagoblin_local.ini.j2
-            dest=/srv/mediagoblin/src/mediagoblin_local.ini
+            dest={{ mediagoblin_basedir}}/src/mediagoblin_local.ini
 
 - name: Copy mediagoblin paste config
   template: src=paste_local.ini.j2
-            dest=/srv/mediagoblin/src/paste_local.ini
+            dest={{ mediagoblin_basedir }}/src/paste_local.ini
 
 - name: Copy generic mediagoblin nginx site configuration
   template: src=etc_nginx_sites-available_mediagoblin.j2
-- 
cgit v1.2.3