Ryan Lane has submitted this change and it was merged.

Change subject: Move xml and image backups into public location
......................................................................


Move xml and image backups into public location

Change-Id: I8c4ca335fa8d9f4d90d467e43133985bb741e098
---
M files/openstack/mw-files.sh
M files/openstack/mw-xml.sh
M templates/apache/sites/labsconsole.wikimedia.org
3 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ryan Lane: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/openstack/mw-files.sh b/files/openstack/mw-files.sh
index 6af728a..cf326eb 100644
--- a/files/openstack/mw-files.sh
+++ b/files/openstack/mw-files.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
 tar -czvf /a/backup/labswiki-$(date '+%Y%m%d')-files.tar.gz 
/srv/org/wikimedia/controller
+tar -czvf /a/backup/public/labswiki-$(date '+%Y%m%d')-images.tar.gz 
/srv/org/wikimedia/controller/wikis/images
diff --git a/files/openstack/mw-xml.sh b/files/openstack/mw-xml.sh
index 4d8b196..2ffba73 100644
--- a/files/openstack/mw-xml.sh
+++ b/files/openstack/mw-xml.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 cd /srv/org/wikimedia/controller/wikis/w
-php maintenance/dumpBackup.php --full --uploads | nice -n 19 gzip -9 > 
/a/backup/labswiki-$(date '+%Y%m%d').xml.gz
+php maintenance/dumpBackup.php --full --uploads | nice -n 19 gzip -9 > 
/a/backup/public/labswiki-$(date '+%Y%m%d').xml.gz
 cd -
diff --git a/templates/apache/sites/labsconsole.wikimedia.org 
b/templates/apache/sites/labsconsole.wikimedia.org
index f52685d..e2a4af1 100644
--- a/templates/apache/sites/labsconsole.wikimedia.org
+++ b/templates/apache/sites/labsconsole.wikimedia.org
@@ -58,6 +58,7 @@
 
         Alias /w /srv/org/wikimedia/controller/wikis/w
         Alias /wiki /srv/org/wikimedia/controller/wikis/w/index.php
+        Alias /dumps /a/backup/public
        <% if realm == "labs" %>
        # Add additional wikis for development
         Alias /w2 /srv/org/wikimedia/controller/wikis/w2

-- 
To view, visit https://gerrit.wikimedia.org/r/50759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c4ca335fa8d9f4d90d467e43133985bb741e098
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to