New backup carried out on anarwiki.org by root at local Fri May 3 19:12:04 UTC 2024.

README.md

@@ -33,46 +33,16 @@ which calls the following -
 * /var/www/html/mediawiki/backupper/markdown-export.sh
 * /var/www/html/mediawiki/backupper/git-backup.sh
 
-git-backup.sh has been altered due to Github file size constraints -
-
-```
-backup_directory="assets"
-git_work_directory="AnarWiki"
-remote="git@github.com:AnarDocs/AnarWiki.git"
-set -e
-rm -rf $git_work_directory
-git clone --depth=1 $remote $git_work_directory
-cp $backup_directory/* $git_work_directory
-cd $git_work_directory
-split -b 50M wikidata.tar.gz "wikidata.part"
-rm wikidata.tar.gz
-git add *
-git repack -a -d -f --window=0
-git commit -m"New backup carried out on $(hostname) by $(whoami) at local $(date)."
-git push
-cd ..
-```
-
 /var/www/html/mediawiki/backupper/markdown-export.sh -
 
 requires this script - https://github.com/outofcontrol/mediawiki-to-gfm
 
 ```
-backup_directory="markdown"
-git_work_directory="AnarWiki"
-remote="git@github.com:AnarDocs/AnarWiki.git"
-set -e
+# The same as git-backup.sh except this is added at the start -
 # Export to markdown
-/var/www/html/mediawiki/backupper/mediawiki-to-gfm/convert.php --filename=/var/www/html/mediawiki/backupper/assets/full-dump.xml >
+/var/www/html/mediawiki/backupper/convert.php --filename=/var/www/html/mediawiki/backupper/assets/full-dump.xml --output=/var/www/html/mediawiki/backupper/markdown
 backup_directory="markdown"
-#rm -rf $git_work_directory
-#git clone --depth=1 $remote $git_work_directory
-cp -R $backup_directory $git_work_directory/
-cd $git_work_directory
-git add .
-git commit -m"New backup carried out on $(hostname) by $(whoami) at local $(date)."
-git push
-cd ..
+git_work_directory="markdown-git"
 ```
 
 ### Backup Locations

backup-private.sh

@@ -18,5 +18,5 @@ php ../maintenance/dumpBackup.php --full  > assets/full-dump.xml
 tar zcvfh assets/wikidata.tar.gz --exclude="backupper" ..
 
 # Also copy the docs
-cp *.txt *.sh assets/
+cp *.md *.sh assets/
 

cron.sh

@@ -4,5 +4,5 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-nice ./backup-private.sh # && ./git-backup.sh
+nice ./backup-private.sh # && ./git-backup.sh && ./markdown-backup.sh
 

git-backup.sh

@@ -6,12 +6,12 @@
 # 2021, Public Domain, SvenK
 
 backup_directory="assets"
-git_work_directory="assets-git"
+git_work_directory="AnarWiki"
 
 # these are secrets:
-user="<YOUR USERNEME. better make a dedicated token at github/gitlab/etc>"
-pass="<YOUR PASS>"
-remote="https://$user:$pass@githost/the/path.git"
+#user="<YOUR USERNEME. better make a dedicated token at github/gitlab/etc>"
+#pass="<YOUR PASS>"
+remote="git@github.com:AnarDocs/AnarWiki.git"
 
 set -e
 
@@ -20,7 +20,10 @@ rm -rf $git_work_directory
 git clone --depth=1 $remote $git_work_directory
 cp $backup_directory/* $git_work_directory
 cd $git_work_directory
-git add .
+split -b 50M wikidata.tar.gz "wikidata.part"
+rm wikidata.tar.gz
+git add *
+git repack -a -d -f --window=0
 git commit -m"New backup carried out on $(hostname) by $(whoami) at local $(date)."
 git push
 cd ..

markdown-export.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# This script copies the contents of a directory to the git master
+# of a given repository. It thus can abuse Git for revisioned
+# backups. Sweet!
+# 2021, Public Domain, SvenK
+
+backup_directory="markdown"
+git_work_directory="AnarWiki"
+
+# these are secrets:
+#user="<YOUR USERNEME. better make a dedicated token at github/gitlab/etc>"
+#pass="<YOUR PASS>"
+remote="git@github.com:AnarDocs/AnarWiki.git"
+
+set -e
+
+# Export to markdown
+/var/www/html/mediawiki/backupper/mediawiki-to-gfm/convert.php --filename=/var/www/html/mediawiki/backupper/assets/full-dump.xml --output=/var/www/html/mediawiki/backupper/markdown
+backup_directory="markdown"
+
+#rm -rf $git_work_directory
+
+#git clone --depth=1 $remote $git_work_directory
+cp -R $backup_directory $git_work_directory/
+cd $git_work_directory
+git add .
+git commit -m"New backup carried out on $(hostname) by $(whoami) at local $(date)."
+git push
+cd ..
+