Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/76885
Change subject: Remove obsolete backup stuff
......................................................................
Remove obsolete backup stuff
Change-Id: Id265c10c6908c95ed1d3cbadc755600235d8d1f7
---
M files/backup/disklist-daily
D files/svn/svndump.php
M manifests/svn.pp
3 files changed, 3 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/76885/1
diff --git a/files/backup/disklist-daily b/files/backup/disklist-daily
index 0e2c373..5413656 100644
--- a/files/backup/disklist-daily
+++ b/files/backup/disklist-daily
@@ -11,7 +11,6 @@
sanger.wikimedia.org /var/vmail default
nfs1.pmtpa.wmnet /var/opendj/backups default
nfs2.pmtpa.wmnet /var/opendj/backups default
-formey.wikimedia.org /svnroot/bak default
manganese.wikimedia.org /var/lib/gerrit2/review_site/git default
sodium.wikimedia.org /var/lib/mailman default
stat1.wikimedia.org /home default
diff --git a/files/svn/svndump.php b/files/svn/svndump.php
deleted file mode 100644
index 8f362f6..0000000
--- a/files/svn/svndump.php
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/php
-<?php
-# Use for Wikimedia internal SVN dumps
-# Designed to dump to a specific location. Amanda handles the long-term
storage from $baseDumpPath/dumps/
-
-### CONFIG ###
-$repos = array( 'pywikipedia', 'wikimedia' );
-$publicCopies = array();
-$baseDumpPath = '/svnroot/bak';
-### STOP ###
-
-if( isset( $argv[1] ) && $argv[1] == 'setup' ) {
- exec( "rm -fR $baseDumpPath" );
- mkdir( $baseDumpPath, 0700, true );
- mkdir( "$baseDumpPath/dumps", 0700 );
-
- foreach( $repos as $repo ) {
- file_put_contents( "$baseDumpPath/lastdumpedname-$repo", 'none'
);
- file_put_contents( "$baseDumpPath/lastdumpedrev-$repo", '0' );
- }
- exit;
-}
-
-$dayOfWeek = date( 'l' );
-
-foreach( $repos as $repo ) {
- $repoPath = "/svnroot/$repo";
- $lastDumpName = "$baseDumpPath/lastdumpedname-$repo";
- $counterFile = "$baseDumpPath/lastdumpedrev-$repo";
- $latestAvailableRev = intval( exec( "svnlook youngest $repoPath" ) );
- $lastDumpedRev = 0;
- $baseCmd = "svnadmin dump";
-
- # Get rid of yesterday's dump, Amanda already got it
- $df = file_get_contents( $lastDumpName );
- if( $df !== 'none' ) {
- unlink( $df );
- }
-
- # Not sunday, do an incremental
- if( $dayOfWeek != 'Sunday' ) {
- $lastDumpedRev = intval( file_get_contents( $counterFile ) ) +
1;
- $baseCmd .= " --incremental";
- }
-
- $uniqueFile = "$repo-svndump-" . date( 'Ymd' ) .
"-revs$lastDumpedRev:$latestAvailableRev.gz";
- $fileName = "$baseDumpPath/dumps/$uniqueFile";
- # dump, gzip, write
- print "Dumping repo: $repo, revs $lastDumpedRev-$latestAvailableRev\n";
- exec( "$baseCmd --deltas --revision $lastDumpedRev:$latestAvailableRev
$repoPath | gzip -9 > $fileName" );
-
- if( $dayOfWeek == 'Sunday' && isset( $weeklyPublicCopies[$repo] ) ) {
- $pubPath = $weeklyPublicCopies[$repo];
- foreach( $glob( "$pubPath/$repo-svndump-*.gz" ) as $olddump )
unlink( $olddump );
- copy( $fileName, "$pubPath/$uniqueFile" );
- }
-
- # Increment our counter for last dumped rev
- file_put_contents( $counterFile, $latestAvailableRev );
- file_put_contents( $lastDumpName, $fileName );
-}
-
-print "Done";
diff --git a/manifests/svn.pp b/manifests/svn.pp
index d83da2a..77c1937 100644
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -94,26 +94,14 @@
file {
"/svnroot/bak":
- ensure => directory,
- owner => 'root',
- group => 'svnadm',
- mode => '0775',
- require => File["/svnroot"];
+ ensure => absent;
"/usr/local/bin/svndump.php":
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => "puppet:///files/svn/svndump.php",
- require => File["/svnroot/bak"];
+ ensure => absent;
}
cron {
'svndump':
- command => "/usr/local/bin/svndump.php >
/dev/null 2>&1",
- require => File["/usr/local/bin/svndump.php"],
- user => root,
- hour => 18,
- minute => 0;
+ ensure => absent;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/76885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id265c10c6908c95ed1d3cbadc755600235d8d1f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
