Ori.livneh has submitted this change and it was merged.
Change subject: Get rid of symlinks to scap scripts
......................................................................
Get rid of symlinks to scap scripts
Requires I40a891b1c
Change-Id: If80560123f446163f0f08a431400984f303de82e
---
M files/misc/l10nupdate/l10nupdate-1
M files/misc/scripts/set-group-write2
M files/misc/scripts/updateinterwikicache
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
M templates/misc/mw-deployment-vars.erb
6 files changed, 6 insertions(+), 70 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/l10nupdate/l10nupdate-1
b/files/misc/l10nupdate/l10nupdate-1
index e4e65cc..3a29274 100755
--- a/files/misc/l10nupdate/l10nupdate-1
+++ b/files/misc/l10nupdate/l10nupdate-1
@@ -66,7 +66,7 @@
echo "git clone updated."
# Get all MW message cache versions (and a wiki DB name for each)
-mwVerDbSets=$($BINDIR/mwversionsinuse --withdb)
+mwVerDbSets=$(mwversionsinuse --withdb)
if [ -z "$mwVerDbSets" ]; then
$BINDIR/dologmsg "!log LocalisationUpdate failed: mwversionsinuse
returned empty list"
echo "Obtaining MediaWiki version list FAILED"
@@ -95,7 +95,7 @@
echo "Completed at `date --rfc-3339=seconds`. Copying LC files
to $MW_COMMON_SOURCE"
cp --preserve=timestamps --force
/var/lib/l10nupdate/cache-"$mwVerNum"/l10n_cache-*
$MW_COMMON_SOURCE/php-"$mwVerNum"/cache/l10n
# Include JSON versions of the CDB files and add MD5 files
- /usr/local/bin/refreshCdbJsonFiles
--directory="$MW_COMMON_SOURCE/php-$mwVerNum/cache/l10n"
+ refreshCdbJsonFiles
--directory="$MW_COMMON_SOURCE/php-$mwVerNum/cache/l10n"
echo "Syncing to Apaches at `date --rfc-3339=seconds`"
SYNC_START=$(date +%s)
diff --git a/files/misc/scripts/set-group-write2
b/files/misc/scripts/set-group-write2
index a9737ee..6b3ccbb 100755
--- a/files/misc/scripts/set-group-write2
+++ b/files/misc/scripts/set-group-write2
@@ -2,7 +2,7 @@
BINDIR=/usr/local/bin
. /usr/local/lib/mw-deployment-vars.sh
-mwVersionNums=$($BINDIR/mwversionsinuse)
+mwVersionNums=$(mwversionsinuse)
for mwVerNum in ${mwVersionNums[@]}; do
find "$MW_COMMON_SOURCE"/php-"$mwVerNum" -group wikidev -not -perm -020
-exec chmod g+w '{}' ';'
done
diff --git a/files/misc/scripts/updateinterwikicache
b/files/misc/scripts/updateinterwikicache
index 38871fc..ef65b9c 100644
--- a/files/misc/scripts/updateinterwikicache
+++ b/files/misc/scripts/updateinterwikicache
@@ -1,14 +1,8 @@
#!/bin/bash
-
-BINDIR=/usr/local/bin
-
echo "Updating interwiki cache..."
-
file=/tmp/interwiki-$(date +%s).cdb
-
-$BINDIR/mwscript extensions/WikimediaMaintenance/dumpInterwiki.php -o $file
--protocolrelative
+mwscript extensions/WikimediaMaintenance/dumpInterwiki.php -o $file
--protocolrelative
cp $file /a/common/wmf-config/interwiki.cdb
-$BINDIR/sync-file wmf-config/interwiki.cdb Updating interwiki cache
+sync-file wmf-config/interwiki.cdb Updating interwiki cache
echo "Done"
-
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index b939b4f..0e9438d 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -141,39 +141,6 @@
class misc::deployment::scap_scripts {
include misc::deployment::common_scripts
include misc::deployment::vars
-
- file {
- '/usr/local/bin/compile-wikiversions':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/compile-wikiversions';
- '/usr/local/bin/mw-update-l10n':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/mw-update-l10n';
- '/usr/local/bin/restart-nutcracker':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/restart-nutcracker';
- '/usr/local/bin/scap':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/scap';
- '/usr/local/bin/scap-purge-l10n-cache':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/scap-purge-l10n-cache';
- '/usr/local/bin/sync-dblist':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-dblist';
- '/usr/local/bin/sync-dir':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-dir';
- '/usr/local/bin/sync-docroot':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-docroot';
- '/usr/local/bin/sync-file':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-file';
- '/usr/local/bin/sync-wikiversions':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-wikiversions';
- }
}
class misc::deployment::passwordscripts {
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index b9d998c..48717f1 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -8,31 +8,6 @@
source => 'puppet:///modules/mediawiki/profile.d_add_scap_to_path.sh',
}
- file { '/usr/local/bin/mwversionsinuse':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/mwversionsinuse',
- }
-
- file { '/usr/local/bin/scap-rebuild-cdbs':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/scap-rebuild-cdbs',
- }
-
- file { '/usr/local/bin/scap-recompile':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/scap-recompile',
- }
-
- file { '/usr/local/bin/sync-common':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/sync-common',
- }
-
- file { '/usr/local/bin/refreshCdbJsonFiles':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/refreshCdbJsonFiles',
- }
-
file { '/usr/local/apache':
ensure => directory,
owner => 'root',
diff --git a/templates/misc/mw-deployment-vars.erb
b/templates/misc/mw-deployment-vars.erb
index 99081a6..0c9ed2a 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -1,5 +1,5 @@
# This file should be BASH / Python polyglot.
-
+PATH="$PATH:/srv/deployment/scap/scap/bin"
MW_COMMON="<%= @mw_common %>"
MW_COMMON_SOURCE="<%= @mw_common_source %>"
MW_DBLISTS="<%= @dblist_common %>"
--
To view, visit https://gerrit.wikimedia.org/r/147321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If80560123f446163f0f08a431400984f303de82e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: BryanDavis <[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
