From 6df222677755ae50ec32655147a211f1f6689d7f Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Fri, 29 Jun 2012 09:37:14 -0400
Subject: [PATCH 1/3] updating URL for activation email to edx4edx

---
 lms/templates/emails/activation_email.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index a3ea03af23..eca5effdd6 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -6,7 +6,7 @@ this address into your web browser's address bar:
 % if is_secure:
   https://${ site }/activate/${ key }
 % else:
-  http://ichuang.mitx.mit.edu/activate/${ key }
+  http://edx4edx.mitx.mit.edu/activate/${ key }
 % endif
 
 If you didn't request this, you don't need to do anything; you won't

From 6229b2d1f412248da416bda589e6942ecfb21069 Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Fri, 29 Jun 2012 13:14:36 -0400
Subject: [PATCH 2/3] updating rakefile to cleanup on package removal

---
 rakefile | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/rakefile b/rakefile
index 6442d60957..dff41fbe4e 100644
--- a/rakefile
+++ b/rakefile
@@ -112,6 +112,24 @@ task :package do
     FileUtils.mkdir_p(BUILD_DIR)
     
     Dir.chdir(BUILD_DIR) do
+        afterremove = Tempfile.new('afterremove')
+        afterremove.write <<-AFTERREMOVE.gsub(/^\s*/, '')
+        #! /bin/sh
+        set -e
+        set -x
+        
+        # to be a little safer this rm is executed
+        # as the makeitso user and is careful
+        # about what it removes
+
+        if [ -d #{INSTALL_DIR_PATH} ]; then
+            sudo -u makeitso rm -rf #{INSTALL_DIR_PATH}/{common,cms,lms,*.pyc}
+            sudo -u makeitso rmdir #{INSTALL_DIR_PATH} 
+        fi
+
+        AFTERREMOVE
+        afterremove.close()
+        FileUtils.chmod(0755, afterremove.path)
 
         postinstall = Tempfile.new('postinstall')
         postinstall.write <<-POSTINSTALL.gsub(/^\s*/, '')
@@ -137,6 +155,7 @@ task :package do
         args = ["fakeroot", "fpm", "-s", "dir", "-t", "deb",
             "--verbose",
             "--after-install=#{postinstall.path}",
+            "--after-remove=#{afterremove.path}",
             "--prefix=#{INSTALL_DIR_PATH}",
             "--exclude=**/build/**",
             "--exclude=**/rakefile",

From d61d0845994755555f1e8a9e8c3ff7fe6ea839af Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Fri, 29 Jun 2012 13:33:14 -0400
Subject: [PATCH 3/3] postrm update

---
 rakefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/rakefile b/rakefile
index dff41fbe4e..74e1da4505 100644
--- a/rakefile
+++ b/rakefile
@@ -114,17 +114,15 @@ task :package do
     Dir.chdir(BUILD_DIR) do
         afterremove = Tempfile.new('afterremove')
         afterremove.write <<-AFTERREMOVE.gsub(/^\s*/, '')
-        #! /bin/sh
+        #! /bin/bash
         set -e
         set -x
         
         # to be a little safer this rm is executed
-        # as the makeitso user and is careful
-        # about what it removes
+        # as the makeitso user
 
-        if [ -d #{INSTALL_DIR_PATH} ]; then
-            sudo -u makeitso rm -rf #{INSTALL_DIR_PATH}/{common,cms,lms,*.pyc}
-            sudo -u makeitso rmdir #{INSTALL_DIR_PATH} 
+        if [[ -d "#{INSTALL_DIR_PATH}" ]]; then
+            sudo -u makeitso rm -rf "#{INSTALL_DIR_PATH}"
         fi
 
         AFTERREMOVE