[or-cvs] r23488: {website} update publish. (website/branches/web20)

[Andrew Lewman <andrew@xxxxxxxxxxxxxx>]

Author: phobos
Date: 2010-10-09 17:50:23 +0000 (Sat, 09 Oct 2010)
New Revision: 23488

Modified:
   website/branches/web20/publish
Log:
update publish.


Modified: website/branches/web20/publish
===================================================================
--- website/branches/web20/publish	2010-10-09 17:48:39 UTC (rev 23487)
+++ website/branches/web20/publish	2010-10-09 17:50:23 UTC (rev 23488)
@@ -2,7 +2,7 @@
 set -e # stop if we encounter an error
 
 svn update
-make
+make -j3
 
 # Update a timestamp so we can check whether each mirror is
 # up to date.
@@ -11,14 +11,8 @@
 
 # don't copy over stuff with permissions that make it useless
 chmod a+r * -R
+rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs
+ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs
 
-## I'm not comfortable having arbitrary people use --delete yet,
-## since if they screw up it'll blow away arbitrary things.
-#rsync -Prvz --delete . tor.eff.org:directory/
-
-rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi -Prvz --delete . byblos:/var/www/www.torproject.org/htdocs/
-ssh byblos chmod g+w -R /var/www/www.torproject.org/htdocs
-
 echo "Forcing mirror update"
-ssh byblos '/var/lib/mirror-tor/trigger-sync'
-
+ssh vescum '/home/mirroradm/bin/trigger-mirrors'