r83000 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r82999‎ | r83000 | r83001 >
Date:02:10, 1 March 2011
Author:tstarling
Status:deferred
Tags:
Comment:
Renaming the scap scripts to remove the version number.
Modified paths:
  • /trunk/debs/wikimedia-task-appserver/debian/rules (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/scap-1 (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap-1skins (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap-2 (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap15-1 (deleted) (history)
  • /trunk/debs/wikimedia-task-appserver/scap15-1skins (deleted) (history)
  • /trunk/debs/wikimedia-task-appserver/scap15-2 (deleted) (history)

Diff [purge]

Index: trunk/debs/wikimedia-task-appserver/scap15-1skins
@@ -1,5 +0,0 @@
2 -#!/bin/sh
3 -
4 -rsync -a 10.0.5.8::common/php-1.5/skins/ \
5 - /usr/local/apache/common-local/php-1.5/skins \
6 - && echo ok || echo failed
Index: trunk/debs/wikimedia-task-appserver/scap15-1
@@ -1,14 +0,0 @@
2 -#!/bin/sh
3 -
4 -# Compile as regular user
5 -echo -n Compiling texvc...
6 -[ -d /var/tmp/texvc ] || mkdir /var/tmp/texvc
7 -rsync -r --exclude=.svn/ 10.0.5.8::common/php-1.5/math/ /var/tmp/texvc
8 -cd /var/tmp/texvc
9 -make -f Makefile texvc >/dev/null 2>/dev/null && echo ok || echo failed
10 -
11 -# Copy and install as root
12 -sudo /usr/sbin/scap15-2
13 -
14 -echo Done
15 -
Index: trunk/debs/wikimedia-task-appserver/scap15-2
@@ -1,13 +0,0 @@
2 -#!/bin/bash
3 -
4 -PATH=/bin:/usr/bin:/sbin:/usr/sbin:
5 -
6 -echo -n Updating php-1.5...
7 -rsync -a 10.0.5.8::common/php-1.5/ /usr/local/apache/common-local/php-1.5 && echo ok || echo failed
8 -
9 -# Install compiled executables
10 -/usr/sbin/install-common
11 -
12 -echo -n "Restarting apache... "
13 -/usr/bin/apache-sanity-check && ( sudo /usr/sbin/apache2ctl stop; sudo killall -9 apache2;sleep 3; sudo /usr/sbin/apache2ctl start )
14 -
Index: trunk/debs/wikimedia-task-appserver/debian/rules
@@ -51,8 +51,8 @@
5252 # Install sync/check scripts
5353 install -d -m 0755 $(DESTDIR)/usr/bin
5454 install -d -m 0755 $(DESTDIR)/usr/sbin
55 - install -m 0750 sync-common apache-sanity-check apache-start check-time scap15-1skins scap15-1 $(DESTDIR)/usr/bin
56 - install -m 0750 scap15-2 set-group-write2 install-common $(DESTDIR)/usr/sbin
 55+ install -m 0750 sync-common apache-sanity-check apache-start check-time scap-1skins scap-1 $(DESTDIR)/usr/bin
 56+ install -m 0750 scap-2 set-group-write2 install-common $(DESTDIR)/usr/sbin
5757
5858 install -d -m 0750 $(DESTDIR)/var/lib/pybal-check/.ssh
5959 install -m 0640 authorized_keys $(DESTDIR)/var/lib/pybal-check/.ssh/authorized_keys
Index: trunk/debs/wikimedia-task-appserver/scap-1
@@ -0,0 +1,14 @@
 2+#!/bin/sh
 3+
 4+# Compile as regular user
 5+echo -n Compiling texvc...
 6+[ -d /var/tmp/texvc ] || mkdir /var/tmp/texvc
 7+rsync -r --exclude=.svn/ 10.0.5.8::common/php-1.5/math/ /var/tmp/texvc
 8+cd /var/tmp/texvc
 9+make -f Makefile texvc >/dev/null 2>/dev/null && echo ok || echo failed
 10+
 11+# Copy and install as root
 12+sudo /usr/sbin/scap15-2
 13+
 14+echo Done
 15+
Index: trunk/debs/wikimedia-task-appserver/scap-2
@@ -0,0 +1,13 @@
 2+#!/bin/bash
 3+
 4+PATH=/bin:/usr/bin:/sbin:/usr/sbin:
 5+
 6+echo -n Updating php-1.5...
 7+rsync -a 10.0.5.8::common/php-1.5/ /usr/local/apache/common-local/php-1.5 && echo ok || echo failed
 8+
 9+# Install compiled executables
 10+/usr/sbin/install-common
 11+
 12+echo -n "Restarting apache... "
 13+/usr/bin/apache-sanity-check && ( sudo /usr/sbin/apache2ctl stop; sudo killall -9 apache2;sleep 3; sudo /usr/sbin/apache2ctl start )
 14+
Index: trunk/debs/wikimedia-task-appserver/scap-1skins
@@ -0,0 +1,5 @@
 2+#!/bin/sh
 3+
 4+rsync -a 10.0.5.8::common/php-1.5/skins/ \
 5+ /usr/local/apache/common-local/php-1.5/skins \
 6+ && echo ok || echo failed

Status & tagging log