Merge branch 'cas-user-whitelist' into 'nightly'

[quix0rs-gnu-social.git] / UPGRADE

diff --git a/UPGRADE b/UPGRADE
index 3a1dd8a9b9a3b324ababe0256476790c57992b29..c175ee4f878c91cee8797d56dff9134f8e1bca7c 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -11,6 +11,9 @@ and follow this procedure:
 0. Backup your data. The StatusNet upgrade discussions below have some
     guidelines to back up the database and files (mysqldump and rsync).
 
+    MAKE SURE YOU ARE THE SAME USER THAT RUNS THE PHP FILES WHILE PERFORMING
+    THE COMMANDS BELOW (I usually prepend the commands with 'sudo -u social')
+
 1. Stop your queue daemons (you can run this command even if you do not
     use the queue daemons):
     $ bash scripts/stopdaemons.sh
@@ -75,14 +78,13 @@ variant of this command (you will be prompted for the database password):
     will be the local files such as avatars, config and files:
 
         avatar/*
-        background/*
         file/*
         local/*
         .htaccess
         config.php
 
     This command will point you in the right direction on how to do it:
-    $ rsync -avP statusnet/{.htaccess,avatar,background,file,local,config.php} gnusocial/
+    $ rsync -avP statusnet/{.htaccess,avatar,file,local,config.php} gnusocial/
 
 4. Replace your old StatusNet directory with the new GNU social
     directory in your webserver root.