fix: getting things working

etclabscore · Aug 20, 2019 · 95319cd · 95319cd
1 parent 39da448
commit 95319cd
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 16 deletions.
diff --git a/.ebextensions/enable-websockets.config b/.ebextensions/enable-websockets.config
diff --git a/80/jade-service-runner-manifest.json b/80/jade-service-runner-manifest.json
@@ -0,0 +1,4 @@
+{
+  "version": "0.0.1",
+  "lastModified": "2019-08-20T06:46:22.630Z"
+}
diff --git a/cfn/init-base.sh b/cfn/init-base.sh
@@ -9,5 +9,5 @@ aws cloudformation create-stack \
     --region us-west-2 || true
 
 aws cloudformation wait stack-create-complete \
-    --stack-name jade-service-runner-base--stack \
+    --stack-name jade-service-runner-base-stack \
     --region us-west-2 || true
diff --git a/cfn/jade-service-runner.cfn.json b/cfn/jade-service-runner.cfn.json
@@ -155,19 +155,44 @@
           },
           {
             "Namespace": "aws:elb:loadbalancer",
-            "OptionName": "LoadBalancerHTTPPort",
-            "Value": 80
+            "OptionName": "SSLCertificateId",
+            "Value": { "Ref": "AutoCertificate" }
           },
           {
-            "Namespace": "aws:elb:loadbalancer",
-            "OptionName": "LoadBalancerHTTPSPort",
-            "Value": 443
+            "Namespace": "aws:elb:listener:443",
+            "OptionName": "InstancePort",
+            "Value": 8081
           },
           {
-            "Namespace": "aws:elb:loadbalancer",
+            "Namespace": "aws:elb:listener:443",
+            "OptionName": "InstanceProtocol",
+            "Value": "HTTP"
+          },
+          {
+            "Namespace": "aws:elb:listener:443",
+            "OptionName": "ListenerProtocol",
+            "Value": "HTTPS"
+          },
+          {
+            "Namespace": "aws:elb:listener:443",
             "OptionName": "SSLCertificateId",
             "Value": { "Ref": "AutoCertificate" }
           },
+          {
+            "Namespace": "aws:elb:listener:80",
+            "OptionName": "InstancePort",
+            "Value": 8081
+          },
+          {
+            "Namespace": "aws:elb:listener:80",
+            "OptionName": "InstanceProtocol",
+            "Value": "HTTP"
+          },
+          {
+            "Namespace": "aws:elb:listener:80",
+            "OptionName": "ListenerProtocol",
+            "Value": "HTTP"
+          },
           {
             "Namespace": "aws:elasticbeanstalk:container:nodejs",
             "OptionName": "NodeCommand",
@@ -176,7 +201,7 @@
           {
             "Namespace": "aws:elasticbeanstalk:container:nodejs",
             "OptionName": "ProxyServer",
-            "Value": "None"
+            "Value": "none"
           }
         ]
       }

diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "build:semiclean": "rm -rf build/generated-client/rust",
     "build:integration": "webpack --config fixtures/webpack.config.js",
     "build:docs": "typedoc",
-    "startaws": "npm run build:code && node build/src/cli/index.js -p 80",
+    "startaws": "npm run build:code && node build/src/cli/index.js -p 8081",
     "start": "npm run build:code && node build/src/cli/index.js -d $PORT",
     "start:client": "node build/client.js",
     "test": "npm run test:lint && npm run test:unit",