Merge branch 'master' of https://github.com/nwspk/docs.plus

Author: HMarzban

.github/workflows/backup.js.yml

@@ -1,10 +1,15 @@
-name: Backup every hour
+name: Backup every 8hours
 
 on:
     schedule:
-        - cron: "0 * * * *"
+        - cron: "* */8 * * *"
 jobs:
-  dump:
+  deleteOldBackup:
+    runs-on: backup-runner
+    steps:
+      - run: del=$(date --date="7 days ago" +"%Y-%m-%d"); for i in `find . -type d -name "2*"`; do (($del < $(basename $i))) && rm -rf $i || echo "keep $i";  done
+  dump_docsplus:
+    needs: deleteOldBackup
     runs-on: backup-runner
     steps:
     - run: ( [ -d $(date +'%Y-%m-%d') ] || mkdir $(date +'%Y-%m-%d') ) &&  PGPASSWORD=$DB_PASS pg_dump -h $DB_HOST --dbname handbook -p $DB_PORT -U $DB_USER -Ft -f $(date +'%Y-%m-%d')/handbook-$(date +'%Y-%m-%d-%H').tar
@@ -13,18 +18,23 @@ jobs:
       DB_PASS : ${{secrets.PG_PASS}}
       DB_HOST : ${{secrets.PG_HOST}}
       DB_PORT : ${{secrets.PG_PORT}}
+  dump_democracy:
+    needs: dump_docsplus
+    runs-on: backup-runner
+    steps:
+    - run: ( [ -d $(date +'%Y-%m-%d') ] || mkdir $(date +'%Y-%m-%d') ) &&  PGPASSWORD=$DB_PASS pg_dump -h $DB_HOST --dbname democracyhandbook -p $DB_PORT -U $DB_USER -Ft -f $(date +'%Y-%m-%d')/democracyhandbook-$(date +'%Y-%m-%d-%H').tar
+    env:
+      DB_USER : ${{secrets.PG_USER}}
+      DB_PASS : ${{secrets.PG_PASS}}
+      DB_HOST : ${{secrets.PG_HOST}}
+      DB_PORT : ${{secrets.PG_PORT}}
   upload:
     runs-on: backup-runner
-    needs: dump
+    needs: dump_democracy
     steps:
       - run: rclone sync . space:$BACKUP_BUCKET_NAME --s3-access-key-id=$ACCESS_KEY_ID --s3-secret-access-key=$ACCESS_KEY_SECRET --s3-endpoint=$BUCKET_S3_SERVER -vv
     env:
       BACKUP_BUCKET_NAME : ${{secrets.BACKUP_BUCKET_NAME}}
       BUCKET_S3_SERVER : ${{secrets.BUCKET_S3_SERVER}}
       ACCESS_KEY_SECRET : ${{secrets.ACCESS_KEY_SECRET}}
-      ACCESS_KEY_ID : ${{secrets.ACCESS_KEY_ID}}
-  deleteOldBackup:
-    runs-on: backup-runner
-    needs: upload
-    steps:
-      - run: del=$(date --date="6 days ago" +"%Y-%m-%d"); for i in `find . -type d -name "2*"`; do (($del < $(basename $i))) && rm -rf $i || echo "keep $i";  done
+      ACCESS_KEY_ID : ${{secrets.ACCESS_KEY_ID}}

.github/workflows/democracy-backup.js.yml

@@ -38,7 +38,7 @@ jobs:
         https://github.com/samirsayyad/ep_insert_media#35b26c5
         https://github.com/samirsayyad/ep_loading_pad#84a888f
         ep_monetization
-        https://github.com/samirsayyad/ep_profile_modal#eb3bb71
+        https://github.com/samirsayyad/ep_profile_modal#59b6716
         ep_remove_embed
         https://github.com/samirsayyad/ep_set_title_on_pad#b1688b0
         https://github.com/samirsayyad/ep_table_of_contents#326ccfc