From dd49efbcad47f7d9e801bb12758183220dae9c86 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 23 Sep 2018 11:36:13 +0200
Subject: o Replacing all custom semantic mediawiki configuration with a
 generic   composer setup. Should be possible to maintain all of the mediawiki
   code with composer now. o Adding scribunto and semantic-scribunto as
 extensions. o Moving borg and backup directory under /opt/mediawiki

---
 ansible/roles/mw-backend/files/bin/mw-dump-backup | 2 +-
 ansible/roles/mw-backend/files/bin/mw-dump-db     | 3 ++-
 ansible/roles/mw-backend/files/bin/mw-make-backup | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'ansible/roles/mw-backend/files/bin')

diff --git a/ansible/roles/mw-backend/files/bin/mw-dump-backup b/ansible/roles/mw-backend/files/bin/mw-dump-backup
index 5530b03..0e21eb2 100644
--- a/ansible/roles/mw-backend/files/bin/mw-dump-backup
+++ b/ansible/roles/mw-backend/files/bin/mw-dump-backup
@@ -6,4 +6,4 @@ exec php /usr/share/mediawiki/maintenance/dumpBackup.php \
    --full \
    --include-files \
    --uploads \
-    > /mediawiki-backup/content-dump.xml
+    > /opt/mediawiki/backup/content-dump.xml
diff --git a/ansible/roles/mw-backend/files/bin/mw-dump-db b/ansible/roles/mw-backend/files/bin/mw-dump-db
index 0a82059..5a6699a 100644
--- a/ansible/roles/mw-backend/files/bin/mw-dump-db
+++ b/ansible/roles/mw-backend/files/bin/mw-dump-db
@@ -8,4 +8,5 @@ export PGUSER=$(sed -n 's,^.wgDBuser.*"\([^"]*\)".*,\1,p' /etc/mediawiki/LocalSe
 export PGPASSWORD=$(sed -n 's,^.wgDBpassword.*"\([^"]*\)".*,\1,p' /etc/mediawiki/LocalSettings.php)
 export PGPORT=$(sed -n 's,^.wgDBport.*"\([^"]*\)".*,\1,p' /etc/mediawiki/LocalSettings.php)
 
-exec pg_dump -b --format directory -f /mediawiki-backup/db
+rm -rf /opt/mediawiki/backup/db
+exec pg_dump -b --format directory -f /opt/mediawiki/backup/db
diff --git a/ansible/roles/mw-backend/files/bin/mw-make-backup b/ansible/roles/mw-backend/files/bin/mw-make-backup
index 18c48e2..e99b909 100644
--- a/ansible/roles/mw-backend/files/bin/mw-make-backup
+++ b/ansible/roles/mw-backend/files/bin/mw-make-backup
@@ -2,4 +2,4 @@
 
 set -euo pipefail
 
-exec borg create /mediawiki-borg::mediawiki-{now:%Y%m%d-%H%M%S} /mediawiki-backup
+exec borg create /opt/mediawiki/borg::mediawiki-{now:%Y%m%d-%H%M%S} /opt/mediawiki/backup
-- 
cgit v1.2.3