ArielGlenn has submitted this change and it was merged.
Change subject: remove obsolete wikiqueries references from snapshot hosts
......................................................................
remove obsolete wikiqueries references from snapshot hosts
Change-Id: I9ba4a0b64eb68496428af3710a0dad9bb1918bca
---
D modules/snapshot/manifests/cron/wikiqueryskip.pp
M modules/snapshot/manifests/dumps/dirs.pp
D modules/snapshot/templates/cron/wq.conf.erb
3 files changed, 0 insertions(+), 58 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/cron/wikiqueryskip.pp
b/modules/snapshot/manifests/cron/wikiqueryskip.pp
deleted file mode 100644
index 44ea863..0000000
--- a/modules/snapshot/manifests/cron/wikiqueryskip.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class snapshot::cron::wikiqueryskip {
- include snapshot::dumps::dirs
- $dblistsdir = "${snapshot::dumps::dirs::wikiqueriesdir}/dblists"
- file { $dblistsdir:
- ensure => 'directory',
- path => $dblistsdir,
- mode => '0755',
- owner => 'root',
- group => 'root',
- }
-
- $skipdbs = ['labswiki','labtestwiki']
- $skipdbs_dblist = join($skipdbs, "\n")
- file { "${dblistsdir}/skip.dblist":
- ensure => 'present',
- path => "${dblistsdir}/skip.dblist",
- mode => '0644',
- owner => 'root',
- group => 'root',
- content => "${skipdbs_dblist}\n",
- }
-}
diff --git a/modules/snapshot/manifests/dumps/dirs.pp
b/modules/snapshot/manifests/dumps/dirs.pp
index 09b0b39..d22f47c 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -66,17 +66,6 @@
group => 'root',
}
- $wikiqueriesdir = '/srv/wikiqueries'
-
- file { $wikiqueriesdir:
- ensure => 'directory',
- path => $wikiqueriesdir,
- mode => '0644',
- owner => 'root',
- group => 'root',
- }
-
-
$scriptsdir = '/srv/dumps'
file { $scriptsdir:
ensure => 'directory',
diff --git a/modules/snapshot/templates/cron/wq.conf.erb
b/modules/snapshot/templates/cron/wq.conf.erb
deleted file mode 100644
index 66c5507..0000000
--- a/modules/snapshot/templates/cron/wq.conf.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-#############################################################
-# This file is maintained by puppet!
-# puppet:///modules/snapshot/wq.conf.erb
-#############################################################
-[wiki]
-mediawiki=<%= @apachedir %>
-allwikislist=<%= @apachedir -%>/dblists/all.dblist
-privatewikislist=<%= @apachedir -%>/dblists/private.dblist
-closedwikislist=<%= @apachedir -%>/dblists/closed.dblist
-skipwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist
-adminsettings=private/PrivateSettings.php
-
-[output]
-wikiqueriesdir=<%= scope.lookupvar('snapshot::dumps::dirs::datadir')
-%>/public/other/pagetitles
-temp=<%= scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/temp
-fileperms=0644
-
-[database]
-
-[tools]
-php=/usr/bin/php5
-mysql=/usr/bin/mysql
-gzip=/bin/gzip
-bzip2=/bin/bzip2
-multiversion=<%= @apachedir -%>/multiversion/MWScript.php
--
To view, visit https://gerrit.wikimedia.org/r/300910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ba4a0b64eb68496428af3710a0dad9bb1918bca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
