CDPT-887 Echo keys with line breaks. And, update env.example to refle…

…ct X_REAL_IP use.

.env.example

@@ -53,12 +53,11 @@ SECURE_AUTH_SALT='generate-key'
 LOGGED_IN_SALT='generate-key'
 NONCE_SALT='generate-key'
 
-# IP addresses, with optional CIDR notation. Separated by newlines & comments on their own line.
+# IP addresses, with optional CIDR notation. Separated by newlines & # comments.
 ALLOWED_IPS="
-# Docker IPs
-172.21.0.12/24
-# Home IP
-127.0.0.1/32"
+# Home netowrk IP range - at http://intranet.docker/info.php > HTTP_X_REAL_IP
+192.168.0.0/16
+"
 
 # The following 4 environment variables can be generated with `make key-gen`.
 JWT_SECRET="generated-key"

.github/workflows/deploy.yml

@@ -43,8 +43,8 @@ jobs:
           AWS_CLOUDFRONT_PUBLIC_KEY: "${{ secrets.AWS_CLOUDFRONT_PUBLIC_KEY }}"
           AWS_CLOUDFRONT_PRIVATE_KEY: "${{ secrets.AWS_CLOUDFRONT_PRIVATE_KEY }}"
         run: |
-          export AWS_CLOUDFRONT_PUBLIC_KEY_BASE64=$(echo $AWS_CLOUDFRONT_PUBLIC_KEY | base64 -w 0)
-          export AWS_CLOUDFRONT_PRIVATE_KEY_BASE64=$(echo $AWS_CLOUDFRONT_PRIVATE_KEY | base64 -w 0)
+          export AWS_CLOUDFRONT_PUBLIC_KEY_BASE64 =$(echo -n "$AWS_CLOUDFRONT_PUBLIC_KEY"  | base64 -w 0)
+          export AWS_CLOUDFRONT_PRIVATE_KEY_BASE64=$(echo -n "$AWS_CLOUDFRONT_PRIVATE_KEY" | base64 -w 0)
           cat $TPL_PATH/secret.tpl | envsubst > $TPL_PATH/secret.yaml
           cat $TPL_PATH/deployment.tpl | envsubst > $TPL_PATH/deployment.yaml