Change configuration back to production server

SumOfUs · Jul 5, 2016 · 4ff48d9 · 4ff48d9
1 parent 9469483
commit 4ff48d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.ebextensions/05_nginx_proxy.config b/.ebextensions/05_nginx_proxy.config
@@ -11,8 +11,8 @@ files:
 
       server {
         listen         80;
-        server_name    test.sumofus.org;
-        return  301 https://action-staging.sumofus.org$request_uri;
+        server_name    community.sumofus.org;
+        return  301 https://actions.sumofus.org$request_uri;
       }
 
       server {

diff --git a/circle.yml b/circle.yml
@@ -32,7 +32,7 @@ deployment:
       - docker push soutech/champaign_web
       - ./deploy.sh $CIRCLE_SHA1 'champaign' 'env-production' 'champaign-assets-production' 'logs3.papertrailapp.com:44107' 'actions.sumofus.org'
   staging:
-    branch: nginx-subdomains
+    branch: development
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       - docker push soutech/champaign_web