From 766e054199e1b157ec8ccba6914b3f84c2200d2e Mon Sep 17 00:00:00 2001
From: Akis Kesoglou <akiskesoglou@gmail.com>
Date: Thu, 25 Oct 2018 00:14:10 +0300
Subject: [PATCH] Fix up service configuration

---
 compose/services.yml | 15 +++++----------
 scripts/make-env     |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/compose/services.yml b/compose/services.yml
index 8cc43c6..bab2227 100644
--- a/compose/services.yml
+++ b/compose/services.yml
@@ -22,29 +22,24 @@ services:
       - redis
     environment:
       API_VPN_SERVICE_API_KEY: ${OPENBALENA_API_VPN_SERVICE_API_KEY}
-      AUTH_RESINOS_REGISTRY_CODE: ${OPENBALENA_RESINOS_REGISTRY_CODE}
       BALENA_ROOT_CA: ${OPENBALENA_ROOT_CA}
-      COOKIE_SESSION_SECRET: __unused__
+      COOKIE_SESSION_SECRET: ${OPENBALENA_COOKIE_SESSION_SECRET}
       DB_HOST: db.${OPENBALENA_HOST_NAME}
       DB_PASSWORD: docker
-      DB_POOL_SIZE:
       DB_PORT: 5432
       DB_USER: docker
-      DEBUG: '${OPENBALENA_DEBUG}'
       DELTA_HOST: delta.${OPENBALENA_HOST_NAME}
       HOST: api.${OPENBALENA_HOST_NAME}
       IMAGE_MAKER_URL: img.${OPENBALENA_HOST_NAME}
-      IMAGE_STORAGE_BUCKET: ${OPENBALENA_IMAGE_STORAGE_BUCKET:-resin-production-img-cloudformation}
-      IMAGE_STORAGE_PREFIX: ${OPENBALENA_IMAGE_STORAGE_PREFIX:-resinos}
-      INTERCOM_SECRET_KEY: __unused__
+      IMAGE_STORAGE_BUCKET: resin-production-img-cloudformation
+      IMAGE_STORAGE_PREFIX: resinos
+      IMAGE_STORAGE_ENDPOINT: s3.amazonaws.com
       JSON_WEB_TOKEN_EXPIRY_MINUTES: 10080
       JSON_WEB_TOKEN_SECRET: ${OPENBALENA_JWT_SECRET}
       MIXPANEL_TOKEN: __unused__
       PRODUCTION_MODE: '${OPENBALENA_PRODUCTION_MODE}'
       PUBNUB_PUBLISH_KEY: __unused__
       PUBNUB_SUBSCRIBE_KEY: __unused__
-      RATE_LIMIT_FACTOR: 1
-      RATE_LIMIT_MEMORY_BACKEND:
       REDIS_HOST: redis.${OPENBALENA_HOST_NAME}
       REDIS_PORT: 6379
       REGISTRY2_HOST: registry.${OPENBALENA_HOST_NAME}
@@ -95,6 +90,7 @@ services:
     cap_add:
       - NET_ADMIN
     environment:
+      API_SERVICE_API_KEY: ${OPENBALENA_API_VPN_SERVICE_API_KEY}
       BALENA_ROOT_CA: ${OPENBALENA_ROOT_CA}
       BALENA_VPN_PORT: 443
       LOGENTRIES_TOKEN: 
@@ -109,7 +105,6 @@ services:
       VPN_OPENVPN_SERVER_KEY: ${OPENBALENA_VPN_SERVER_KEY}
       VPN_OPENVPN_SERVER_DH: ${OPENBALENA_VPN_SERVER_DH}
       # FIXME: remove all of the following
-      API_SERVICE_API_KEY: __unused__
       PROXY_SERVICE_API_KEY: __unused__5
 
   db:
diff --git a/scripts/make-env b/scripts/make-env
index 8b7aa4a..1392256 100755
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -35,8 +35,8 @@ b64encode() {
 }
 
 cat <<STR
-export OPENBALENA_DEBUG=true
 export OPENBALENA_PRODUCTION_MODE=false
+export OPENBALENA_COOKIE_SESSION_SECRET=$(randstr 32)
 export OPENBALENA_HOST_NAME=$DOMAIN
 export OPENBALENA_JWT_SECRET=$(randstr 32)
 export OPENBALENA_RESINOS_REGISTRY_CODE=$(randstr 32)