Ori.livneh has submitted this change and it was merged.
Change subject: Get rid of old /home/wikipedia references
......................................................................
Get rid of old /home/wikipedia references
And delete the old mysql-reset-slave script, which has probably been broken
for years and sounds dangerous. Jaime says they have much better tools and
would not use this anyway.
MW_CRON_LOGS is still referenced by tin:/usr/local/bin/purge-checkuser,
but that is no longer used. See I448bf155
Remaining stuff:
files/snapshot/sudoers.snapshot - T107479
modules/dataset/files/rsync/rsyncd.conf.dumps_to_public - Ariel, where did
these files end up?
Change-Id: I45a879eb604e28fa27fd6dcccb65949e04a07849
---
M manifests/misc/logging.pp
M manifests/role/logging.pp
M modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
M modules/nagios_common/files/check_commands/check_all_memcached.php
M modules/scap/files/manpages/asciidoc/foreachwiki.txt
M modules/scap/files/manpages/asciidoc/set-group-write.txt
M modules/scap/files/manpages/man/foreachwiki.1
M modules/scap/files/manpages/man/set-group-write.1
D modules/scap/files/reset-mysql-slave
M modules/scap/manifests/scripts.pp
M modules/scap/templates/mw-deployment-vars.erb
11 files changed, 9 insertions(+), 50 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index f4ab30d..735a365 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -9,7 +9,7 @@
#
# $config - Type of configuration to apply (nfs, network). Default 'nfs'
# $basepath - Path where to write logs to, without trailing slash.
-# Default: '/home/wikipedia/syslog'
+# Default: '/srv/syslog'
#
class misc::syslog-server($config='nfs', $basepath='/srv/syslog') {
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 60a44ce..0fca2af 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -33,7 +33,7 @@
}
# mediawiki udp2log instance. Does not use monitoring.
-class role::logging::mediawiki($monitor = true, $log_directory =
'/home/wikipedia/logs' ) {
+class role::logging::mediawiki($monitor = true, $log_directory = '/srv/mw-log'
) {
system::role { 'role::logging:mediawiki':
description => 'MediaWiki log collector',
}
diff --git a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
index ea6ee81..ff0261a 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
+++ b/modules/dataset/files/rsync/rsyncd.conf.dumps_to_public
@@ -37,6 +37,6 @@
# for your.org, contact: Kevin Day <[email protected]>
# they manage it but we have access; see file in /home/wikipedia/docs/mirrors
# added amazonaws.com, Oct 31 2012 -- atg
-# we are still in the process of setting it up, for access see file in
/home/w/docs/mirrors
+# we are still in the process of setting it up, for access see file in
/home/wikipedia/docs/mirrors
# it will eventually be managed by folks at amazon
hosts allow = 199.47.196.26 ftpmirror.your.org
ec2-174-129-186-231.compute-1.amazonaws.com 69.31.98.2
diff --git a/modules/nagios_common/files/check_commands/check_all_memcached.php
b/modules/nagios_common/files/check_commands/check_all_memcached.php
index 89d6148..5b31f29 100755
--- a/modules/nagios_common/files/check_commands/check_all_memcached.php
+++ b/modules/nagios_common/files/check_commands/check_all_memcached.php
@@ -19,7 +19,7 @@
# old method to get mc.php - relies on NFS, which is a -1
# but as of today (20120427) you could also still use it if there are any
issues with the new way
-# require_once( '/home/w/common/wmf-config/mc.php' );
+# require_once( '/srv/mediawiki-staging/wmf-config/mc.php' );
# should stay commented. was here for debug.
#$wgMemCachedServers[] = '10.0.2.101:11000';
diff --git a/modules/scap/files/manpages/asciidoc/foreachwiki.txt
b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
index 638ec5c..5343536 100644
--- a/modules/scap/files/manpages/asciidoc/foreachwiki.txt
+++ b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
@@ -16,7 +16,7 @@
MediaWiki maintenance script on all the wiki we are hosting. `SCRIPTNAME`
should
be the name of a script relative to the MediaWiki `maintenance` directory on
all the wiki. It acquires the list of wiki using the hardcoded dblist
-`/home/wikipedia/common/all.dblist`.
+`/srv/mediawiki-staging/all.dblist`.
Output is prefixed with the entry listed in `all.dblist`.
diff --git a/modules/scap/files/manpages/asciidoc/set-group-write.txt
b/modules/scap/files/manpages/asciidoc/set-group-write.txt
index 07b227e..e7d5ef3 100644
--- a/modules/scap/files/manpages/asciidoc/set-group-write.txt
+++ b/modules/scap/files/manpages/asciidoc/set-group-write.txt
@@ -20,8 +20,8 @@
`set-group-write2` is only acting on files owned by the wikidev group. It will
make sure they are group writable.
-On the *fenari* host, the target is `/home/wikipedia/common`, on any other host
-it will be the rsynced copy `/apache/common-local`.
+On the deployment hosts, the target is `/srv/mediawiki-staging`, on any other
host
+it will be the rsynced copy `/srv/mediawiki`.
OPTIONS
-------
diff --git a/modules/scap/files/manpages/man/foreachwiki.1
b/modules/scap/files/manpages/man/foreachwiki.1
index c1bec5c..7ebe190 100644
--- a/modules/scap/files/manpages/man/foreachwiki.1
+++ b/modules/scap/files/manpages/man/foreachwiki.1
@@ -36,7 +36,7 @@
.fi
.SH "DESCRIPTION"
.sp
-foreachwiki(8) is a simple wrapper around MediaWiki multiversion to run a
MediaWiki maintenance script on all the wiki we are hosting\&. SCRIPTNAME
should be the name of a script relative to the MediaWiki maintenance directory
on all the wiki\&. It acquires the list of wiki using the hardcoded dblist
/home/wikipedia/common/all\&.dblist\&.
+foreachwiki(8) is a simple wrapper around MediaWiki multiversion to run a
MediaWiki maintenance script on all the wiki we are hosting\&. SCRIPTNAME
should be the name of a script relative to the MediaWiki maintenance directory
on all the wiki\&. It acquires the list of wiki using the hardcoded dblist
/srv/mediawiki\-staging/all\&.dblist\&.
.sp
Output is prefixed with the entry listed in all\&.dblist\&.
.sp
diff --git a/modules/scap/files/manpages/man/set-group-write.1
b/modules/scap/files/manpages/man/set-group-write.1
index 31d6fb4..92d686a 100644
--- a/modules/scap/files/manpages/man/set-group-write.1
+++ b/modules/scap/files/manpages/man/set-group-write.1
@@ -41,7 +41,7 @@
.sp
set\-group\-write2 is only acting on files owned by the wikidev group\&. It
will make sure they are group writable\&.
.sp
-On the \fBfenari\fR host, the target is /home/wikipedia/common, on any other
host it will be the rsynced copy /apache/common\-local\&.
+On the depoyment hosts, the target is /srv/mediawiki\-staging, on any other
host it will be the rsynced copy /srv/mediawiki\&.
.SH "OPTIONS"
.sp
The scripts have no options\&.
diff --git a/modules/scap/files/reset-mysql-slave
b/modules/scap/files/reset-mysql-slave
deleted file mode 100755
index 421965e..0000000
--- a/modules/scap/files/reset-mysql-slave
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-HOST=$1
-RUSER=repl
-RPASS=$(</home/wikipedia/doc/repl-password)
-
-IFS="
-"
-
-mysql -h $HOST -e "STOP SLAVE"
-
-for line in $(mysql -e "SHOW SLAVE STATUS" -E -h $HOST)
- do
- key=${line%:*} # Split off what goes before :
- key=${key// } # And trim spaces
- data=${line#*:} # Split off what goes after :
- data=${data// } # And trim spaces yet again!!!
-
- case $key in
- Exec_master_log_pos) LOGPOS=$data;;
- Exec_Master_Log_Pos) LOGPOS=$data;;
- Relay_Master_Log_File) LOGFILE=$data;;
- Master_Host) RHOST=$data;;
- Master_User) RUSER=$data;;
- Master_Port) RPORT=$data;;
- esac
-
- done
-
-if [ -z $LOGPOS -o -z $LOGFILE ]; then echo "OMG FAIL NO POSITIONS KNOWN";
exit; fi
-
-mysql -h $HOST -e "RESET SLAVE"
-mysql -h $HOST -e "CHANGE MASTER TO MASTER_HOST='$RHOST', MASTER_USER='repl',
MASTER_PASSWORD='$RPASS', MASTER_LOG_FILE='$LOGFILE', MASTER_LOG_POS=$LOGPOS"
-mysql -h $HOST -e "START SLAVE"
diff --git a/modules/scap/manifests/scripts.pp
b/modules/scap/manifests/scripts.pp
index 171d07b..0b64e00 100644
--- a/modules/scap/manifests/scripts.pp
+++ b/modules/scap/manifests/scripts.pp
@@ -69,12 +69,6 @@
mode => '0555',
source => 'puppet:///modules/scap/refreshWikiversionsCDB',
}
- file { '/usr/local/bin/reset-mysql-slave':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/reset-mysql-slave',
- }
file { '/usr/local/bin/set-group-write':
owner => 'root',
group => 'root',
diff --git a/modules/scap/templates/mw-deployment-vars.erb
b/modules/scap/templates/mw-deployment-vars.erb
index b3c43ea..b0c9230 100644
--- a/modules/scap/templates/mw-deployment-vars.erb
+++ b/modules/scap/templates/mw-deployment-vars.erb
@@ -8,7 +8,6 @@
MW_COMMON="$MEDIAWIKI_DEPLOYMENT_DIR"
MW_COMMON_SOURCE="$MEDIAWIKI_STAGING_DIR"
-MW_CRON_LOGS="/home/wikipedia/logs/norotate"
MW_RSYNC_HOST="<%= @rsync_host %>"
MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30'
'-F30')
MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete'
'--exclude=**/.svn/lock' '--exclude=**/.git/objects'
'--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms')
--
To view, visit https://gerrit.wikimedia.org/r/228147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45a879eb604e28fa27fd6dcccb65949e04a07849
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
