From 86a534007754f4764b8ffa70c51a68e496524788 Mon Sep 17 00:00:00 2001 From: Bartosz Sobczynski Date: Fri, 10 Jul 2020 11:42:43 +0200 Subject: [PATCH 1/6] Change gitignore --- .gitignore | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 50f24b6..7045fae 100644 --- a/.gitignore +++ b/.gitignore @@ -18,14 +18,17 @@ !/storage/.keep .byebug_history -# Ignore master key for decrypting credentials and more. +# Ignore keys for decrypting credentials and encoded credentials. /config/master.key +/config/credentials.yml.enc + /config/credentials/staging.key +/config/credentials/staging.yml.enc + +/config/credentials/production.key +/config/credentials/production.yml.enc # Ignore public, as it is built on deploy # Place files for /public in /client/public /public .DS_Store -/config/credentials/production.key - -/config/credentials/development.key From 1390c166a66ef063e3d0e5813e2a677a908d3821 Mon Sep 17 00:00:00 2001 From: Bartosz Sobczynski Date: Fri, 10 Jul 2020 11:43:41 +0200 Subject: [PATCH 2/6] Remove redudant file --- config/credentials/development.yml.enc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/credentials/development.yml.enc diff --git a/config/credentials/development.yml.enc b/config/credentials/development.yml.enc deleted file mode 100644 index 03149b2..0000000 --- a/config/credentials/development.yml.enc +++ /dev/null @@ -1 +0,0 @@ -2f19VjtpWGndIOs5KMa0eyle1rccXNtQuDNLsDSHe4rzZQ7d/2zIKx9mK1zM+ECR3Aqabi/SmUkAywUgbb6oa1P/joyLlP9ZBjcqVikPNL7Q3011cGQJwJ+N2S66GFmKI+Qrz/0Qgky/4vzNmO5L3ozsjfajKuK0tAN6CUGZ3KFJCoBW0OrZj7o9B8vxC35J+t6wOxMlGe819UfcV7fpKFHgvlWPLw6ls5HLlaj1Uyz3Q1i9Bs0lT6GIptA8AHaQyPlH6u0ipqr6jFgU4sNy6lLhuwLw/w7p87JsLLbXQ9UqX6qLgMBh7CqaMyrSpLYYcW/KxSfs0AGMcltDwTDABT7Gzns3HK789lDUdNwcMbYxGWn61zldPqS0qTdiCA+Mc5kLZP//Fj/XyeaZdmMQNJ0BO5qr+0tlOMeZe7lja4MdKQ3Lxbly+xulHoz9BMJkXotC6LzfEE3SXzPeH7JLu/dN8V+V3uLj8AdInhlZAGhRsLTQRvuWsRZk6RKBMqi8oDjar3E6YzJUN93TMjRLk+uvTP+wlBxxzylfIZpe8/pQD7hpgKC+MzSxuV3mHH5nhYIY1WNOatzYINV9rXEh9E2Mkmh8nvBBSV7WvDRqAQcdyz4F8JMG/hg=--1XFxedVX2j/zIOaE--Esi9Q4FTweNrwK8y3Pe71g== \ No newline at end of file From 5eba99399b20951c69eec4e2b8afaba96f462eab Mon Sep 17 00:00:00 2001 From: Bartosz Sobczynski Date: Fri, 10 Jul 2020 11:48:26 +0200 Subject: [PATCH 3/6] Remove files --- config/credentials.yml.enc | 1 - config/credentials/production.yml.enc | 1 - config/credentials/staging.yml.enc | 1 - 3 files changed, 3 deletions(-) delete mode 100644 config/credentials.yml.enc delete mode 100644 config/credentials/production.yml.enc delete mode 100644 config/credentials/staging.yml.enc diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc deleted file mode 100644 index 2e624d3..0000000 --- a/config/credentials.yml.enc +++ /dev/null @@ -1 +0,0 @@ -+ynVujjoxxm8VdNnLbQq8CPEJMuvKrU3+hWbS/pHbtGXvCYHCL3XZOf2JR39QvdjqK0SmRiJ1FF9Se+67NwfjQdK1DBPoWuEFDpg5E7y+mMtITT/PQ7PRS4EPy5YOmFb9+USWsD58aeePBnZVp2XLuDvvqYJZMaBb3JIhI63rHSyF37KEfhpTix00HllgOJyVDY+cy5FC9mDCl68C2tb/xnxYit7fqSTn6v/urO2HmTlmnCV2w7OIxjPb+8xRLwRq3w80v1yGcCIxKUuQhc3f7Y=--uwoZgQQr9Le8komN--OipjKcbyg3tu93eoa9wNlg== \ No newline at end of file diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc deleted file mode 100644 index 30cf11c..0000000 --- a/config/credentials/production.yml.enc +++ /dev/null @@ -1 +0,0 @@ -aLXXAi+he/b4KyGjzMO0RKRAFiTyphbP8FirlZ0nRb9eEdRxEuLqx78LgT1sIZTm5gq4yKD963/YAZsk6SYYLGnCdq9wAKlidaYFH8eMT6G9Nl8dqUq8EXSZbG+fzUi0yQx3CmIWY7yvpW5s/c0w8fUlAHhBdEjZLvXfftonp44sZiEvQ/JLSOvXAZIhVjIjT2VtUGUW8aa6oWsAuOzUcvO8gfsCE09yxmAzU4PgbIbvjXTRR/poQZhN3FnSy5ke7D//U4V/QLwHVVt38xydDEp8avoeOlx0wfcf43r3IKFSXh5kN1uWyVhq7eQbHrk6wrH90ljtRtg081BBSQMqCkkw/tFCDIe4Orbg1NKBrkWwrgB3RbkOQlJT4NNvdEiLpfi7+LZkrlw/MVEXrpljLhXS8xSUA2zR2LcW01DQtt2ytWdjKRs5NXOwdu76173eLr0qGm0riDTFuHJM3iw8U13Uhymzd4iXO6VujAst39EN99pFZm0OoNS/31y16vuCUIra8+FSAu6Spni1IwG8lHl8NC8C2/ugBEjuFoABStHheoYaHcbiJWlwVKY5fYahOnnWAsZl4P+EPf2z4fW4EwJX9qy2FC4VTjYEuO/0GmduqUIqaCENjiRaGiN420iqG3/wYIiTGVzWVnSgl/422el4iW+Kl9brvaBThtnF0zuPzKsjIN2a7NFOZ3lgjjVQc77w/Ia67141cVsJLpcs5xu7YwrhwFzJECLmz7d5zKpL2wekJg7f267+mU/q7kcAm9Lp1lwt7ekmKbiL8i4+LPUTRWq6BCrEi7OV8/sCYwgR9vrJlvJaZV920SM3eJcGUIpLYxHW566EH2d5BFULRVZXP/zgLu4zaSjLA4cPS83ogyewu14=--wLq0GQA5q0k2bOk7--THQ7fXPpQqPc3AwAdIfDgw== \ No newline at end of file diff --git a/config/credentials/staging.yml.enc b/config/credentials/staging.yml.enc deleted file mode 100644 index 760cb79..0000000 --- a/config/credentials/staging.yml.enc +++ /dev/null @@ -1 +0,0 @@ -vcSOFGzA5Mp/bI2X74Wuf/j8HD9eyRKusQrTaPqsFqaGDGf32FzjGAT0JlKYsydAy+mv1OZWstssAtP0nl871XFykUua9piizWYklXsqh3qZmPxZDi22/3jv13YynLNsvOSLQ5uMPwHUKhnKyvaOZl5cQS8caMz8CUfglOWfNNBU+UlTRbVfISmQ18MClkye5SQOk3YA7VwSAoRJEw6aYMXVlEJLOhFdIlZLz8RblCIaQBXtvWNZKmZAKkX2XsNpExT82A+DdSKovsyyvn1OpD8H8rx17iAjLZxJ9wheFExn47tqS97wxzgX0NZb9S6Muv8/PsYhHLnXfkA3cqbzNP4XyqRIalquhIwBcoRsdPucRfSreea441SD++3cs9y93F2CeaiwjO21rkF+XRFq3nGU7h8t/0jBvD9RR0qTpuqKJobdcN5SRJInlbEz/X0+1+u4R62z2MB4MtHKcUAy6jidWs0EPH5XTZgIGENeJ8juGqpsKCS7FkRIgujq5Tugqa1VmNqaeyuiEnfe3bc2MNQHOXN5rIG0//rGWj6B0JJuukAg7rmpTCkmRQGZowd85mrRPBOp5Zx7m0I5GfTbZRzQ8RaYPsvDFbvGC/uxuMsu19Grz/pUOQtuV5eulzQhJhkV9VOgjjyVOANJxr4RBz5dcY/OGEYFAjMxQOP4ZFNBMgnTIr6pO/sCollaM+Hm+rquS0LBnBAsEVVGVKDk7MuOn35SG7LxeR4i/Sx096Vm8dZhDAqI5x/hLeO+MGMuKo51nqa0cwZFMsFuAVgUvc14VPlKoYA7545Q32kP7srBCIP0KSjMsSOMoKEZTQRQu/vVg6QJGgPICIUmmt2uga/Vlg1F06jcaNGu8E92oqA=--M7UEM0Mhmi4yH1LW--sa1xr9cA26kv4Rmhb28Lpg== \ No newline at end of file From 59ae705ca105b9294bd53d458a4beb120f8b36f1 Mon Sep 17 00:00:00 2001 From: Bartosz Sobczynski Date: Fri, 10 Jul 2020 12:05:24 +0200 Subject: [PATCH 4/6] Modify circle workflow --- .circleci/config.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f919736..411dfa9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,6 +159,20 @@ jobs: echo IMAGE=${PROD_AWS_ECR_ACCOUNT_URL}/ecr-hackcrisis-production:${CIRCLE_SHA1} >> ./codedeploy-scripts/parameters echo ENV_PATH=${ENV_PATH} >> ./codedeploy-scripts/parameters echo REGION_FETCH_URL=${REGION_FETCH_URL} >> ./codedeploy-scripts/parameters + - run: + command: | + if [ ! -f ./config/credentials/staging.yml.enc ] + then + mkdir ./config/credentials && touch ./config/credentials/staging.yml.enc + fi + echo ${RAILS_STAGING_ENCODED_CREDS} >> ./config/credentials/staging.yml.enc + - run: + command: | + if [ ! -f ./config/credentials/production.yml.enc ] + then + mkdir ./config/credentials && touch ./config/credentials/production.yml.enc + fi + echo ${RAILS_PROD_ENCODED_CREDS} >> ./config/credentials/production.yml.enc - run: name: Use proper appspec.yml file command: mv appspec.yml.<< parameters.env >> appspec.yml @@ -208,9 +222,9 @@ workflows: - run_audits - run_tests - run_fixtures_check - filters: - branches: - only: master +# filters: +# branches: +# only: master - build_production: filters: branches: From cf7389c3feecd56e41cdf6d2ee34a295148ae934 Mon Sep 17 00:00:00 2001 From: Bartosz Sobczynski Date: Fri, 10 Jul 2020 12:44:30 +0200 Subject: [PATCH 5/6] Add another file --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 411dfa9..ced3cf1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -173,6 +173,13 @@ jobs: mkdir ./config/credentials && touch ./config/credentials/production.yml.enc fi echo ${RAILS_PROD_ENCODED_CREDS} >> ./config/credentials/production.yml.enc + - run: + command: | + if [ ! -f ./config/credentials.yml.enc ] + then + touch ./config/credentials.yml.enc + fi + echo ${RAILS_ENCODED_CREDS} >> ./config/credentials.yml.enc - run: name: Use proper appspec.yml file command: mv appspec.yml.<< parameters.env >> appspec.yml From aeb14edf50688583596142e6ca7b6208709b6fab Mon Sep 17 00:00:00 2001 From: Bartosz Sobczynski Date: Fri, 10 Jul 2020 13:16:58 +0200 Subject: [PATCH 6/6] Check if works with one enc file only --- .circleci/config.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ced3cf1..e7d55da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,20 +166,6 @@ jobs: mkdir ./config/credentials && touch ./config/credentials/staging.yml.enc fi echo ${RAILS_STAGING_ENCODED_CREDS} >> ./config/credentials/staging.yml.enc - - run: - command: | - if [ ! -f ./config/credentials/production.yml.enc ] - then - mkdir ./config/credentials && touch ./config/credentials/production.yml.enc - fi - echo ${RAILS_PROD_ENCODED_CREDS} >> ./config/credentials/production.yml.enc - - run: - command: | - if [ ! -f ./config/credentials.yml.enc ] - then - touch ./config/credentials.yml.enc - fi - echo ${RAILS_ENCODED_CREDS} >> ./config/credentials.yml.enc - run: name: Use proper appspec.yml file command: mv appspec.yml.<< parameters.env >> appspec.yml