From f101a32916d8664ed4a130912b60aa65cd09f1f4 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Sun, 8 Jan 2017 14:18:03 -0500 Subject: [PATCH 1/4] Added configuration for git-crypt --- .gitattributes | 1 + server/.gitignore | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitattributes create mode 100644 server/.gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..fcfea76 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +server/config.json filter=git-crypt diff=git-crypt diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/server/.gitignore @@ -0,0 +1 @@ +node_modules From 1386a6988e26b6256949bd74c8151e77352c6988 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Sun, 8 Jan 2017 14:23:41 -0500 Subject: [PATCH 2/4] Adding secret config file --- server/app.yaml | 3 --- server/config.json | Bin 0 -> 227 bytes server/package.json | 8 +++++--- server/server.js | 23 ++++++++++++++++++++--- 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 server/config.json diff --git a/server/app.yaml b/server/app.yaml index 3cc6b18..fff9db3 100644 --- a/server/app.yaml +++ b/server/app.yaml @@ -1,8 +1,5 @@ runtime: custom env: flex api_version: 1 -env_variables: - FASTBOOT_GCS_BUCKET: contributor-days-assets - FASTBOOT_GCS_KEY: fastboot-release.json health_check: enable_health_check: False \ No newline at end of file diff --git a/server/config.json b/server/config.json new file mode 100644 index 0000000000000000000000000000000000000000..b9e5c307007a3214574dd9d0a55980dc7b8c5148 GIT binary patch literal 227 zcmV<90381SM@dveQdv+`05MYD>@c4B;sKwFTHQ+BOHKAX@jSR~nR73jlp^3+tp2?w z7x+J|vkNawxXO3j@Iye+zl0&7Y@{N`S2DO<{q9T)#cZ!dwEj`ykMhd2>|+YaItKkg z-h%(STkR_g%E-u)%wk_xR;O&fzzr}9XC| dy?o$6x%$)j$y}KPn?90uLdvmrWX4gk)LLQ4bkYC- literal 0 HcmV?d00001 diff --git a/server/package.json b/server/package.json index 7ddf00f..3914dfa 100644 --- a/server/package.json +++ b/server/package.json @@ -7,7 +7,7 @@ "scripts": { "start": "node server.js", "test": "echo \"Error: no test specified\" && exit 1", - "deploy": "gcloud --project=<%= dasherizedModuleName ?> app deploy" + "deploy": "gcloud --project=contributor-days app deploy" }, "engines": { "node": "~5.3" @@ -20,6 +20,8 @@ "@google/cloud-debug": "0.8.1", "fastboot-app-server": "^1.0.0-rc.5", "fastboot-gcloud-storage-downloader": "^0.1.0", - "fastboot-gcloud-storage-notifier": "^0.1.0" + "fastboot-gcloud-storage-notifier": "^0.1.0", + "fastboot-redis-cache": "taras/fastboot-redis-cache#add-password-option", + "nconf": "0.8.4" } -} \ No newline at end of file +} diff --git a/server/server.js b/server/server.js index e711c34..18f74c1 100644 --- a/server/server.js +++ b/server/server.js @@ -3,9 +3,16 @@ const GCloudStorageDownloader = require('fastboot-gcloud-storage-downloader'); const GCloudStorageNotifier = require('fastboot-gcloud-storage-notifier'); const FastBootAppServer = require('fastboot-app-server'); +const RedisCache = require('fastboot-redis-cache'); +const nconf = require('nconf'); -const GCS_BUCKET = process.env.FASTBOOT_GCS_BUCKET; -const GCS_KEY = process.env.FASTBOOT_GCS_KEY; +nconf.file({ file: 'config.json' }); + +const GCS_BUCKET = nconf.get('bucket'); +const GCS_KEY = nconf.get('key'); +const FASTBOOT_REDIS_HOST = nconf.get('redis_host'); +const FASTBOOT_REDIS_PORT = nconf.get('redis_port'); +const FASTBOOT_REDIS_PASSWORD = nconf.get('redis_password'); let downloader = new GCloudStorageDownloader({ bucket: GCS_BUCKET, @@ -17,9 +24,19 @@ let notifier = new GCloudStorageNotifier({ key: GCS_KEY }); +let cache = new RedisCache({ + host: FASTBOOT_REDIS_HOST, + port: FASTBOOT_REDIS_PORT, + password: FASTBOOT_REDIS_PASSWORD, + cacheKey(path) { + return `contributor-days-${path}`; + } +}); + let server = new FastBootAppServer({ downloader, - notifier + notifier, + cache }); server.start(); \ No newline at end of file From 794b4c650408e73978681d5a5a9e6bc60c8fd18f Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Sun, 8 Jan 2017 14:34:43 -0500 Subject: [PATCH 3/4] Added README --- server/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/README.md b/server/README.md index c77e3a6..396266b 100644 --- a/server/README.md +++ b/server/README.md @@ -1,3 +1,5 @@ # Ember FastBoot Server for Google Cloud +## Installation +1. Install [git-crypt]: `brew install git-crypt` From 8295ec6432d05d18bd2bb71ebdebd3c76c6967e2 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Sun, 8 Jan 2017 18:00:20 -0500 Subject: [PATCH 4/4] Fixed reference to keys --- server/server.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/server.js b/server/server.js index 18f74c1..22c38d0 100644 --- a/server/server.js +++ b/server/server.js @@ -10,9 +10,9 @@ nconf.file({ file: 'config.json' }); const GCS_BUCKET = nconf.get('bucket'); const GCS_KEY = nconf.get('key'); -const FASTBOOT_REDIS_HOST = nconf.get('redis_host'); -const FASTBOOT_REDIS_PORT = nconf.get('redis_port'); -const FASTBOOT_REDIS_PASSWORD = nconf.get('redis_password'); +const FASTBOOT_REDIS_HOST = nconf.get('redisHost'); +const FASTBOOT_REDIS_PORT = nconf.get('redisPort'); +const FASTBOOT_REDIS_PASSWORD = nconf.get('redisPassword'); let downloader = new GCloudStorageDownloader({ bucket: GCS_BUCKET,