trying to pull updates

.gitignore

@@ -0,0 +1 @@
+db-links.txt

.gitmodules

@@ -1,21 +1,18 @@
-[submodule "pushkin-api"]
-	path = pushkin-api
-	url = https://github.com/pushkin-consortium/pushkin-api.git
-[submodule "pushkin-worker"]
-	path = pushkin-worker
-	url = https://github.com/pushkin-consortium/pushkin-worker.git
-[submodule "pushkin-server"]
-	path = pushkin-server
-	url = https://github.com/pushkin-consortium/pushkin-server.git
-[submodule "pushkin-db"]
-	path = pushkin-db
-	url = https://github.com/pushkin-consortium/pushkin-db.git
-[submodule "pushkin-cron"]
-	path = pushkin-cron
-	url = https://github.com/pushkin-consortium/pushkin-cron.git
-[submodule "pushkin-cli"]
-	path = pushkin-cli
-	url = https://github.com/pushkin-consortium/pushkin-cli.git
-[submodule "pushkin-react"]
-	path = pushkin-react
-	url = https://github.com/pushkin-consortium/pushkin-react.git
+[submodule "front-end"]
+	path = front-end
+	url = https://github.com/gameswithwords/front-end.git
+[submodule "api"]
+	path = api
+	url = https://github.com/gameswithwords/api.git
+[submodule "server"]
+	path = server
+	url = https://github.com/gameswithwords/server.git
+[submodule "db-worker"]
+	path = db-worker
+	url = https://github.com/gameswithwords/db-worker.git
+[submodule "cron"]
+	path = cron
+	url = https://github.com/gameswithwords/cron.git
+[submodule "experiments"]
+	path = experiments
+	url = https://github.com/gameswithwords/experiments.git

CreateTransactionDB.sql

@@ -1,5 +1,6 @@
-create table transactions (
+CREATE TABLE transactions (
    id  SERIAL PRIMARY KEY,
-   query TEXT not null,
-   bindings TEXT
+   query TEXT NOT NULL,
+   bindings TEXT,
+   created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 )

README.md

@@ -15,15 +15,15 @@ It consists of 5 key parts
 ## Why Pushkin
 
 ## Assumptions
-1. You are somewhat familiar with isntalling programs and understand what your terminal is and how to use it.
+1. You are familiar with installing programs and understand what your terminal is and how to use it.
 2. You have access to a text editor like sublime/notepad++/etc.
 3. [Docker](http://docker.com) is installed on your machine
 
 
 ## Getting started
 
 ### Development Mode
-1. docker-compose up -f docker-compose.debug.yml
+1. docker-compose -f docker-compose.debug.yml up
 
 
 ## Deploying

config.js

@@ -0,0 +1,7 @@
+var config= {};
+
+config.name = 'gww'
+
+exports.getConfig = function() {
+  return config;
+}

docker-compose.debug.yml

@@ -1,76 +1,103 @@
 version: '2'
 services:
-  nginx:
-    image: 'pushkinl3/pushkin-server:latest'
-    build:
-      context: ./pushkin-server
-      dockerfile: Dockerfile
-    ports:
-      - '80:80'
-    links:
-      - 'api:api'
   api:
-    image: 'pushkinl3/pushkin-api:latest'
+    image: gameswithwords/api:latest
     expose:
       - '3000'
     build:
-      context: ./pushkin-api
+      context: ./api
       dockerfile: Dockerfile
     volumes:
-      - './pushkin-api:/usr/src/app'
+      - ./api:/usr/src/app
     command: bash start.debug.sh
     depends_on:
       - message-queue
     environment:
       - NODE_ENV=production
-      - 'AMPQ_ADDRESS=amqp://message-queue:5672'
+      - AMPQ_ADDRESS=amqp://message-queue:5672
     links:
       - message-queue
-  message-queue:
-    image: 'rabbitmq:management'
+  cron:
+    image: gameswithwords/cron:latest
+    build:
+      context: ./cron
+      dockerfile: Dockerfile
+    environment:
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - API_ADDRESS=http://api:3000/api
+      - DATABASE_URL=postgres://postgres@db:5432/dev
+      - TRANSACTION_DATABASE_URL=postgres://postgres@transactiondb:5432/transactions-dev
+    links:
+      - message-queue
+      - db
+      - transactiondb
+      - api
+  db:
+    image: postgres:latest
+    environment:
+      - POSTGRES_DB=dev
+      - POSTGRES_USER=postgres
     expose:
-      - 5672
+      - '5432'
     ports:
-      - '8080:15672'
+      - '5432:5432'
   db-worker:
-    image: 'pushkinl3/pushkin-db:latest'
+    image: gameswithwords/db-worker:latest
     build:
-      context: ./pushkin-db
+      context: ./db-worker
       dockerfile: Dockerfile
     volumes:
-      - './pushkin-db:/usr/src/app'
+      - ./db-worker:/usr/src/app
     command: bash start.debug.sh
     depends_on:
       - message-queue
     environment:
-      - 'AMPQ_ADDRESS=amqp://message-queue:5672'
-      - 'DATABASE_URL=DB_URL'
-      - 'TRANSACTION_DATABASE_URL=T_DB_URL'
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - DATABASE_URL=postgres://postgres@db:5432/dev
+      - TRANSACTION_DATABASE_URL=postgres://postgres@transactiondb:5432/transactions-dev
     links:
       - message-queue
-      - 'db:db'
-      - 'transactiondb:transactiondb'
-  db:
-    image: 'postgres:latest'
-    environment:
-      - POSTGRES_DB=pushkin-development
-      - POSTGRES_USER=postgres
-  cron:
-    image: 'pushkinl3/pushkin-cron:latest'
+      - db
+      - transactiondb
+  message-queue:
+    image: rabbitmq:management
+    expose:
+      - '5672'
+    ports:
+      - '8080:15672'
+  server:
+    image: gameswithwords/server:latest
     build:
-      context: ./pushkin-cron
+      context: ./server
       dockerfile: Dockerfile
-    environment:
-      - 'AMPQ_ADDRESS=amqp://message-queue:5672'
-      - 'DATABASE_URL=DB_URL'
+    ports:
+      - '80:80'
     links:
-      - message-queue
-      - 'db:db'
+      - api
   transactiondb:
-    image: 'pushkinl3/pushkin-transactiondb:latest'
+    image: gameswithwords/transactiondb:latest
     build:
       context: ./
       dockerfile: Dockerfile.transactiondb
     environment:
-      - POSTGRES_DB=transactions
+      - POSTGRES_DB=transactions-dev
       - POSTGRES_USER=postgres
+    expose:
+      - '5432'
+    ports:
+      - '5433:5432'
+  listener-quiz:
+    image: gameswithwords/listener-quiz:latest
+    build:
+      context: ./workers/listener-quiz
+      dockerfile: Dockerfile
+    volumes:
+      - ./workers/listener-quiz:/usr/src/app
+    command: bash start.debug.sh
+    depends_on:
+      - message-queue
+    environment:
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - QUEUE=listener-quiz
+    links:
+      - message-queue

docker-compose.production.yml

@@ -1,58 +1,98 @@
 version: '2'
 services:
+  api:
+    image: gameswithwords/api:latest
+    environment:
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - NODE_ENV=production
+    links:
+      - message-queue
+    command:
+      - bash
+      - start.sh
+    labels:
+      io.rancher.scheduler.global: 'true'
   cron:
-    image: 'pushkinl3/games-with-words-cron:latest'
+    image: gameswithwords/cron:latest
     environment:
-      - 'AMPQ_ADDRESS=amqp://message-queue:5672'
-      - 'DATABASE_URL=DB_URL'
-      - 'TRANSACTION_DATABASE_URL=T_DB_URL'
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - API_ADDRESS=http://api:3000/api
+      - DATABASE_URL=INSERT_HERE
+      - TRANSACTION_DATABASE_URL=INSERT_HERE
     links:
-      - 'message-queue:message-queue'
-  api-balancer:
-    image: 'rancher/lb-service-haproxy:v0.4.9'
-    ports:
-      - '80:80/tcp'
-      - '8080:8080/tcp'
+      - message-queue
+      - api
     labels:
-      io.rancher.container.agent.role: environmentAdmin
-      io.rancher.container.create_agent: 'true'
-  message-queue:
-    image: rabbitmq
-    expose:
-      - '5672'
+      io.rancher.scheduler.global: 'true'
   db-worker:
-    image: 'pushkinl3/games-with-words-db-worker:latest'
+    image: gameswithwords/db-worker:latest
     environment:
-      - 'AMPQ_ADDRESS=amqp://message-queue:5672'
-      - 'DATABASE_URL=DB_URL'
-      - 'TRANSACTION_DATABASE_URL=T_DB_URL'
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - DATABASE_URL=INSERT_HERE
+      - TRANSACTION_DATABASE_URL=INSERT_HERE
       - NODE_ENV=production
     links:
-      - 'message-queue:message-queue'
+      - message-queue
     command:
       - bash
       - start.sh
     labels:
-      io.rancher.container.pull_image: always
-  nginx:
-    image: 'pushkinl3/games-with-words-nginx:latest'
-    links:
-      - 'api:api'
+      io.rancher.scheduler.global: 'true'
+  load-balancer:
+    image: rancher/lb-service-haproxy
     ports:
-      - '80:80/tcp'
+      - '80'
+      - '443'
     labels:
-      io.rancher.container.pull_image: always
-  api:
-    image: 'pushkinl3/games-with-words-api:latest'
+      io.rancher.scheduler.global: 'true'
+      io.rancher.container.agent.role: environmentAdmin
+      io.rancher.container.create_agent: 'true'
+  message-queue:
+    image: gameswithwords/message-queue:latest
     environment:
-      - 'AMPQ_ADDRESS=amqp://message-queue:5672'
-      - NODE_ENV=production
+      CONFD_ARGS: --interval 5
+      RABBITMQ_CLUSTER_PARTITION_HANDLING: autoheal
+      RABBITMQ_NET_TICKTIME: '60'
+    volumes_from:
+    - message-queue-datavolume
+    labels:
+      io.rancher.scheduler.global: 'true'
+      io.rancher.sidekicks: message-queue-base,message-queue-datavolume
+      io.rancher.container.hostname_override: container_name
+  message-queue-base:
+    image: rabbitmq:3.6-management
+    environment:
+      RABBITMQ_ERLANG_COOKIE: message-queue-cookie
+    entrypoint:
+    - /opt/rancher/bin/run.sh
+    network_mode: container:message-queue
+    volumes_from:
+    - message-queue-datavolume
+    labels:
+      io.rancher.container.hostname_override: container_name
+  message-queue-datavolume:
+    image: rabbitmq:3.6-management
+    entrypoint:
+    - /bin/true
+    volumes:
+    - /etc/rabbitmq
+    - /opt/rancher/bin
+    labels:
+      io.rancher.container.start_once: 'true'
+      io.rancher.container.hostname_override: container_name
+  server:
+    image: gameswithwords/server:latest
+    labels:
+      io.rancher.scheduler.global: 'true'
+  listener-quiz:
+    image: gameswithwords/listener-quiz:latest
+    command: bash start.sh
+    depends_on:
+      - message-queue
+    environment:
+      - AMPQ_ADDRESS=amqp://message-queue:5672
+      - QUEUE=listener-quiz
     links:
-      - 'message-queue:message-queue'
-    expose:
-      - '3000'
-    command:
-      - bash
-      - start.sh
+      - message-queue
     labels:
-      io.rancher.container.pull_image: always
+      io.rancher.scheduler.global: 'true'