Browse code

Somewhat update docs

Peter Palfrader authored on18/10/2014 00:29:37
Showing1 changed files
... ...
@@ -20,20 +20,15 @@ They're in include/versions.wmi
20 20
 too -- generally when you change the file name so drastically that just
21 21
 changing the versions.wmi tags isn't enough.)
22 22
 
23
-If you want to push your locally built website to the remote webserver,
24
-run the ./publish script in website/trunk/. It will rsync everything
25
-over, and then it will ask www-master.tp.o to run its trigger-mirrors
26
-script which causes www-master to rsync to all the servers in the www.tp.o
27
-rotation. To push the website, you'll need to be in the torwww ldap group
28
-(which is separate from whether you can commit to svn).
23
+Pushes to the master branch of the git repository will cause the
24
+website to get re-built and published.  pushing to the staging branch
25
+will update www-staging.torproject.org.
29 26
 
30 27
 Alas, https://www.torproject.org/dist/ isn't in version control. You
31
-write to it by ssh'ing to www-master.torproject.org and going to
32
-/srv/www-master.torproject.org/htdocs/dist/ and then sticking your stuff
33
-there. When you want it to go live, you run ./publish from your local
34
-website checkout, which will trigger the trigger-mirrors run. (It's
35
-possible that you can simply run /home/mirroradm/bin/trigger-mirrors on
36
-www-master too, but I've never tried.)
28
+write to it by ssh'ing to staticiforme.torproject.org and going to
29
+/srv/dist-master.torproject.org/htdocs/ and then sticking your stuff
30
+there. When you want it to go live, you run
31
+static-update-component dist.torproject.org on staticiforme.
37 32
 
38 33
 Weasel has hopes that somebody will write some scripts to make maintaining
39 34
 packages in dist/ less awful -- automatically check that they have