From 5d872f0204c030217f59ed3aa8c18be97246f600 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 9 Jul 2017 17:19:26 +0100
Subject: [PATCH] Switch command order

So that files definitely expore even if the sql access fails
---
 src/freedombone-app-gnusocial        | 4 ++--
 src/freedombone-app-postactiv        | 4 ++--
 src/freedombone-utils-gnusocialtools | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 8ae9b261..6358d969 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -376,7 +376,7 @@ function backup_local_gnusocial {
     fi
 
     # don't backup more data than we need to
-    gnusocial-expire-posts
+    gnusocial-expire
 
     source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/backup
     if [ ! -d $source_directory ]; then
@@ -456,7 +456,7 @@ function backup_remote_gnusocial {
     fi
 
     # don't backup more data than we need to
-    gnusocial-expire-posts
+    gnusocial-expire
 
     source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/backup
     if [ ! -d $source_directory ]; then
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index 3fce6b08..8c43d48b 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -392,7 +392,7 @@ function backup_local_postactiv {
     fi
 
     # don't backup more data than we need to
-    postactiv-expire-posts
+    postactiv-expire
 
     source_directory=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/backup
     if [ ! -d $source_directory ]; then
@@ -472,7 +472,7 @@ function backup_remote_postactiv {
     fi
 
     # don't backup more data than we need to
-    postactiv-expire-posts
+    postactiv-expire
 
     source_directory=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/backup
     if [ ! -d $source_directory ]; then
diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index c575f914..ba5b4fd9 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -790,8 +790,8 @@ function expire_gnusocial_posts {
 
     gnusocial_expire_script=/usr/bin/${gnusocial_type}-expire
     echo '#!/bin/bash' > $gnusocial_expire_script
-    echo "/usr/bin/php $gnusocial_expire_posts_script" >> $gnusocial_expire_script
     echo "find /var/www/${domain_name}/htdocs/file/* -mtime +${expire_days} -exec rm {} +" >> $gnusocial_expire_script
+    echo "/usr/bin/php $gnusocial_expire_posts_script" >> $gnusocial_expire_script
     chmod +x $gnusocial_expire_script
 
     # Add a cron job