Merge branch 'master' of https://github.com/broadinstitute/dig-diabet…

…es-portal
broadinstitute · Jun 5, 2019 · 01cce03 · 01cce03
2 parents 392b62d + a3fe364
commit 01cce03
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy
@@ -159,7 +159,7 @@ digawsqanewKB_fed_dedicated_EBIv2 = new ServerBean("Dedicated EBI QA fed KB - Us
 
 
 // this will be your default
-defaultRestServer = digawsdevWorkflowKBrevised
+defaultRestServer = digawsqanewKB
 
 
 
@@ -169,7 +169,6 @@ getRestServerList = [
         digdevlocalFederatedServer,
         digAWSKBV2prodServer,
         federatedAwsProdKBV2Server,
-        digawsdevnewKB,
         digawsqanewKB,
         digawsdevWorkflowKB,
         digawsdevWorkflowKBrevised,
@@ -316,9 +315,9 @@ environments {
 
 //        grails.serverURL = "http://demo52k.us-east-1.elasticbeanstalk.com"
 //      grails.serverURL = "http://ci-env.elasticbeanstalk.com"
-      grails.serverURL = "http://type2diabetes-dev.elasticbeanstalk.com"
+//      grails.serverURL = "http://type2diabetes-dev.elasticbeanstalk.com"
 
-//     grails.serverURL = "http://type2diabetesgen-qasrvr.elasticbeanstalk.com"
+     grails.serverURL = "http://type2diabetesgen-qasrvr.elasticbeanstalk.com"
 
 
 //      grails.serverURL = "http://ec2-54-175-211-21.compute-1.amazonaws.com/"              // temp for now, will house new prdsrv1 URL
@@ -597,7 +596,7 @@ portal.type.override = "t2d"     // options are "t2d", "stroke", "mi", "ibd", "e
 
 portal.data.versionDesignator = [ new PortalVersionBean("t2d",      // label for this portal type
                                                         "T2D",  // displayable label for this portal type
-                                                        "mdv37",    // the MDV number for this portal
+                                                        "mdv38",    // the MDV number for this portal
                                                         "T2DKP", // name of KB data we want
                                                         "T2D",      // the default phenotype for this portal
                                                         "ExSeq_19k_mdv28",  // default data set.  Used rarely.
@@ -976,3 +975,6 @@ portal.data.versionDesignator = [ new PortalVersionBean("t2d",      // label for
 
 
 // Here the secret authentication strings
+
+auth.providers.twitter.secret = 'l3dJBs3w9QraAuivcfaqdjVGkJ4cxQSMMNNkZ6v9bwz8nXBCXQ'
+oauth.providers.google.secret = 'HKIxi3AOLAgyFV6lDJQCfEgY'