Split up source and source_link. Never trust HTML!

[quix0rs-gnu-social.git] / UPGRADE

diff --git a/UPGRADE b/UPGRADE
index e7b29c34dd33b58bea46514739a8038be4405cae..aaf9109e397b4542b9247297f3a89bf103e66152 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -27,13 +27,23 @@ and follow this procedure:
    The upgrade script will likely take a long time because it will
     upgrade the tables to another character encoding and make other
     automated upgrades. Make sure it ends without errors. If you get
-    errors, create a new task on https://bugz.foocorp.net/
+    errors, create a new task on https://git.gnu.io/gnu/gnu-social/issues
 
 4. Start your queue daemons again (you can run this command even if you
     do not use the queue daemons):
     $ bash scripts/startdaemons.sh
 
-5. Report any issues at https://bugz.foocorp.net/ (tag GNU social)
+5. Report any issues at https://git.gnu.io/gnu/gnu-social/issues
+
+If you are using ssh keys to log in to your server, you can make this
+procedure pretty painless (assuming you have automated backups already).
+Make sure you "cd" into the correct directory (in this case "htdocs")
+and use the correct login@hostname combo:
+    $ ssh social@domain.example 'cd htdocs
+            && bash scripts/stopdaemons.sh
+            && git pull
+            && time php scripts/upgrade.php
+            && bash scripts/startdaemons.sh'
 
 StatusNet 1.1.x to GNU social 1.2.x
 -----------------------------------
@@ -59,20 +69,19 @@ variant of this command (you will be prompted for the database password):
 
 2. Unpack your GNU social code to a fresh directory. You can do this
     by cloning our git repository:
-    $ git clone https://gitorious.org/social/mainline.git gnusocial
+    $ git clone https://git.gnu.io/gnu/gnu-social.git gnusocial
 
 3. Synchronize your local files to the GNU social directory. These 
     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.
@@ -81,8 +90,8 @@ variant of this command (you will be prompted for the database password):
    The upgrade script will likely take a long time because it will
     upgrade the tables to another character encoding and make other
     automated upgrades. Make sure it ends without errors. If you get
-    errors, create a new task on https://bugz.foocorp.net/
+    errors, create a new task on https://git.gnu.io/gnu/gnu-social/issues
 
 6. Start your queue daemons: 'bash scripts/startdaemons.sh'
 
-7. Report any issues at https://bugz.foocorp.net/ (tag GNU social)
+7. Report any issues at https://git.gnu.io/gnu/gnu-social/issues