瀏覽代碼

Simpler pleroma expire script

Bob Mottram 7 年之前
父節點
當前提交
58de604cb4
共有 1 個檔案被更改,包括 6 行新增25 行删除
  1. 6
    25
      src/freedombone-app-pleroma

+ 6
- 25
src/freedombone-app-pleroma 查看文件

@@ -90,35 +90,16 @@ function expire_pleroma_posts {
90 90
         return
91 91
     fi
92 92
 
93
-    echo '<?php' > $pleroma_expire_posts_script
94
-    echo '' >> $pleroma_expire_posts_script
95
-    echo "\$oldate=date((\"Y-m-d\"), strtotime(\"-${expire_months} months\"));" >> $pleroma_expire_posts_script
96
-    echo '$username="root";' >> $pleroma_expire_posts_script
97
-    echo "\$password=shell_exec('${PROJECT_NAME}-pass -u root -a postgresql');" >> $pleroma_expire_posts_script
98
-    echo "\$database=\"pleroma\";" >> $pleroma_expire_posts_script
99
-    echo '' >> $pleroma_expire_posts_script
100
-    echo 'if (!$link = pg_connect("host=localhost dbname=pleroma user=$username password=$password")) {' >> $pleroma_expire_posts_script
101
-    echo '    echo "Could not connect to postgresql";' >> $pleroma_expire_posts_script
102
-    echo '    exit;' >> $pleroma_expire_posts_script
103
-    echo '}' >> $pleroma_expire_posts_script
104
-    echo '' >> $pleroma_expire_posts_script
105
-    echo "\$notice_query=\"DELETE FROM notifications WHERE inserted_at <= '\$oldate 01:01:01'\";" >> $pleroma_expire_posts_script
106
-    echo 'pg_exec($link, $notice_query);' >> $pleroma_expire_posts_script
107
-    echo '$rowaff1=pg_affected_rows($link);' >> $pleroma_expire_posts_script
108
-    echo '' >> $pleroma_expire_posts_script
109
-    echo "\$objects_query=\"DELETE FROM objects WHERE inserted_at <= '\$oldate 01:01:01'\";" >> $pleroma_expire_posts_script
110
-    echo 'pg_exec($link, $objects_query);' >> $pleroma_expire_posts_script
111
-    echo '$rowaff2=pg_affected_rows($link);' >> $pleroma_expire_posts_script
112
-    echo 'pg_close($link);' >> $pleroma_expire_posts_script
113
-    echo '' >> $pleroma_expire_posts_script
114
-    echo -n "echo \"Expire pleroma posts: " >> $pleroma_expire_posts_script
115
-    echo '$rowaff1 notifications and $rowaff2 objects deleted from database.\n";' >> $pleroma_expire_posts_script
93
+    echo '#!/bin/bash' > $pleroma_expire_posts_script
94
+    echo 'oldate=$(date +%Y-%m-%d --date="3 months ago")' >> $pleroma_expire_posts_script
95
+    echo "sudo -u postgres psql -d pleroma -c \"DELETE FROM notifications WHERE inserted_at <= '\$oldate 01:01:01'\"" >> $pleroma_expire_posts_script
96
+    echo "sudo -u postgres psql -d pleroma -c \"DELETE FROM objects WHERE inserted_at <= '\$oldate 01:01:01'\"" >> $pleroma_expire_posts_script
116 97
     chmod +x $pleroma_expire_posts_script
117 98
 
118 99
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
119 100
     echo '#!/bin/bash' > $pleroma_expire_script
120 101
     echo "find /etc/pleroma/uploads/* -mtime +${expire_days_files} -exec rm -rf {} +" >> $pleroma_expire_script
121
-    echo "/usr/bin/php $pleroma_expire_posts_script" >> $pleroma_expire_script
102
+    echo "$pleroma_expire_posts_script" >> $pleroma_expire_script
122 103
     chmod +x $pleroma_expire_script
123 104
 
124 105
     # remove any old cron job
@@ -797,7 +778,7 @@ function install_pleroma {
797 778
         ONION_ONLY='no'
798 779
     fi
799 780
 
800
-    apt-get -yq install wget imagemagick php-pgsql
781
+    apt-get -yq install wget imagemagick
801 782
 
802 783
     # We need elixir 1.4+ here, so the debian repo package won't do
803 784
     install_elixir