Tim Starling has submitted this change and it was merged. Change subject: Drop scap-1, scap-2, & sync-common scripts; up version to 2.8-1 ......................................................................
Drop scap-1, scap-2, & sync-common scripts; up version to 2.8-1 This change removes scap-1, scap-2, and sync-common scripts so they can be managed directly in operations/puppet. The corresponding Gerrit change to add them to that repository is I33d93347f. The rationale is documented there. Change-Id: I047f37b0a120710e68b9dc15c98a1e6057cca788 --- M debian/changelog M debian/rules D scap-1 D scap-2 D sync-common 5 files changed, 9 insertions(+), 58 deletions(-) Approvals: Tim Starling: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 14920d7..948ca7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wikimedia-task-appserver (2.8-1) precise-wikimedia; urgency=low + + * Remove scap-1, scap-2, and sync-common scripts so they can be managed + directly in operations/puppet (Gerrit change I702777b4a). + + -- Ori Livneh <[email protected]> Thu, 11 Apr 2013 00:45:35 -0700 + wikimedia-task-appserver (2.7-1) precise-wikimedia; urgency=low * fix apache-sanity-check regex to apply to eqiad Apaches (gerrit 49231) diff --git a/debian/rules b/debian/rules index 074f0b9..167f8f9 100755 --- a/debian/rules +++ b/debian/rules @@ -51,8 +51,8 @@ # Install sync/check scripts install -d -m 0755 $(DESTDIR)/usr/bin install -d -m 0755 $(DESTDIR)/usr/sbin - install -m 0755 sync-common apache-sanity-check apache-start check-time $(DESTDIR)/usr/bin - install -m 0755 scap-1skins scap-1 scap-2 scap-recompile mwversionsinuse mw-cksum mw-cksum-list find-nearest-rsync $(DESTDIR)/usr/bin + install -m 0755 apache-sanity-check apache-start check-time $(DESTDIR)/usr/bin + install -m 0755 scap-1skins scap-recompile mwversionsinuse mw-cksum mw-cksum-list find-nearest-rsync $(DESTDIR)/usr/bin # Build architecture-independent files here. binary-indep: build install diff --git a/scap-1 b/scap-1 deleted file mode 100644 index 0e6cdc7..0000000 --- a/scap-1 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ ! -d /usr/local/apache/common-local ];then - if ! install -d -o mwdeploy -g mwdeploy /usr/local/apache/common-local; then - echo "Unable to create common-local, please re-run this script as root." - exit 1 - fi -fi - -if [ ! -d /usr/local/apache/uncommon ];then - if ! install -d -o mwdeploy -g mwdeploy /usr/local/apache/uncommon; then - echo "Unable to create /usr/local/apache/uncommon, please re-run this script as root." - exit 1 - fi -fi - -RSYNC_SERVERS="$1" -SERVER= -if [ -n "$RSYNC_SERVERS" ]; then - SERVER=$(sudo /usr/bin/find-nearest-rsync $RSYNC_SERVERS) -fi -if [ -z "$SERVER" ]; then - SERVER=10.0.5.8 -fi - -sudo -u mwdeploy /usr/bin/scap-2 "$SERVER" - -echo Done - diff --git a/scap-2 b/scap-2 deleted file mode 100644 index 813b3d7..0000000 --- a/scap-2 +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -PATH=/bin:/usr/bin:/sbin:/usr/sbin: -TERM=dumb - -SERVER="$1" -if [ -z "$SERVER" ]; then - SERVER=10.0.5.8 -fi - -echo -n Copying to `hostname -s` from "$SERVER"... -if rsync -a --delete \ - --exclude=**/.svn/lock \ - --exclude=**/.git/objects \ - --exclude=**/.git/**/objects \ - --no-perms \ - "$SERVER"::common/ /usr/local/apache/common-local -then - echo "ok" -else - echo "failed" - exit 1 -fi - diff --git a/sync-common b/sync-common deleted file mode 100644 index 17e733c..0000000 --- a/sync-common +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -/usr/bin/scap-1 - -- To view, visit https://gerrit.wikimedia.org/r/58671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I047f37b0a120710e68b9dc15c98a1e6057cca788 Gerrit-PatchSet: 3 Gerrit-Project: operations/debs/wikimedia-task-appserver Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Demon <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Tim Starling <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
