Browse Source

Switch command order

So that files definitely expore even if the sql access fails
Bob Mottram 7 years ago
parent
commit
5d872f0204

+ 2
- 2
src/freedombone-app-gnusocial View File

376
     fi
376
     fi
377
 
377
 
378
     # don't backup more data than we need to
378
     # don't backup more data than we need to
379
-    gnusocial-expire-posts
379
+    gnusocial-expire
380
 
380
 
381
     source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/backup
381
     source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/backup
382
     if [ ! -d $source_directory ]; then
382
     if [ ! -d $source_directory ]; then
456
     fi
456
     fi
457
 
457
 
458
     # don't backup more data than we need to
458
     # don't backup more data than we need to
459
-    gnusocial-expire-posts
459
+    gnusocial-expire
460
 
460
 
461
     source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/backup
461
     source_directory=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/backup
462
     if [ ! -d $source_directory ]; then
462
     if [ ! -d $source_directory ]; then

+ 2
- 2
src/freedombone-app-postactiv View File

392
     fi
392
     fi
393
 
393
 
394
     # don't backup more data than we need to
394
     # don't backup more data than we need to
395
-    postactiv-expire-posts
395
+    postactiv-expire
396
 
396
 
397
     source_directory=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/backup
397
     source_directory=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/backup
398
     if [ ! -d $source_directory ]; then
398
     if [ ! -d $source_directory ]; then
472
     fi
472
     fi
473
 
473
 
474
     # don't backup more data than we need to
474
     # don't backup more data than we need to
475
-    postactiv-expire-posts
475
+    postactiv-expire
476
 
476
 
477
     source_directory=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/backup
477
     source_directory=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/backup
478
     if [ ! -d $source_directory ]; then
478
     if [ ! -d $source_directory ]; then

+ 1
- 1
src/freedombone-utils-gnusocialtools View File

790
 
790
 
791
     gnusocial_expire_script=/usr/bin/${gnusocial_type}-expire
791
     gnusocial_expire_script=/usr/bin/${gnusocial_type}-expire
792
     echo '#!/bin/bash' > $gnusocial_expire_script
792
     echo '#!/bin/bash' > $gnusocial_expire_script
793
-    echo "/usr/bin/php $gnusocial_expire_posts_script" >> $gnusocial_expire_script
794
     echo "find /var/www/${domain_name}/htdocs/file/* -mtime +${expire_days} -exec rm {} +" >> $gnusocial_expire_script
793
     echo "find /var/www/${domain_name}/htdocs/file/* -mtime +${expire_days} -exec rm {} +" >> $gnusocial_expire_script
794
+    echo "/usr/bin/php $gnusocial_expire_posts_script" >> $gnusocial_expire_script
795
     chmod +x $gnusocial_expire_script
795
     chmod +x $gnusocial_expire_script
796
 
796
 
797
     # Add a cron job
797
     # Add a cron job