From a1449480f42e8079d396f18cba6861c74c4c13ba Mon Sep 17 00:00:00 2001 From: MStephan Date: Wed, 22 Aug 2018 23:06:16 +0100 Subject: [PATCH 1/4] expired service accounts; removed from repo; add travis base config; remove db password; remove CircleCI --- .gitignore | 3 ++ .travis.yml | 30 +++++++++++++ README.md | 2 +- circle.yml | 40 ------------------ conf/.netrc | 6 --- conf/info.json | 3 -- conf/key-file.json | 12 ------ ...nd-firebase-adminsdk-jm5jb-e33eab9419.json | 12 ------ conf/storage-keyfile.json | 12 ------ conf/watermark.png | Bin 4258 -> 0 bytes gulpfile.js | 2 +- 11 files changed, 35 insertions(+), 87 deletions(-) create mode 100644 .travis.yml delete mode 100644 circle.yml delete mode 100644 conf/.netrc delete mode 100644 conf/info.json delete mode 100644 conf/key-file.json delete mode 100644 conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json delete mode 100644 conf/storage-keyfile.json delete mode 100644 conf/watermark.png diff --git a/.gitignore b/.gitignore index e18299c..77f02ce 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ build coverage node_modules npm-debug.log + +conf/*.json +conf/*.tar diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b8dbb43 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +language: node_js +node_js: +- '6' +cache: + directories: + - node_modules +env: + global: + - NODE_ENV=staging + - URL="https://matchmyroute-backend.appspot.com" +addons: + postgresql: '9.6' + apt: + packages: + - postgresql-9.6-postgis-2.3 +before_script: +- psql -U postgres -c "create extension postgis" +- psql -c "CREATE USER testuser WITH PASSWORD 'test' SUPERUSER;" +- psql -c 'CREATE DATABASE "matchMyRouteTest" WITH OWNER testuser;' +script: +- npm run test +- npm run build +deploy: + provider: gae + keyfile: "./conf/key-file.json" + project: matchmyroute-backend + config: "./build/app.yaml" + skip_cleanup: true +after_deploy: +- npm run e2etest diff --git a/README.md b/README.md index 872e957..412d125 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ If you want to revoke accounts, you can do so with: ``` gcloud auth list -gcloud auth revoke james.gardner@geovation.uk +gcloud auth revoke john.smith@smith.com ``` If you want to see all the HTTP requests and responses during deployment you diff --git a/circle.yml b/circle.yml deleted file mode 100644 index cd627b2..0000000 --- a/circle.yml +++ /dev/null @@ -1,40 +0,0 @@ -machine: - node: - version: 6 - environment: - NODE_ENV: staging - -dependencies: - cache_directories: - - "/home/ubuntu/.config/gcloud" - - "/opt/circleci/nodejs/" - pre: - # - wget https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 - # - mv cloud_sql_proxy.linux.amd64 cloud_sql_proxy - # - chmod +x cloud_sql_proxy - # - gcloud config set project matchmyroute-backend - # - ./cloud_sql_proxy -instances=matchmyroute-backend:us-east1:matchmyroute-database=tcp:3307 -credential_file=conf/key-file.json: - # background: true - - psql -c "CREATE USER testuser WITH PASSWORD 'test' SUPERUSER;" - - psql -c 'CREATE DATABASE "matchMyRouteTest" WITH OWNER testuser;' - post: - - npm run clean - -test: - post: - - mkdir -p temp - - tar -cvzf temp/build.tgz build - - cp -a temp/build.tgz $CIRCLE_ARTIFACTS/ - - -deployment: - production: - branch: master - commands: - - sudo /opt/google-cloud-sdk/bin/gcloud components update -q -# - sudo /opt/google-cloud-sdk/bin/gcloud components install beta -q - - sudo chown ubuntu.ubuntu -R /home/ubuntu/.config/gcloud - - gcloud auth activate-service-account --key-file conf/key-file.json - - gcloud config set project matchmyroute-backend - - npm run deploy - - URL=https://matchmyroute-backend.appspot.com npm run e2etest diff --git a/conf/.netrc b/conf/.netrc deleted file mode 100644 index cbd6502..0000000 --- a/conf/.netrc +++ /dev/null @@ -1,6 +0,0 @@ -machine api.heroku.com - login sebastian.ovide@geovation.uk - password 25476055-73f6-429d-b72d-75212b11f77b -machine git.heroku.com - login sebastian.ovide@geovation.uk - password 25476055-73f6-429d-b72d-75212b11f77b diff --git a/conf/info.json b/conf/info.json deleted file mode 100644 index 72abc83..0000000 --- a/conf/info.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "some field": "put things here" -} \ No newline at end of file diff --git a/conf/key-file.json b/conf/key-file.json deleted file mode 100644 index ee40757..0000000 --- a/conf/key-file.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "matchmyroute-backend", - "private_key_id": "98b179e776b961530c361b48eab673d239c1723e", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC98nIU8WGXB9nA\nzWsu9ZWi/5OmJFOwAAPnDJnquSSgdwQ+L7s2wOryVX3zFQ8MqbjKDxG2krObgjSv\nUNO8M8vPk1C/driyTNxEomgN0zdBloNT3C+xc4XNwS4x1xBe0595G7jKTxeBqO4D\n4DOAKJoWZ5R0srKJA27RBsZJ54X9mo557L0Mtaj/cBNhJq1ktgIo2t0CWsSyCQCF\nZjtv2k13Nr4I8/jp5kBgMSvwnQK8ZT89NM1jbwi/y7sS3SgZCX65suSOrqcK+i5b\nwYPzkeEagoJ7foXPRqAyOB6uR3y6iPeejH1nP45NazWdG1of87fyahfj48kEeUZ9\nEOCaYTGLAgMBAAECggEAR09p/OrSFH1iBrwX7T1NvC/vIoSo1n5q+KcGcdSoJ4YH\nFcGdq2Spz+jArC3PxJVDRrh5ke1peIxdcyQJGbLoZTmNKxRLKsUoPKwsHGSbbggv\nraAQV7JjHWfVC+kNwEv6puD9cxZWYNsm4FWfgBG+J4MjfNxJop6jT94XO0+sQhTK\nrYpF4Pr90cjceIh1KMOQn4CsmLNCdTyJbgBXZUcoohhXezr2WLkJ4BewnLSm+Xuc\neKTDi4eUV1nVVS9JQSw2dK44gTQnzJrlvy0RmeQTjnmkWm0Tvq6vq8dxk1tNA82H\n2pzNHzT3YlIid2Xqh18KkM0eHoKVgcJwO1uBeveZAQKBgQDcz720SmGYLP8QQU5E\nPs89/+/IEAAJnwXM0rXQlnN+HqB1rsaDQFDS1lstzPOd2qNJysoPXZlt+xw2OdjJ\n9AwY1enhvKlNapGIentYA3wMaIzRJBoUcBr9txonGD+I9JU8yfH8zQa+lSq61vzp\nrtqO0kbVt2NNk7MvbsTBhY/oYQKBgQDcN43uoUYNcVuDYWLRmYMdhqxHABcbtYEn\n2griEk9maS7Xpts+xRm1XImyg1TJFCxb3ofqWB/wGVEJP69waRrzmBKfhdnOUa3A\nyTsCdErMDa0UT62LmCncuOOk+/016mJQ0yPZQFgfrX+Q8OZGWfEPp/x7B5QLBfq3\nuqU4MZCxawKBgQC942zJaZnKCxABw5dx+u2v7LQgwRm3LGkJfj7atTd2wxHMglO2\ntY2L8skQdwsdudLod5sSYbS7LtJRE6gJ7HSmuvbZqKuTpsymqGYAB2cbKKHIjRpc\nbxfXDipQanrg5SydzTDr7MkbBh5r9MwkjbjoT46Y5Y9hPF5AsSpFHf3moQKBgART\n8y4lbUMGX04Ns+t6oOELrIcYsVuSDZ/C4UPgKD9TAeCrHtP0+7RcxTgE7L2m79g+\nX11zre0CEl2kKsaCykzPSE5qSwWLBWcsjURXFME945Dqn/aGXww/dfngGfHdUWFV\nRPcYFKNKvZ8TnPL1AY/VNVkVpQsyauMBgA3Cq51RAoGBALTqvTPOxN4HgSEgacTZ\n9MiwVk0S6QtB+qTdgHKIaliXu9paxz8HRSnzhMU3Q2PfnTpCSZE8V1eh93nB4rjh\njdDXSA9HOjF2WrB3njZ2sQ2UGoqa2899SX/dab8D0dqhUmZ9bbR9Mwwhi50ofBMC\nl/wktZWDDz5MvQYbB3nkyG5W\n-----END PRIVATE KEY-----\n", - "client_email": "circleci@matchmyroute-backend.iam.gserviceaccount.com", - "client_id": "113509986719168488323", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://accounts.google.com/o/oauth2/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/circleci%40matchmyroute-backend.iam.gserviceaccount.com" -} diff --git a/conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json b/conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json deleted file mode 100644 index 80f15bf..0000000 --- a/conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "matchmyroute-backend", - "private_key_id": "e33eab9419a256fdb401c7426096f21d9383d1f7", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCbFCTsgpa4yMXy\n7MAgOQNbw/qQojTpK75TKa96SVBR53LSLY8CaJT6HF6vcrm2qQ4kzAJKlnHCzRqj\nc8ak3z7pWTLg6HOje49fsQ915vFlJ7076KH97oQXkr8KIL8gOEORnS9BNkAMDBrR\nPWECy4w+6y8I5G0sIfbTVV9xCYLHYRkNGob3g4dGe5mo+sJ4g9IvIAAs1KF/7iBc\ndkB/bCQpU8jCg5cXNDsg0EwKEQEdU0KPy1Z/S7yRoPPxJ6fS6jF2Zse3O5EhC6Jd\nf5Gm7pVGEz0ND4d85MJMYSZjUqHkZgBzex6lXkiHMD1O6FbwNcGUwEb20tqJ5ATZ\ni1MZGatXAgMBAAECggEAJGWacu4FXPI2T1kUkJuA98kr5kVDwNQU8+TNPBi34rk9\nICo0Ld8I1BjTej8lakMMQEOnaAUeRxenYGR8Y1bIJ7FZOSMlfOGzmURvuf7Nei3V\nApoLZxNTakr1TnW4FeJOrX7kR9xpNMqkgqZyvdqzHFNLcz1ViC2ihiA76cZPLOb1\n/mRkJJ+JBUUyIT8dxLc9mWFdLPtvDUm7WNAnAQYJqND83kEevEYXcBN4B/xn3Xq/\nSFi+jMqUExVDBLkTGKbO0+4LiS6gqXMSzoUM93kO2keS0Px0lt776/id9x3fBhbO\n16On/sB0+FZzzIymFTiar25mSotgsZcOBpt0YNXLIQKBgQDQv+nMp4KxdGWNIaHr\ni1hZbfEgs2fTnYbkIGVJgKSCaVV0q6/jePvUpGF9d/8/yt9dwO8dKpHOOszxb5sb\nU9nZGo5L1QQMtow/e6psmRMjZi+7CcrVkw3e1a1bbh8UXmL0q3u690KqYipwNoT+\n4CVvb9HKeHJe8X9sNC9+4Gd+IQKBgQC+Lj5w+0kZLfqY7MBAvU2m5Xdcuf/dTyEy\nn1GrQbO9bin0vDqdt5Zy0OZFcDN+ZqfohJjack7IgZAPwSIq2q/sEJHd3iLy2hAB\nKtl0ok6tl/t0wV1Ix7gikVkDOaRCZ3/DplYfwpJbLvXFdLfQsjEo6OOjsrNpqZ9+\nx4lEAHjKdwKBgQC1qz9Cn0mLPBwgzfNHtVZnRdoCtn+WV9KL+HGNnUoOQLNhPQVu\nttybO4+ojOTz1I+93Ol7/Y805lFzkMhw6PF/ErBh6HmEwt2dZfd0WWeheA3z/dqr\nMjZxBo6/MkAUDuyZuB+PIB7Bf3slex0VX2bU64Ctb1NBs3RMa8Il7g/DYQKBgFVg\nUz3LQWShZIe0eRZXJX4QM4aYJYpHlMKyDSrRowweYY1x1uqo2UyQBWAU37kWArj6\nldgzSrTunSrFbD5K0IEsax9sMspNJLQxdU/L8YAy43rlt6gNqNcz4v70qI37Artl\nd/JoGeX/bewH2uFArZsM+eyqM6rysBxtHW0+vPs/AoGALHmseqPiU3+KtU0EdDoZ\nA6CR8nHXjM8aLlLonvZF+uJObHqXX8V58zul2VF+bWhs9ZhQlDsIErf2PiaVsBml\nRBfjmzJas4edsK+hLVSh2zOiYa3Kpl9zJ7yznM9AxXcSuImgmOP1KJlBtg4sQH9S\nEjocYsdlHJow91qvU3mZUoM=\n-----END PRIVATE KEY-----\n", - "client_email": "firebase-adminsdk-jm5jb@matchmyroute-backend.iam.gserviceaccount.com", - "client_id": "105828049435136100953", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://accounts.google.com/o/oauth2/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-jm5jb%40matchmyroute-backend.iam.gserviceaccount.com" -} diff --git a/conf/storage-keyfile.json b/conf/storage-keyfile.json deleted file mode 100644 index 15e026c..0000000 --- a/conf/storage-keyfile.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "matchmyroute-backend", - "private_key_id": "21311b14e0fa92774f28d47b3254f0701b7f5cba", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDfZQm/dkCl2w5/\nHZ2xXilskxA2ILjQfZxK6LmlKRmY+OWUpuR8Y/MS/8RWayWt3h9DmKi9+S11E0L1\nONNHV+kb/4avI+xEcejLmb4GED/4w387HNMNFm2TF6/WaOUIOfLm7i6+11gYAIjm\nRF3swswglKc7Z5ubDJSXd4As4GvV3TC4irsAUPjSUPREyKLGLYYsrgwtkK/9p1Mu\nzcLqxPZFOW4av7Lh8yMpi0ki0MOkttHd2jkzQAGdy3FeeJPWd1TSX1VgD84aVqvj\nnq8/ZUDIb4bg07nHx3NYKWIa6/XGXC01iBnEDWR2bPLHNW1tSLHfGrOSfBfSzvIY\nyJJ3kS6NAgMBAAECggEABxjMoHp/P0WgRkWIlvPo2PwrDa0ocecrqe2OyEJv/74Y\nfQp4Q8NhG39om144Cjf+QkV9Rtu9p/R+sg+mFqQiUbNicfnwLZR40s8FjGfDwIFl\nb1lREx9dR8j+2w7mB8bfgpqafZGVyN1re/U8DqN5nKdcULTP6rMRnWY8ejB+/IJF\nMNme4IpdqCTxAIuEkV3EW+rWyH5+E0to+9Lj1QJM4rQjtpM1UQix/UoP501ltWj1\n2jJnMBwxB/+PAOrOBi7iDSmsZ7b7tX7GHfL/jrEuhcOn20VFmFZgzAKnuDqFzamO\nVaVgo1SnF9sEmm46o1Bb3VQmQ+nn1BqbaXY5zhVUQQKBgQD1cz/a/SSsi8CeOsYP\ngZqlK6qGgsKOINAMvrD9kBjZRMzSN1kalPwSwuFJapz7qybSqAzrEawl+TTjTZrY\nPdhgtBUHeQzZVR5SYVwdtZpV1j6iSMXfZdpjn0VD3viY1RNus0CNrOHYi1Tt9EVi\nsXZ5BWBr5bfiMsYhkAEuu9h1pQKBgQDo/xszW8vfw2qR3DSbB0yUj/2Is0FlwxU2\nTTUot5zhHsq+eYsBCBtVgXZ0m8MG1Je2B8i1WnX2LbzLfJn9YWyC/Z34JwZ4RwFP\n1EJiHUCQFhKxFVVO/tMZwc+9euAtdSy1wQYZKPafSIdc7iHU7xho18IzApIS8xnX\nqE0DS7CQyQKBgQCR2J+S4mSOWqRj4QybXimkB6RWNRCiH4FAcXb91EfPooAKUXUS\nxIBcLYxscXtCV9rDxbOXYnLmRYRVpGFkKKuQGrF8NUObSGayEMQJq0U/yASDrbZW\nHlF8bMFdqPoS5lmbp8ut45J3d6NJmaI5GLYLB1TaCDARqpXsj4MEX/4pOQKBgQDf\nFpPWwwgcAiHh8vQzk/ORM6VP5EKzyuxeh+JkUBpXuoHpirq7jCWP41umHxXHTnrM\ngft9GVZlFjn0pCNVZpjdezRrzAH33BS3eMbu5o9Q5rGS+JgsAPXjbZ0ZEbPgEpdy\nl5TdNkmdDXb+Vcvy89NtX1jEOqvelQGjabQDec9fcQKBgQCcIPP0QzQvpB+p/59I\nVUxc4Ds75vmuMsqjfxW/gVLseHEeFzl7vNu9nSgEO0UOhU8jAYH1z7n0OehWcHx8\nbl32dJB+klao95T+ZRFxVZDsC6ItEvLT/2hJJYLXQbQc7Ik4pXydNNah0ctqHsrk\nOfK+RGFBLCyLlWbb6UTNxmKKzA==\n-----END PRIVATE KEY-----\n", - "client_email": "storage-service-account@matchmyroute-backend.iam.gserviceaccount.com", - "client_id": "111631627276945781581", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://accounts.google.com/o/oauth2/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/storage-service-account%40matchmyroute-backend.iam.gserviceaccount.com" -} diff --git a/conf/watermark.png b/conf/watermark.png deleted file mode 100644 index 31a2ca71cf487b71e770b23fa9845376d7a5f519..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4258 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", + PGPASSWORD: "", GOOGLE_APPLICATION_CREDENTIALS: "conf/storage-keyfile.json", STORAGE_BUCKET: "matchmyroute-prod" }); From 2f716616a35514e3c5cc121a0447d463705053c1 Mon Sep 17 00:00:00 2001 From: MStephan Date: Wed, 22 Aug 2018 23:15:24 +0100 Subject: [PATCH 2/4] changed readme title and reference to matchmyroute-backend --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 412d125..7846faf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -MatchMyRoute Backend +CityCycler Backend ==================== +also known as: matchmyroute-backend (which was the pre-release name) + ## Install Install node and npm, then install this project's dependencies: From 042382e16b34ded85f1e453e19cb0962b5480ce6 Mon Sep 17 00:00:00 2001 From: MStephan Date: Wed, 22 Aug 2018 23:25:45 +0100 Subject: [PATCH 3/4] changed firebase admin sdk reference; encrypted service accounts and db password; update travis to unzip credentials --- .travis.yml | 5 +++++ conf/credentials.tar.enc | Bin 0 -> 16912 bytes gulpfile.js | 2 +- src/common/auth.ts | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 conf/credentials.tar.enc diff --git a/.travis.yml b/.travis.yml index b8dbb43..edc635a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,16 @@ env: global: - NODE_ENV=staging - URL="https://matchmyroute-backend.appspot.com" + - secure: on4jgkRvu0rt9ThaqcMW9OvlTjVkfSDekhRAT2oDa7cYppvqRKxQyYCivWinlKsDPNF5MD13tZO4VpvezvmhT1YIPSkEejLt2+U7AypxYlM4R7EVBwhpIH1KDpjuJYeDMiq6gcFEaWl5DVrey39MZArrNip01co5uEnFDmyArk90M2iR2tySatTjqy4ZMZrhbgXOxsin7AjJejx+5KGpekAvId2infmQt1EKlOUoRsp/HHOV0qaK1DpevBNdbl2rHzKm0x07xP5bQaf3FKgm82qx9NPyl/bmczBQ+J6vbneP0kN/yRce9ipchoSaCrRn7V69CUYfioDBT/ddY0ae7ow7rLPKuDrdKZcgGOKo6uYAlnh235yzEi7R61UvuVZAb46ltRnsVjOt6Igxmh4xg9lvW5Yr5241jKpggqvyEz4LrQxFkMwwA3QhLE3CLE5+8QbS/+tjYM7mjL7LVPNvoUS2qGV0HSPlGDmUmDRhwUVZO2/MmH+Io7smVjIuDaDF4xfhwhlHA/G94xOkKr036fIpcSgK1jvK69dwwHQfxAR0tdYF8XamylrNUWlXjIZ1Te2uN4S8aO25S7/ChOBqJjI9tXH3f1WiYos63Z3Svp3JcK2eYV38ov7Zy0YQkxR4Abhum9GUzRF+VGpauThM1CWQu57nbbK5Eb/Mw55xTt0= addons: postgresql: '9.6' apt: packages: - postgresql-9.6-postgis-2.3 +before_install: +- openssl aes-256-cbc -K $encrypted_0e3badaffc60_key -iv $encrypted_0e3badaffc60_iv + -in credentials.tar.enc -out credentials.tar -d +- tar xvf ./conf/credentials.tar -C ./conf before_script: - psql -U postgres -c "create extension postgis" - psql -c "CREATE USER testuser WITH PASSWORD 'test' SUPERUSER;" diff --git a/conf/credentials.tar.enc b/conf/credentials.tar.enc new file mode 100644 index 0000000000000000000000000000000000000000..277a5f9079115527159777ec30a4aef0e6a9d557 GIT binary patch literal 16912 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�>Os86?hYRlI^!>J zg4Cn9Lq1hWq|G7;&iJzKH{N2A_SiVFoI1T(!{kLYaLnO{3>q|7Ic?-Ndl-gM3=Z>} zDNig>t6ZNj3hWcwk-Xj6uSvu2!Y;#%?rg%%pe@G0?O$0PIKxIS?0M>+pJDDSK+DEi zdk+8R7*v2pC)pW&QxPb5U}cMGlVDS8y%4 zIUfkv+}g%3=U$KDm_Y4|90;V%*R*M%$CDK(VU+iNY*gyFK%Hx+Az^_=(6U2?D|?tA zgihOl`u$W4%C96MeZ5!cYwx*dgGgpq9@9YYui zwK=*|i2NigO&}ivO1AuE9MLiJG-SbrP-!F=yv_JL6K5a- zYF+#0_9A&Yw?(gMBoP{|EFgYL4CY1J$2q@uY5!Y)8%It?ZMfy}aURb=Au@IFjR>_^5^);hNHRv$@)PVmqxAEs3^&GI zl8eec>?u$S@}zb)56;bs*4zKbl1IF-N6qYCEul9cI>_p8ry0~!QQ{yA^cOypD!wl` zux_BvC*wEZeS9562V>5G+Zs3P^}SH>`Yvs_oKi7ovPcad-o*@tH!<*|VW%-;m-zdd zYI7s)ehXq(2h@VIa!S!seO5}Ls{Tthh62_}7sp-lxrfRFx(nS7t%0_?xZK}<4@LBu z9EVvOEVU*-DJG2sF_-)Nn-+IEu4;hDRQ=KlAu% z@;i#!5%Y9>B~l{_EDkFtzfFw8whtwDy*Ot4B!I7~Wk@A$;w47D>iwCU)AtjmM+tUZ z?qG#FGr%>{AN?6X3<%T}G|fd~m^7tNDU9x#^nMTS5I11xwJK9T#ePE<7MM;-VXA_L z>Y4cKv4j`;Mi|ifHMSx@HCwzTdg#r=17-_KIntyo)3ZQmo-S@igfWWl1kpC~atyG+ zHQcQP^9aex6r7iC*jlGh>%lBGF~KMuMp6Ezm` zej|w~D2?mL`DOrT8Bn!_+R-q_g)tu~XI8q}!2Y_7`lU#S-TB&Etv z>?pzn&Dvv7i0iANtmTY=W#wc8fWfI0fk&dCP|ixjVC%F=l5npdlI z^g+~a6j+9Nt2RgMkfYJv{A|Q6%G+cW!YA_800I)H zmF3B_!fHolBbtb{qfW469BL%#s$ubj+RwP&w3i7oKppFMslt9`?$~^%Uy_!y3V!g} znD?n7vKm%>TRJoRd0i|Oip?ct-q$t~(Gxu8LYJaWe{T3?%tUKq37`q9X$Pv_ys#UN zP)8e(a^5PtD-klSy<=#I@OrLJ}q6u%x z>KGEzNA}siSgA#4FxoeooMfH3bOo_y*{WEbP@&-fCyU}!MGuxX1qzVM^fX|{cl!zT zO}5P+?EQTbE|*bIwhnyI_C{`8xra^1`3mD#X+(rf#5a^vQ#<;zezHZ zW-ig0T%?%`Y}3M5L)@ffTQRYprI1vgP2ip#5o5yijGcUE{t3OwF#_ZzF2^9rTxX)e z?=vi{_BJMvlvt61$IQ?h)96_Eu*!mn0Rsa3{e;WhYOypki8x)8KI-~njVLNA>qI`e z5UWB1K&zT_p@C3#s1tc6V`}eH52np2K5VjYj&H@jA}OJ3$uirDjdRRF-RGIR6D8%y zH5~H63`L(-;7ja>d70^f{=p+S9K~J9$N0K)%s1%G>wjI|2nLz%6tO!=5IWl5N*{h& zLz?ZWF3TK>>tO)@yC>tkLbFt@K%D%DGqFl1j2)M%Gc6++n0keo`eHJ%2A#MYZthaR zN6`1wBN+&SN)mqon4sV=0r#=Z1GG7bC}ipzV65N4#?+C)p6Bl3AJm^(ei(2I`N2zi zJ7BuFJTj$~y>rH%#(bu!p;4njK=O%e=FT_9+31%hk| zk`Uq(*-l)K;|cqcZ1F$Hp&cF!l-dLI#-PQ^GdBp(5HJ5@k4Y>#s? zJ~WbD%EZ~SG(@2pZDiuwg+wU3vS$?T81OCMsf+8{BgB12mFXPq6r%C8J bWYicPXY8mqgbo literal 0 HcmV?d00001 diff --git a/gulpfile.js b/gulpfile.js index 5412b4b..091df81 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -104,7 +104,7 @@ function getProductionEnvVars() { STATIC_DIR: "static", NODE_ENV: "production", PGUSER: "postgres", - PGPASSWORD: "", + PGPASSWORD: process.env.PGPRODPW, GOOGLE_APPLICATION_CREDENTIALS: "conf/storage-keyfile.json", STORAGE_BUCKET: "matchmyroute-prod" }); diff --git a/src/common/auth.ts b/src/common/auth.ts index 7155f32..18e6c15 100644 --- a/src/common/auth.ts +++ b/src/common/auth.ts @@ -10,7 +10,7 @@ export const minimumHashingRounds = 30000; initFirebase(); function initFirebase() { - const firebaseServiceAccount = require("conf/matchmyroute-backend-firebase-adminsdk-jm5jb-e33eab9419.json"); + const firebaseServiceAccount = require("conf/firebase-admin-sdk.json"); firebaseAdmin.initializeApp({ credential: firebaseAdmin.credential.cert(firebaseServiceAccount), From 812965cb2bb139185940a3730d6ae257efeaf727 Mon Sep 17 00:00:00 2001 From: MStephan Date: Wed, 22 Aug 2018 23:28:02 +0100 Subject: [PATCH 4/4] correct path to credentials.tar --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edc635a..f609f7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ addons: - postgresql-9.6-postgis-2.3 before_install: - openssl aes-256-cbc -K $encrypted_0e3badaffc60_key -iv $encrypted_0e3badaffc60_iv - -in credentials.tar.enc -out credentials.tar -d + -in ./conf/credentials.tar.enc -out ./conf/credentials.tar -d - tar xvf ./conf/credentials.tar -C ./conf before_script: - psql -U postgres -c "create extension postgis"