From d344bc7e7ece76c0efb1f97aa36702182edf7b32 Mon Sep 17 00:00:00 2001 From: Phil Booth Date: Thu, 2 Mar 2017 15:06:28 +0000 Subject: [PATCH] fix(servers): run the auth mailer inside fxa-auth-server mozilla/fxa-local-dev#85) r=vladikoff --- _scripts/install_all.sh | 4 ---- servers.json | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/_scripts/install_all.sh b/_scripts/install_all.sh index a644e2064a..1fac0df378 100755 --- a/_scripts/install_all.sh +++ b/_scripts/install_all.sh @@ -13,8 +13,6 @@ git clone https://github.com/mozilla/fxa-js-client.git & git clone https://github.com/mozilla/fxa-auth-server.git & git clone https://github.com/mozilla/fxa-auth-db-mysql.git & -git clone https://github.com/mozilla/fxa-auth-mailer.git & - git clone https://github.com/mozilla/fxa-customs-server.git & git clone https://github.com/vladikoff/browserid-verifier.git -b http & @@ -50,8 +48,6 @@ cd fxa-profile-server; npm i; mkdir -p var/public/; cd .. cd fxa-basket-proxy; npm i; cd .. -cd fxa-auth-mailer; npm i; cd .. - cd 123done; npm i; CONFIG_123DONE=./config-local.json node ./scripts/gen_keys.js; cd .. cd syncserver; make build; cd .. diff --git a/servers.json b/servers.json index a6b6132ab2..df64fecbaf 100644 --- a/servers.json +++ b/servers.json @@ -166,8 +166,8 @@ }, { "name": "auth-mailer PORT 10136", - "script": "bin/server.js", - "cwd": "fxa-auth-mailer", + "script": "bin/mailer_server.js", + "cwd": "fxa-auth-server", "env": { "NODE_ENV": "dev" },