Skip to content

Commit

Permalink
Restore proxying now that SSLProxyEngine is enabled.
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias committed Mar 27, 2015
1 parent 0ec4c9f commit fada2a2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 2 additions & 0 deletions builds/.htaccess
Expand Up @@ -4,6 +4,8 @@ RewriteRule ^([0-9]+)/(.*)$ http://downloads.immutant.or

RewriteRule ^(torquebox-immutant\.zip)$ http://projectodd.ci.cloudbees.com/job/overlay/lastSuccessfulBuild/artifact/target/$1 [P]

RewriteRule ^build-info/(.*)$ https://projectodd.ci.cloudbees.com/$1 [P]

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(LATEST/)?(.*)$ http://downloads.immutant.org/incremental/immutant/LATEST/$2 [P]
Expand Down
2 changes: 1 addition & 1 deletion builds/2x/incremental-builds.js
Expand Up @@ -182,5 +182,5 @@ renderer = {

};

j = new Jenkins( renderer, 'http://projectodd.ci.cloudbees.com', 'immutant2-incremental',
j = new Jenkins( renderer, '/builds/build-info', 'immutant2-incremental',
[['', '1_6_0']] );
2 changes: 1 addition & 1 deletion builds/incremental-builds.js
Expand Up @@ -229,7 +229,7 @@ renderer = {

};

j = new Jenkins( renderer, 'http://projectodd.ci.cloudbees.com', 'immutant-incremental',
j = new Jenkins( renderer, '/builds/build-info', 'immutant-incremental',
[['clojure_compat_version=1.4.0,label=m1.large', '1_4_0'],
['clojure_compat_version=1.5.1,label=m1.large', '1_5_1'],
['clojure_compat_version=1.6.0,label=m1.large', '1_6_0']] );
2 changes: 0 additions & 2 deletions javascripts/jenkins.js
Expand Up @@ -13,7 +13,6 @@ Jenkins.prototype = {
var self = this;
$.ajax( {
url: self.job_url('api/json?depth=1' ),
//jsonp: 'jsonp',
dataType: 'json',
type: 'GET',
context: self,
Expand All @@ -33,7 +32,6 @@ Jenkins.prototype = {
$.each( self.matrix, function(i, matrix_leg ) {
$.ajax( {
url: self.job_url( matrix_leg[0] + '/api/json?depth=1' ),
//jsonp: 'jsonp',
dataType: 'json',
type: 'GET',
context: self,
Expand Down

0 comments on commit fada2a2

Please sign in to comment.