Browse Source

Simplify expire script

Bob Mottram 7 years ago
parent
commit
1197ace0c9
1 changed files with 3 additions and 4 deletions
  1. 3
    4
      src/freedombone-app-pleroma

+ 3
- 4
src/freedombone-app-pleroma View File

98
     echo 'if [[ "$plmonths" == "0" ]]; then' >> $pleroma_expire_posts_script
98
     echo 'if [[ "$plmonths" == "0" ]]; then' >> $pleroma_expire_posts_script
99
     echo '    exit 2' >> $pleroma_expire_posts_script
99
     echo '    exit 2' >> $pleroma_expire_posts_script
100
     echo 'fi' >> $pleroma_expire_posts_script
100
     echo 'fi' >> $pleroma_expire_posts_script
101
-    echo -n 'oldate=$(date +%Y-%m-%d --date="' >> $pleroma_expire_posts_script
102
-    echo -n "$PLEROMA_EXPIRE_MONTHS" >> $pleroma_expire_posts_script
103
-    echo ' months ago")' >> $pleroma_expire_posts_script
101
+    echo 'oldate=$(date +%Y-%m-%d --date="$plmonths months ago")' >> $pleroma_expire_posts_script
102
+    echo 'cd /etc/postgresql' >> $pleroma_expire_posts_script
104
     echo "sudo -u postgres psql -d pleroma -c \"DELETE FROM notifications WHERE inserted_at <= '\$oldate 01:01:01'\"" >> $pleroma_expire_posts_script
103
     echo "sudo -u postgres psql -d pleroma -c \"DELETE FROM notifications WHERE inserted_at <= '\$oldate 01:01:01'\"" >> $pleroma_expire_posts_script
105
     echo "sudo -u postgres psql -d pleroma -c \"DELETE FROM objects WHERE inserted_at <= '\$oldate 01:01:01'\"" >> $pleroma_expire_posts_script
104
     echo "sudo -u postgres psql -d pleroma -c \"DELETE FROM objects WHERE inserted_at <= '\$oldate 01:01:01'\"" >> $pleroma_expire_posts_script
106
     chmod +x $pleroma_expire_posts_script
105
     chmod +x $pleroma_expire_posts_script
108
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
107
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
109
     echo '#!/bin/bash' > $pleroma_expire_script
108
     echo '#!/bin/bash' > $pleroma_expire_script
110
     echo "find /etc/pleroma/uploads/* -mtime +${expire_days_files} -exec rm -rf {} +" >> $pleroma_expire_script
109
     echo "find /etc/pleroma/uploads/* -mtime +${expire_days_files} -exec rm -rf {} +" >> $pleroma_expire_script
111
-    echo "$pleroma_expire_posts_script" >> $pleroma_expire_script
110
+    echo "$pleroma_expire_posts_script 2> /dev/null" >> $pleroma_expire_script
112
     chmod +x $pleroma_expire_script
111
     chmod +x $pleroma_expire_script
113
 
112
 
114
     # remove any old cron job
113
     # remove any old cron job