Browse code

more press fixes, sync with main website some more.

Andrew Lewman authored on20/09/2010 22:08:24
Showing10 changed files
... ...
@@ -53,6 +53,6 @@ qrcode:
53 53
     "https://www.torproject.org/dist/android/alpha-orbot-latest.apk"
54 54
 
55 55
 # XXX: this also depends on all subs' wmlfiles.  How to fix?
56
-translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
56
+#translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
57 57
 
58 58
 .PHONY: docs eff projects press about download download getinvolved donate
... ...
@@ -11,7 +11,7 @@
11 11
         'about/about'                 , 'About Tor',
12 12
         'docs/documentation'          , 'Documentation',
13 13
         'projects/clientside'         , 'Projects',
14
-        'press'                 , 'Press',
14
+        'press/index'                 , 'Press',
15 15
         'https://blog.torproject.org' , 'Blog',
16 16
         'http://printfection.com/torprojectstore' , 'Store',
17 17
     );
... ...
@@ -6,7 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page press/>">Press &raquo; </a>
9
+    <a href="<page press>">Press &raquo; </a>
10 10
     <a href="<page press/2008-12-19-roadmap-press-release>">Tor Project Announces Three-Year Development Roadmap</a>
11 11
   </div> 
12 12
   <div id="maincol"> 
... ...
@@ -6,7 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page press/index>">Press &raquo; </a>
9
+    <a href="<page press/>">Press &raquo; </a>
10 10
     <a href="<page press/2009-03-12-performance-roadmap-press-release>">Tor Project Launches Performance Roadmap and Campaign</a>
11 11
   </div> 
12 12
   <div id="maincol">
... ...
@@ -6,7 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page press/index>">Press &raquo; </a>
9
+    <a href="<page press/>">Press &raquo; </a>
10 10
     <a href="<page press/2010-03-25-tor-store-press-release>">Tor Project And Printfection Announce the Tor Store</a>
11 11
   </div> 
12 12
   <div id="maincol"> 
... ...
@@ -6,7 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page press/>">Press</a>
9
+    <a href="<page press>">Press</a>
10 10
   </div> 
11 11
   <div id="maincol">
12 12
     <!-- PUT CONTENT AFTER THIS TAG -->
... ...
@@ -6,7 +6,7 @@
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page press/index>">Press &raquo; </a>
9
+    <a href="<page press/>">Press &raquo; </a>
10 10
     <a href="<page press/inthemedia>">Tor in the Media</a>
11 11
   </div>
12 12
   <div id="maincol">
... ...
@@ -19,7 +19,7 @@
19 19
 <:
20 20
   my $sidenav;
21 21
   $sidenav = [
22
-      {'url'  => 'press/index',
22
+      {'url'  => 'press/',
23 23
        'txt'  => 'Press Releases',
24 24
       }, 
25 25
       {'url'  => 'press/inthemedia',
... ...
@@ -16,7 +16,8 @@ chmod a+r * -R
16 16
 ## since if they screw up it'll blow away arbitrary things.
17 17
 #rsync -Prvz --delete . tor.eff.org:directory/
18 18
 
19
-rsync --exclude .svn --exclude .deps -Prvz . byblos:/var/www/www.torproject.org/htdocs/
19
+rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi -Prvz --delete . byblos:/var/www/www.torproject.org/htdocs/
20
+ssh byblos chmod g+w -R /var/www/www.torproject.org/htdocs
20 21
 
21 22
 echo "Forcing mirror update"
22 23
 ssh byblos '/var/lib/mirror-tor/trigger-sync'
... ...
@@ -160,26 +160,6 @@ my %m = (
160 160
             updateDate => "Unknown",
161 161
         },
162 162
 
163
-       mirror004 => {
164
-            adminContact => "doc DOT kuehn AT nexgo DOT de",
165
-            orgName => " spacecowboy ",
166
-            isoCC => " ",
167
-            subRegion => "",
168
-            region => "DE",
169
-            ipv4 => "True",
170
-            ipv6 => "False",
171
-            loadBalanced => "No",
172
-            httpWebsiteMirror => "http://tor-proxy.de/tor-mirror/",
173
-            httpsWebsiteMirror => "https://tor-proxy.de/tor-mirror/",
174
-            rsyncWebsiteMirror => "",
175
-            ftpWebsiteMirror => "",
176
-            httpDistMirror => "http://tor-proxy.de/tor-mirror/dist/",
177
-            httpsDistMirror => "https://tor-proxy.de/tor-mirror/dist/",
178
-            rsyncDistMirror => "",
179
-            hiddenServiceMirror => "",
180
-            updateDate => "Unknown",
181
-        },
182
-
183 163
        mirror005 => {
184 164
             adminContact => "contact AT algorithmus DOT com",
185 165
             orgName => "Spline",