From 1e39d2d0d48ba56bf88b9ac5de19058a6d5e8184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 29 Aug 2018 13:19:32 -0400
Subject: [PATCH] use 8080 for http and 8443 for https to match cloudflare

---
 ansible/group_vars/all.yml            | 2 +-
 ansible/roles/swarm/defaults/main.yml | 3 ++-
 ansible/roles/swarm/tasks/swarm.yml   | 2 +-
 main.tf                               | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 93d1315..a95ffb0 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -9,7 +9,7 @@ nginx_configs:
 
 nginx_sites:
   swarm_lb:
-    - listen 8900 ssl
+    - listen 8443 ssl
 
     - server_name {{ env }}-{{ stage }}.status.im
 
diff --git a/ansible/roles/swarm/defaults/main.yml b/ansible/roles/swarm/defaults/main.yml
index b7e2b7f..743c230 100644
--- a/ansible/roles/swarm/defaults/main.yml
+++ b/ansible/roles/swarm/defaults/main.yml
@@ -25,7 +25,8 @@ geth_account: ~
 
 # main http port
 swarm_addr: '0.0.0.0'
-swarm_port: 8800
+swarm_port: 8080
+swarm_ssl: 8443
 
 # for key generation
 genkey_image: 'ethereum/client-go:alltools-latest'
diff --git a/ansible/roles/swarm/tasks/swarm.yml b/ansible/roles/swarm/tasks/swarm.yml
index fe0c2bd..7a045ab 100644
--- a/ansible/roles/swarm/tasks/swarm.yml
+++ b/ansible/roles/swarm/tasks/swarm.yml
@@ -40,6 +40,6 @@
   with_items:
     - { 'name': 'Swarm',       'port': '{{ cont_port }}',  'proto': 'udp' }
     - { 'name': 'Swarm HTTP',  'port': '{{ swarm_port }}', 'proto': 'tcp' }
-    - { 'name': 'Swarm HTTPS', 'port': 8900,               'proto': 'tcp' }
+    - { 'name': 'Swarm HTTPS', 'port': '{{ swarm_ssl }}',  'proto': 'tcp' }
   notify:
     - Save iptables rules
diff --git a/main.tf b/main.tf
index 12013b5..35a4472 100644
--- a/main.tf
+++ b/main.tf
@@ -54,8 +54,8 @@ module "swarm" {
   eth_network = "${var.eth_network}"
   /* firewall */
   open_ports  = [
-    "8800-8800",   /* http */
-    "8900-8900",   /* https */
+    "8080-8080",   /* http */
+    "8443-8443",   /* https */
     "30303-30303", /* geth */
     "30399-30399", /* swarm */
   ]