Browse Source

Misc changes for newer MXR deployment... should have been commited already, not sure why they're not

12 years ago
parent
commit
71beca6b94
3 changed files with 9 additions and 5 deletions
  1. 5 1
      lxr.conf
  2. 1 1
      update-full-onetree.sh
  3. 3 3
      update-src.pl

+ 5 - 1
lxr.conf

@@ -9,7 +9,11 @@
 
 # Define the base url for the LXR files. Tree name (if any) is appended
 # to this.
-baseurl: http://mxr.mozilla.org/
+# http:// or https:// are omitted because they can cause odd behavior with
+# the port number being appended in situations where the backend server
+# doesn't do the SSL decryption itself.
+# As long as Apache does "SetEnv HTTPS on" in the right place, this works.
+baseurl: mxr.mozilla.org/
 
 # url prefix for bonsai
 bonsaihome: http://bonsai.mozilla.org

+ 1 - 1
update-full-onetree.sh

@@ -12,7 +12,7 @@ if [ -n "$3" ] && [ "$2" = "--by-unit" ]; then
     UNIT="$2"
 fi
 
-TREE_PATH=$(grep "^sourceroot: $TREE " /var/www/webtools/mxr/lxr.conf | head -n 1 | awk '{print $3}')
+TREE_PATH=$(grep "^sourceroot: $TREE " /data/www/mxr.mozilla.org/lxr.conf | head -n 1 | awk '{print $3}')
 
 OUT1=`perl update-src.pl $CRON "$TREE" 2>&1`
 

+ 3 - 3
update-src.pl

@@ -364,7 +364,7 @@ for ($TREE) {
         last;
     }; 
     /^comm-(?:central|1\.9\.\d+|2\.0|release|aurora|beta|esr10)$/ && do {
-        print LOG `cd $src_dir; $TIME python2.4 ./client.py checkout $STDERRTOSTDOUT`;
+        print LOG `cd $src_dir; $TIME python ./client.py checkout $STDERRTOSTDOUT`;
         last;
     };
     /^(?:.*-(?:central|tracing)|(mozilla-\D.*))$/ && do {
@@ -444,7 +444,7 @@ for ($TREE) {
     };
     /^addons$/ && do {
         print LOG `rm -rf /data/mxr-data/addons/incoming; mkdir /data/mxr-data/addons/incoming`; # should be unnecessary
-        print LOG `cd /data/amo-code/bin; $TIME python26 -S latest_addon_extractor.py /data/addons /data/mxr-data/addons/incoming`;
+        print LOG `cd /data/amo-code/bin; $TIME python2.6 -S latest_addon_extractor.py /data/addons /data/mxr-data/addons/incoming`;
 	print LOG `mv /data/mxr-data/addons/addons /data/mxr-data/addons/old`;
 	print LOG `mv /data/mxr-data/addons/incoming /data/mxr-data/addons/addons`;
 	print LOG `mkdir /data/mxr-data/addons/incoming`;
@@ -452,7 +452,7 @@ for ($TREE) {
         last;
     };
     /^addons-stage$/ && do {
-        print LOG `cd /data/amo-code/bin; $TIME python26 -S latest_addon_extractor.py /data/addons /data/mxr-data/addons-stage/addons`;
+        print LOG `cd /data/amo-code/bin; $TIME python2.6 -S latest_addon_extractor.py /data/addons /data/mxr-data/addons-stage/addons`;
         last;
     };
     /^(?:.*)$/ && do {