Merge remote-tracking branch 'origin/feanil/xserver_vars' into jarv/termination-support

fbe3b31f · John Jarvis · 791b5e31 · 9ab782e8 · fbe3b31f · fbe3b31f
Commit fbe3b31f authored Jun 24, 2013 by John Jarvis
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cloudformation_templates/edx-reference-architecture.json
+2 -2

playbooks/roles/xserver/vars/main.yml
+1 -0

No files found.
--- a/cloudformation_templates/edx-reference-architecture.json
+++ b/cloudformation_templates/edx-reference-architecture.json
@@ -1429,8 +1429,8 @@
        "SecurityGroupEgress":[
          {
            "IpProtocol":"tcp",
-            "FromPort":"80",
-            "ToPort":"80",
+            "FromPort":"22",
+            "ToPort":"22",
            "CidrIp":"10.0.0.0/16"
          }
        ]

--- a/playbooks/roles/xserver/vars/main.yml
+++ b/playbooks/roles/xserver/vars/main.yml
 # Variables for the xserver.
 ---

+xserver_env_config: {}

 xserver_code_dir: "{{ app_base_dir }}/xserver"
 xserver_source_repo: "git://github.com/edx/xserver.git"