From d52fde1e1ce430236382ecb0b630b7446b096dc8 Mon Sep 17 00:00:00 2001
From: Jason Bau <jbau@stanford.edu>
Date: Wed, 15 May 2013 21:55:44 -0700
Subject: [PATCH] Changes to make this run on @jbau 's machine

* remove capa from requirements, bump versions of dogapi and simplejson
* comment out stuff done to /etc/facter
* comment out pkg_version() b/c it needs  '../version-script/version.py'
---
 .gitignore                            |  1 +
 fabfile/git.py                        | 30 +++++++++++++--------------
 fabric-requirements.txt               |  6 +++---
 playbooks/roles/common/tasks/main.yml | 10 +++++++--
 playbooks/roles/lms/tasks/main.yml    |  9 ++++++++
 5 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1377554ebea..b94898552f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.swp
+*.pyc
diff --git a/fabfile/git.py b/fabfile/git.py
index 8f4f719cf88..a57a53f136e 100644
--- a/fabfile/git.py
+++ b/fabfile/git.py
@@ -258,21 +258,21 @@ def deploy(auto_migrate=False):
             _install_gemfile(pkg)
             _install_npm_package(pkg)
 
-        with dog_stats_api.timer(metric_name, tags=repo_tags + ['step:fact']):
-            # drop a file for puppet so it knows that
-            # code is installed for the service
-            with cd('/etc/facter/facts.d'):
-                pkg_config = PackageInfo()
-                if pkg.repo_name in pkg_config.service_repos:
-                    # facts can't have dashes so they are converted
-                    # to underscores
-                    noopable(sudo)(
-                        'echo "{0}_installed=true" > {0}_installed.txt'.format(
-                        pkg.repo_name.replace("-", "_")))
-
-    with dog_stats_api.timer(metric_name, tags=package_tags +
-                             ['step:pkg_version']):
-        pkg_version()
+#        with dog_stats_api.timer(metric_name, tags=repo_tags + ['step:fact']):
+#            # drop a file for puppet so it knows that
+#            # code is installed for the service
+#            with cd('/etc/facter/facts.d'):
+#                pkg_config = PackageInfo()
+#                if pkg.repo_name in pkg_config.service_repos:
+#                    # facts can't have dashes so they are converted
+#                    # to underscores
+#                    noopable(sudo)(
+#                        'echo "{0}_installed=true" > {0}_installed.txt'.format(
+#                        pkg.repo_name.replace("-", "_")))
+
+#    with dog_stats_api.timer(metric_name, tags=package_tags +
+#                             ['step:pkg_version']):
+#        pkg_version()
 
     with dog_stats_api.timer(metric_name, tags=package_tags +
                              ['step:post_commands']):
diff --git a/fabric-requirements.txt b/fabric-requirements.txt
index 08efba62c03..1d628d30158 100644
--- a/fabric-requirements.txt
+++ b/fabric-requirements.txt
@@ -5,12 +5,12 @@ WebOb==1.2.3
 argparse==1.2.1
 beautifulsoup4==4.1.3
 boto==2.7.0
-capa==0.1
+#capa==0.1
 cloudformation==0.0.0
 decorator==3.4.0
 distribute==0.6.30
 docopt==0.6.1
-dogapi==1.1.2
+dogapi==1.2.3
 ipython==0.13.1
 jenkinsapi==0.1.11
 lxml==3.1beta1
@@ -24,7 +24,7 @@ pyrelic==0.2.0
 python-dateutil==2.1
 requests==1.1.0
 schema==0.1.1
-simplejson==3.0.7
+simplejson==3.3.0
 simples3==1.0-alpha
 six==1.2.0
 -e git+https://github.com/bos/statprof.py.git@a17f7923b102c9039763583be9e377e8422e8f5f#egg=statprof-dev
diff --git a/playbooks/roles/common/tasks/main.yml b/playbooks/roles/common/tasks/main.yml
index f566997158b..2ef1c49005b 100644
--- a/playbooks/roles/common/tasks/main.yml
+++ b/playbooks/roles/common/tasks/main.yml
@@ -3,13 +3,13 @@
 
 - name: Create application root
   # In the future consider making group edx r/t adm
-  file: path=$app_base_dir state=directory owner=root group=adm mode=2775 
+  file: path={{ app_base_dir}} state=directory owner=root group=adm mode=2775 
   tags:
   - pre_install
   - update
 
 - name: Create upload directory
-  file: path=$app_base_dir/uploads mode=2775 state=directory owner=root group=adm
+  file: path={{ app_base_dir }}/uploads mode=2775 state=directory owner=root group=adm
   tags:
   - pre_install
   - update
@@ -20,6 +20,12 @@
   - pre_install
   - update
   
+- name: Create staticfiles dir
+  file: path={{ app_base_dir}}/staticfiles state=directory owner=root group=adm mode=2775 
+  tags:
+  - pre_install
+  - update
+  
 - name: Install role-independent useful system packages
   # do this before log dir setup; rsyslog package guarantees syslog user present
   apt: pkg={{item}} install_recommends=yes state=present update_cache=yes
diff --git a/playbooks/roles/lms/tasks/main.yml b/playbooks/roles/lms/tasks/main.yml
index df6aa670f06..2494ec243b2 100644
--- a/playbooks/roles/lms/tasks/main.yml
+++ b/playbooks/roles/lms/tasks/main.yml
@@ -28,6 +28,15 @@
   - lms-env
   - update
 
+- name: Change owner on staticfiles
+  file: path={{ app_base_dir }}/staticfiles state=directory owner=www-data group=www-data
+  tags:
+  - cms
+  - lms
+  - lms-env
+  - update
+
+
 - name: Create lms log target directory
   file: path={{log_base_dir}}/lms state=directory owner=syslog group=adm mode=2770
   tags: