Beginning of ipfs

src/freedombone

@@ -2725,6 +2725,16 @@ function create_backup_script {
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
+  echo '# Backup IPFS' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo 'if [ -d /home/$MY_USERNAME/.ipfs ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo '  echo "Backing up IPFS"' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo "  if [ ! -d $USB_MOUNT/backup/ipfs ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo "    mkdir -p $USB_MOUNT/backup/ipfs" >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  backup_directory_to_usb '/home/$MY_USERNAME/.ipfs' 'ipfs'
+  echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
+  echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
+
   echo '# Backup Mutt settings' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo 'if [ -f /home/$MY_USERNAME/.muttrc ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  echo "Backing up Mutt settings"' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -3196,6 +3206,25 @@ function create_restore_script {
 
   RESTORE_SUBDIR='home/'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
+      RESTORE_SUBDIR='usb/backup/ipfs/'
+  fi
+  echo "if [ -d $USB_MOUNT/backup/ipfs ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '  echo "Restoring IPFS"' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  restore_directory_from_usb '/root/tempipfs' 'ipfs'
+  echo -n "  cp -f /root/tempipfs/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '$MY_USERNAME/tempbackup/ipfs/* /home/$MY_USERNAME/.ipfs' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    rm -rf /root/tempipfs' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '  rm -rf /root/tempipfs' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
+
+  RESTORE_SUBDIR='home/'
+  if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/ssh/'
   fi
   echo "if [ -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3998,6 +4027,16 @@ function backup_to_friends_servers {
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
+  echo '# Backup IPFS' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo 'if [ -d /home/$MY_USERNAME/.ipfs ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo '  echo "Backing up IPFS"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo '  if [ ! -d $SERVER_DIRECTORY/backup/ipfs ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo '    mkdir -p $SERVER_DIRECTORY/backup/ipfs' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  backup_directory_to_friend '/home/$MY_USERNAME/.ipfs' 'ipfs'
+  echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+
   echo '# Backup Mutt settings' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo 'if [ -f /home/$MY_USERNAME/.muttrc ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  echo "Backing up Mutt settings"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4526,6 +4565,23 @@ function restore_from_friend {
 
   RESTORE_SUBDIR='home'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
+      RESTORE_SUBDIR='remoterestore/backup/ipfs'
+  fi
+  echo 'if [ -d $SERVER_DIRECTORY/backup/ipfs ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '  echo "Restoring IPFS"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  restore_directory_from_friend /root/tempipfs ipfs
+  echo -n "  cp -f /root/tempipfs/${RESTORE_SUBDIR}/" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '$MY_USERNAME/tempbackup/ipfs/* /home/$MY_USERNAME/.ipfs' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '    rm -rf /root/tempipfs' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '    exit 276' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '  rm -rf /root/tempipfs' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+
+  RESTORE_SUBDIR='home'
+  if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='remoterestore/backup/ssh'
   fi
   echo 'if [ -d $SERVER_DIRECTORY/backup/ssh ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -9784,95 +9840,102 @@ function create_upgrade_script {
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo 'apt-get -y update' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo 'apt-get -y upgrade' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
-      echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '# Hubzilla' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/addon" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  fi
-  if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
-      echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '# GNU Social' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  fi
-  if grep -Fxq "install_blog" $COMPLETION_FILE; then
-      echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '# Blog' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "cd /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '#git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "#chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  fi
-  if grep -Fxq "install_owncloud_music_app" $COMPLETION_FILE; then
-      echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '# Owncloud music app' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "cd /usr/share/owncloud/apps/music" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  fi
-  if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
-      echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '# cjdns' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "cd /etc/cjdns" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  fi
-  if grep -Fxq "install_gogs" $COMPLETION_FILE; then
-      echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo '# gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo "mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'cd /home/git/go/src/github.com/gogits/gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'chown -R git:git /home/git' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'chmod 600 /home/git/go/src/github.com/gogits/gogs/custom/conf/app.ini' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'export GOPATH=/home/git/go' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'go get -u ./...' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'go build' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'systemctl restart gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-      echo 'systemctl daemon-reload' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  fi
-
+  echo "if grep -Fxq \"install_hubzilla\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # Hubzilla' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/addon" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME      
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "if grep -Fxq \"install_gnu_social\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # GNU Social' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "if grep -Fxq \"install_blog\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # Blog' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  #git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  #chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "if grep -Fxq \"install_owncloud_music_app\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # Owncloud music app' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd /usr/share/owncloud/apps/music" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "fi" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "if grep -Fxq \"mesh_cjdns\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # cjdns' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd /etc/cjdns" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "if grep -Fxq \"install_gogs\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  cd /home/git/go/src/github.com/gogits/gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  chown -R git:git /home/git' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  chmod 600 /home/git/go/src/github.com/gogits/gogs/custom/conf/app.ini' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  export GOPATH=/home/git/go' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  go get -u ./...' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  go build' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  systemctl restart gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  systemctl daemon-reload' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "if grep -Fxq \"install_ipfs\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  # ipfs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  chown -R git:git /home/git' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  export GOPATH=/home/git/go' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  go get -u github.com/ipfs/go-ipfs/cmd/ipfs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  systemctl restart ipfs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  systemctl daemon-reload' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo '# update tox node' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo "if [ -d $INSTALL_DIR/toxcore ]; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo "    cd $INSTALL_DIR/toxcore" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    autoreconf -i' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    ./configure --enable-daemon' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    systemctl restart tox-bootstrapd.service' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo "    cd $INSTALL_DIR/toxic" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd $INSTALL_DIR/toxcore" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  autoreconf -i' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  ./configure --enable-daemon' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  systemctl restart tox-bootstrapd.service' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd $INSTALL_DIR/toxic" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-
+  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo '# update email encryption script' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo "if [ -d $INSTALL_DIR/gpgit ]; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo "    cd $INSTALL_DIR/gpgit" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-  echo '    cp gpgit.pl /usr/bin' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo "  cd $INSTALL_DIR/gpgit" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+  echo '  cp gpgit.pl /usr/bin' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
-
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
   echo "echo '
 
@@ -10178,6 +10241,118 @@ function get_voip_server_password {
   fi
 }
 
+function install_ipfs {
+  if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
+      return
+  fi
+  if grep -Fxq "install_ipfs" $COMPLETION_FILE; then
+      return
+  fi
+  apt-get -y install golang libpam0g-dev fuse
+
+  if [ ! -d /home/git ]; then  
+      # add a gogs user account
+      adduser --disabled-login --gecos 'Gogs' git
+
+      # install Go
+      if ! grep -q "export GOPATH=/home/git/go" ~/.bashrc; then
+          echo 'export GOPATH=/home/git/go' >> ~/.bashrc
+          echo 'systemctl set-environment GOPATH=/home/git/go' >> ~/.bashrc
+      fi
+      . ~/.bashrc
+      export GOPATH=/home/git/go
+      if [ ! -d $GOPATH ]; then
+          mkdir -p $GOPATH
+      fi
+  fi
+
+  if ! grep -q 'GOPATH/bin' ~/.bashrc; then
+      echo 'export PATH="$GOPATH/bin:$PATH:";' >> ~/.bashrc
+      echo 'export PATH="$PATH:/usr/local/opt/go/libexec/bin";' >> ~/.bashrc
+  fi
+  . ~/.bashrc
+
+  # set gopath for the user
+  if ! grep -q "GOPATH=" /home/$MY_USERNAME/.bashrc; then
+      echo 'export GOPATH=/home/git/go' >> /home/$MY_USERNAME/.bashrc
+      echo 'export PATH="$GOPATH/bin:$PATH:";' >> /home/$MY_USERNAME/.bashrc
+      echo 'export PATH="$PATH:/usr/local/opt/go/libexec/bin";' >> /home/$MY_USERNAME/.bashrc
+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.bashrc
+  fi
+  
+  go get -u github.com/ipfs/go-ipfs/cmd/ipfs
+  if [ ! "$?" = "0" ]; then
+      exit 8242
+  fi
+
+  # initialise
+  su -c 'ipfs init -b 4096' - $MY_USERNAME
+  if [ ! -d /home/$MY_USERNAME/.ipfs ]; then
+      echo "IPFS could not be initialised for user $MY_USERNAME"
+      exit 7358
+  fi
+
+  IPFS_IDENTITY=$(ipfs refs local | tail -n 1 | tr '\n' ' ' | tr -d '[[:space:]]')
+  if [ ${#IPFS_IDENTITY} -lt 10 ]; then
+      echo 'IPFS identity shorter than expected'
+      echo "$IPFS_IDENTITY"
+      exit 82652
+  fi
+  if [[ $IPFS_IDENTITY == *" "* ]]; then
+      echo 'IPFS identity contains spaces'
+      exit 72585
+  fi
+
+  # directories to mount to
+  if [ ! -d /ipfs ]; then
+      mkdir /ipfs
+      mkdir /ipns
+      chown $MY_USERNAME:$MY_USERNAME /ipfs
+      chown $MY_USERNAME:$MY_USERNAME /ipns
+  fi
+
+  if [-f /etc/fuse.conf ]; then
+      chown $MY_USERNAME:$MY_USERNAME /etc/fuse.conf
+  fi
+  if [ -f /dev/fuse ]; then
+      chown $MY_USERNAME:$MY_USERNAME /dev/fuse
+  fi
+  
+  echo '[Unit]' > /etc/systemd/system/ipfs.service
+  echo 'Description=IPFS daemon' >> /etc/systemd/system/ipfs.service
+  echo 'After=syslog.target' >> /etc/systemd/system/ipfs.service
+  echo 'After=network.target' >> /etc/systemd/system/ipfs.service
+  echo '' >> /etc/systemd/system/ipfs.service
+  echo '[Service]' >> /etc/systemd/system/ipfs.service
+  echo 'Type=simple' >> /etc/systemd/system/ipfs.service
+  echo 'User=git' >> /etc/systemd/system/ipfs.service
+  echo 'Group=git' >> /etc/systemd/system/ipfs.service
+  echo 'WorkingDirectory=/home/git/go/src/github.com/ipfs/go-ipfs' >> /etc/systemd/system/ipfs.service
+  echo 'ExecStart=/home/git/go/bin/ipfs daemon --mount' >> /etc/systemd/system/ipfs.service
+  echo 'Restart=on-failure' >> /etc/systemd/system/ipfs.service
+  echo 'Environment="USER=git" "HOME=/home/git" "GOPATH=/home/git/go"' >> /etc/systemd/system/ipfs.service
+  echo '' >> /etc/systemd/system/ipfs.service
+  echo '[Install]' >> /etc/systemd/system/ipfs.service
+  echo 'WantedBy=multi-user.target' >> /etc/systemd/system/ipfs.service
+  
+  systemctl enable ipfs
+  systemctl daemon-reload
+  systemctl restart ipfs
+
+  if ! grep -q "IPFS Identity" /home/$MY_USERNAME/README; then
+      echo '' >> /home/$MY_USERNAME/README
+      echo '' >> /home/$MY_USERNAME/README
+      echo 'IPFS' >> /home/$MY_USERNAME/README
+      echo '====' >> /home/$MY_USERNAME/README
+      echo "IPFS Identity: $IPFS_IDENTITY" >> /home/$MY_USERNAME/README
+      echo '' >> /home/$MY_USERNAME/README
+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
+      chmod 600 /home/$MY_USERNAME/README
+  fi
+
+  echo 'install_ipfs' >> $COMPLETION_FILE
+}
+
 function install_voip {
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
       return
@@ -10376,6 +10551,7 @@ install_hubzilla
 install_dlna_server
 configure_firewall_for_dlna
 install_mediagoblin
+#install_ipfs
 repair_databases_script
 create_backup_script
 create_restore_script