From 7c4b39e6d6baaa0916bb7d112d91056091e28378 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Thu, 5 Sep 2019 21:05:14 +0200
Subject: [PATCH] merge all ops tasks into single cli

---
 .npmrc             |  1 -
 Makefile           | 11 ++++-------
 docker-compose.yml |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 .npmrc

diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index 43c97e7..0000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-package-lock=false
diff --git a/Makefile b/Makefile
index 7510060..a25adf7 100644
--- a/Makefile
+++ b/Makefile
@@ -10,26 +10,23 @@ help:
 
 setup:
 	@docker-compose build
-	@docker-compose run accounts pip install --user -r requirements.txt -r requirements-dev.txt
 	@docker-compose run script npm install
 	@docker-compose run vault npm install
 	@docker-compose run auditorium npm install
 	@docker-compose run server go mod download
-	@docker-compose run kms go mod download
 	@echo "Successfully built containers and installed dependencies."
 	@echo "If this is your initial setup, you can run 'make bootstrap' next"
 	@echo "to create the needed local keys and seed the database."
 
 bootstrap:
-	@echo "Bootstrapping KMS service ..."
-	@docker-compose run kms make bootstrap
 	@echo "Bootstrapping Server service ..."
 	@docker-compose run server make bootstrap
-	@echo "Bootstrapping Accounts service ..."
-	@docker-compose run accounts make bootstrap
 
 build:
 	@docker build -t offen-server:latest -f build/server/Dockerfile .
 	@docker build -t offen-proxy:latest -f build/proxy/Dockerfile .
 
-.PHONY: setup bootstrap build
+secret:
+	@docker-compose run server make secret
+
+.PHONY: setup bootstrap build secret
diff --git a/docker-compose.yml b/docker-compose.yml
index 400001a..aba0902 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       DEVELOPMENT: '1'
       COOKIE_EXCHANGE_SECRET: 3P+w6QetKO3Kn8h1YyRlCw==
       EVENT_RETENTION_PERIOD: 4464h
-      ACCOUNT_USER_EMAIL_SALT: S6ielTPzd/AGR88FI25c4Q==
+      ACCOUNT_USER_EMAIL_SALT: JuhbRA4lCdo8rt5qVdLpk3==
     command: refresh run
     links:
       - server_database