deploy playground refactor

.github/workflows/deploy-aws-docker-compose.yml → .github/workflows/deploy-playground.yml

@@ -1,4 +1,4 @@
-name: Deploy docker-compose stack on AWS EC2
+name: Deploy Playground
 
 on:
   workflow_dispatch:
@@ -25,11 +25,11 @@ defaults:
     working-directory: devops/aws
 
 jobs:
-  run-docker-compose:
+  deploy-playground:
     name: Create an EC2 instance and configure docker-compose stack
     runs-on: ubuntu-latest
     env:
-      STACK_NAME: docker-compose-ga-${{ github.run_number }}
+      STACK_NAME: joystream-playground-{{ github.event.inputs.branchName }}-${{ github.run_number }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -56,7 +56,7 @@ jobs:
       - name: Run playbook
         uses: dawidd6/action-ansible-playbook@v2
         with:
-          playbook: docker-setup-playbook.yml
+          playbook: deploy-playground-playbook.yml
           directory: devops/aws
           requirements: requirements.yml
           key: ${{ secrets.SSH_PRIVATE_KEY }}

devops/aws/docker-setup-playbook.yml → devops/aws/deploy-playground-playbook.yml

@@ -62,6 +62,8 @@
         chdir: '{{ remote_code_path }}'
       environment:
         PERSIST: 'true'
+        COLOSSUS_1_NODE_URI: 'https://{{ inventory_hostname }}.nip.io/colossus-1/'
+        DISTRIBUTOR_1_NODE_URI: 'https://{{ inventory_hostname }}.nip.io/distributor-1/'
       async: 1800
       poll: 0
       register: compose_result
@@ -87,7 +89,7 @@
         apply:
           become: yes
       vars:
-        caddy_config: "{{ lookup('template', 'templates/Caddyfile.j2') }}"
+        caddy_config: "{{ lookup('template', 'templates/Playground-Caddyfile.j2') }}"
         caddy_systemd_capabilities_enabled: true
         caddy_update: false
 
@@ -98,7 +100,9 @@
           - 'Pioneer: {{ nip_domain }}/pioneer/'
           - 'WebSocket RPC: {{ nip_domain }}/ws-rpc'
           - 'HTTP RPC: {{ nip_domain }}/http-rpc'
-          - 'Colossus: {{ nip_domain }}/colossus'
-          - 'Distributor: {{ nip_domain }}/distributor'
-          - 'GraphQL server: {{ nip_domain }}/graphql'
-          - 'Indexer: {{ nip_domain }}/indexer'
+          - 'Colossus: {{ nip_domain }}/colossus-1'
+          - 'Distributor: {{ nip_domain }}/distributor-1'
+          - 'GraphQL server: {{ nip_domain }}/query-node/server/graphql'
+          - 'Indexer: {{ nip_domain }}/query-node/indexer/graphql'
+          - 'Member Faucet: {{ nip_domain }}/member-faucet/register'
+          - 'Orion: {{ nip_domain }}/orion/graphql'

devops/aws/deploy-stack-docker-compose.sh → devops/aws/deploy-playground.sh

@@ -6,7 +6,7 @@ source common.sh
 
 if [ -z "$1" ]; then
   echo "ERROR: Configuration file not passed"
-  echo "Please use ./deploy-single-node.sh PATH/TO/CONFIG to run this script"
+  echo "Please use ./deploy-playground.sh PATH/TO/CONFIG to run this script"
   exit 1
 else
   echo "Using $1 file for config"
@@ -41,6 +41,6 @@ if [ $? -eq 0 ]; then
   echo -e "New Node Public IP: $SERVER_IP"
 
   echo -e "\n\n=========== Configuring node ==========="
-  ansible-playbook -i $SERVER_IP, --private-key $KEY_PATH docker-setup-playbook.yml \
+  ansible-playbook -i $SERVER_IP, --private-key $KEY_PATH deploy-playground-playbook.yml \
     --extra-vars "branch_name=$BRANCH_NAME git_repo=$GIT_REPO"
 fi

devops/aws/templates/Caddyfile.j2

@@ -1,33 +0,0 @@
-{{ nip_domain }}/ws-rpc* {
-    uri strip_prefix /ws-rpc
-    reverse_proxy localhost:9944
-}
-
-{{ nip_domain }}/http-rpc* {
-    uri strip_prefix /http-rpc
-    reverse_proxy localhost:9933
-}
-
-{{ nip_domain }}/pioneer* {
-    uri strip_prefix /pioneer
-    reverse_proxy localhost:3000
-}
-
-{{ nip_domain }}/colossus* {
-    uri strip_prefix /colossus
-    reverse_proxy localhost:3333
-}
-
-{{ nip_domain }}/distributor* {
-    uri strip_prefix /distributor
-    reverse_proxy localhost:3334
-}
-
-{{ nip_domain }}/graphql* {
-    reverse_proxy localhost:8081
-}
-
-{{ nip_domain }}/indexer* {
-    uri strip_prefix /indexer
-    reverse_proxy localhost:4000
-}

devops/aws/templates/Playground-Caddyfile.j2

@@ -0,0 +1,44 @@
+{{ nip_domain }}/ws-rpc* {
+    uri strip_prefix /ws-rpc
+    reverse_proxy localhost:9944
+}
+
+{{ nip_domain }}/http-rpc* {
+    uri strip_prefix /http-rpc
+    reverse_proxy localhost:9933
+}
+
+{{ nip_domain }}/pioneer* {
+    uri strip_prefix /pioneer
+    reverse_proxy localhost:3000
+}
+
+{{ nip_domain }}/colossus-1* {
+    uri strip_prefix /colossus-1
+    reverse_proxy localhost:3333
+}
+
+{{ nip_domain }}/distributor-1* {
+    uri strip_prefix /distributor-1
+    reverse_proxy localhost:3334
+}
+
+{{ nip_domain }}/query-node/server* {
+    uri strip_prefix /query-node/server
+    reverse_proxy localhost:8081
+}
+
+{{ nip_domain }}/query-node/indexer* {
+    uri strip_prefix /query-node/indexer
+    reverse_proxy localhost:4000
+}
+
+{{ nip_domain }}/orion* {
+    uri strip_prefix /orion
+    reverse_proxy localhost:6116
+}
+
+{{ nip_domain }}/member-faucet* {
+    uri strip_prefix /member-faucet
+    reverse_proxy localhost:3002
+}