Springle has submitted this change and it was merged.

Change subject: Remove sync-l10nupdate(-1)?
......................................................................


Remove sync-l10nupdate(-1)?

Change-Id: I3f2033155e5f7f81ac58f6f7a36b4e568bd137f7
---
D files/misc/l10nupdate/sync-l10nupdate
D files/misc/l10nupdate/sync-l10nupdate-1
M manifests/misc/deployment.pp
3 files changed, 2 insertions(+), 30 deletions(-)

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



diff --git a/files/misc/l10nupdate/sync-l10nupdate 
b/files/misc/l10nupdate/sync-l10nupdate
deleted file mode 100755
index 7d60f43..0000000
--- a/files/misc/l10nupdate/sync-l10nupdate
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This script belongs in /usr/local/bin/.
-sudo -u l10nupdate /usr/local/bin/sync-l10nupdate-1 "$@"
-
diff --git a/files/misc/l10nupdate/sync-l10nupdate-1 
b/files/misc/l10nupdate/sync-l10nupdate-1
deleted file mode 100755
index ad0e5ea..0000000
--- a/files/misc/l10nupdate/sync-l10nupdate-1
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# This script belongs in /usr/local/bin/.
-. /etc/profile.d/mediawiki.sh
-
-MWVER="$1"
-MW_RSYNC_HOST="tin.eqiad.wmnet"
-
-if [ -z "$MWVER" ]; then
-       echo "FAILED: MediaWiki version not provided"
-       exit 1
-fi
-
-echo "Synchronizing $MEDIAWIKI_STAGING_DIR/php-$MWVER/cache/l10n to 
$MEDIAWIKI_DEPLOYMENT_DIR/php-$MWVER/cache/l10n..."
-echo "mediawiki-installation:"
-
-# Set forklimit to 30 (-F 30) to prevent NFS from getting overloaded causing 
some machines to be skipped
-dsh -o -oPasswordAuthentication=no -F 30 -cM -g mediawiki-installation \
-  "sudo -u mwdeploy rsync -a $MW_RSYNC_HOST::common/php-$MWVER/cache/l10n/ 
$MEDIAWIKI_DEPLOYMENT_DIR/php-$MWVER/cache/l10n"
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index f5a7389..b9266a2 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -232,15 +232,9 @@
             mode   => '0555',
             source => 'puppet:///files/misc/l10nupdate/l10nupdate-1';
         '/usr/local/bin/sync-l10nupdate':
-            owner  => 'root',
-            group  => 'root',
-            mode   => '0555',
-            source => 'puppet:///files/misc/l10nupdate/sync-l10nupdate';
+            ensure => 'absent';
         '/usr/local/bin/sync-l10nupdate-1':
-            owner  => 'root',
-            group  => 'root',
-            mode   => '0555',
-            source => 'puppet:///files/misc/l10nupdate/sync-l10nupdate-1';
+            ensure => 'absent';
         # add ssh keypair for l10nupdate user from fenari for RT-5187
         '/home/l10nupdate/.ssh/id_rsa':
             owner  => 'l10nupdate',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f2033155e5f7f81ac58f6f7a36b4e568bd137f7
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to