Permalink
Browse files

NOJIRA - squash commit into new MYB-1383 to allow rebasing again

Merge branch 'MYB-1383-merges' into MYB-1383

* MYB-1383-merges:
  MYB-1383 - updating configs and adding missing configs to enable hybrid in all environments except localhost where it is turned off in env.localhost.js
  MYB-1383 - need to use CAS proxy tickets for Hybrid
  MYB-527 - adding back hybrid configs that got steeped on at some point
  • Loading branch information...
1 parent dda2ff3 commit c810c07b6f1d5f313362be88abd9ac848be30b30 John King committed May 3, 2012
@@ -1,5 +1,5 @@
define(["config/config"], function(config) {
- config.isDev = false;
+ config.isDev = true;
// Tracking and statistics
config.Tracking = {
@@ -3,6 +3,6 @@
sakai.auth.cas.url.server=https://auth-test.berkeley.edu/cas
sakai.auth.cas.url.login=https://auth-test.berkeley.edu/cas/login
sakai.auth.cas.url.logout=https://auth-test.berkeley.edu/cas/logout?url=https://calcentral-dev.berkeley.edu
-sakai.auth.cas.prop.proxy=false
+sakai.auth.cas.prop.proxy=true
# The path that this handler should do auth for
path=/
@@ -7,5 +7,6 @@ define(["config/config"], function(config) {
WebPropertyID : "UA-21809393-3"
}
};
-
+ config.showSakai2=false;
+ config.useLiveSakai2Feeds=false;
});
@@ -1 +1,3 @@
sakai.auth.trusted.token.ttl=3600000
+sakai.auth.trusted.server.secret=default-setting-change-before-use #generate this per environment
+sakai.auth.trusted.server.safe-hostsaddress=localhost;127.0.0.1;0:0:0:0:0:0:0:1%0;128.32.143.109 #sakai-dev.media.berkeley.edu
@@ -0,0 +1,3 @@
+port=80
+hostname=sakai-dev.berkeley.edu # to allow localhost to do hybrid if desired
+sharedSecret=default-setting-change-before-use #generate this per environment
@@ -7,5 +7,7 @@ define(["config/config"], function(config) {
WebPropertyID : "UA-21809393-1"
}
};
-
+ config.showSakai2=true;
+ config.useLiveSakai2Feeds=true;
+ config.hybridCasHost="bspace.berkeley.edu";
});
@@ -1 +1,3 @@
sakai.auth.trusted.token.ttl=3600000
+sakai.auth.trusted.server.secret=default-setting-change-before-use #generate this per environment
+sakai.auth.trusted.server.safe-hostsaddress=localhost;127.0.0.1;0:0:0:0:0:0:0:1%0;128.32.143.93 #bspace.berkeley.edu
@@ -0,0 +1,3 @@
+port=80
+hostname=bspace.berkeley.edu
+sharedSecret=default-setting-change-before-use #generate this per environment
@@ -7,5 +7,7 @@ define(["config/config"], function(config) {
WebPropertyID : "UA-21809393-2"
}
};
-
+ config.showSakai2=true;
+ config.useLiveSakai2Feeds=true;
+ config.hybridCasHost="sakai-qa.berkeley.edu";
});
@@ -1 +1,3 @@
sakai.auth.trusted.token.ttl=3600000
+sakai.auth.trusted.server.secret=default-setting-change-before-use #generate this per environment
+sakai.auth.trusted.server.safe-hostsaddress=localhost;127.0.0.1;0:0:0:0:0:0:0:1%0;128.32.143.118 #sakai-qa.berkeley.edu
@@ -0,0 +1,3 @@
+port=80
+hostname=sakai-qa.berkeley.edu
+sharedSecret=default-setting-change-before-use #generate this per environment
@@ -7,5 +7,7 @@ define(["config/config"], function(config) {
WebPropertyID : "UA-21809393-2"
}
};
-
+ config.showSakai2=true;
+ config.useLiveSakai2Feeds=true;
+ config.hybridCasHost="sakai-qa.berkeley.edu"; // what do we use for bspace staging?
});
@@ -1 +1,3 @@
sakai.auth.trusted.token.ttl=3600000
+sakai.auth.trusted.server.secret=default-setting-change-before-use #generate this per environment
+sakai.auth.trusted.server.safe-hostsaddress=localhost;127.0.0.1;0:0:0:0:0:0:0:1%0;128.32.143.118 #sakai-qa.berkeley.edu ???
@@ -0,0 +1,3 @@
+port=80
+hostname=sakai-qa.berkeley.edu # what do we use for hybrid on staging?
+sharedSecret=default-setting-change-before-use #generate this per environment

0 comments on commit c810c07

Please sign in to comment.