-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #125 from dimagi/sk/deploy-updates
move env file management to Kamal
- Loading branch information
Showing
9 changed files
with
79 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<%# | ||
This file is used by Kamal to generate the `deploy/.env` file when running `kamal envify` | ||
It is a Ruby 'ERB' template, so you can use Ruby code in it. | ||
See https://fireapp.kkbox.com/doc/tutorial_2.html for more information. | ||
%> | ||
<% `op signin --account dimagi.1password.com --raw` %> | ||
<% if $?.exitstatus == 0 %> | ||
<% vars = YAML.load(`op item get --vault "CommCare Connect" "Connect Secrets" --fields type=string,type=concealed`) %> | ||
<% for var in vars %><% if var.key?("Value") %><% if var["Value"].kind_of?(Array) %> | ||
<%= var['Label'] %>=<%= var['Value'].join(',') %> | ||
<% else %><%= var['Label'] %>=<%= var['Value'] %> | ||
<% end %><% end %><% end %> | ||
<% else raise ArgumentError, "Error getting values from 1Password. Try sign in." end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,19 +2,39 @@ service: commcare-connect | |
|
||
image: commcare-connect | ||
|
||
env: | ||
clear: | ||
AWS_DEFAULT_REGION: us-east-1 | ||
DJANGO_ACCOUNT_ALLOW_REGISTRATIONS: True | ||
CONNECTID_URL: https://connectid.dimagi.com | ||
DJANGO_ADMIN_URL: admin/ | ||
DJANGO_EMAIL_BACKEND: anymail.backends.amazon_ses.EmailBackend | ||
SENTRY_ENVIRONMENT: staging | ||
DJANGO_DEFAULT_FROM_EMAIL: [email protected] | ||
DJANGO_AWS_STORAGE_BUCKET_NAME: commcare-connect-media | ||
RDS_PORT: 5432 | ||
RDS_DB_NAME: ebdb | ||
secret: | ||
- CELERY_BROKER_URL | ||
- CSRF_TRUSTED_ORIGINS | ||
- cid_client_id | ||
- cid_client_secret | ||
- DJANGO_SECRET_KEY | ||
- DJANGO_ALLOWED_HOSTS | ||
- DJANGO_ALLOWED_CIDR_NETS | ||
- REDIS_URL | ||
- SENTRY_DSN | ||
- RDS_HOSTNAME | ||
- RDS_USERNAME | ||
- RDS_PASSWORD | ||
|
||
servers: | ||
web: | ||
hosts: | ||
- 3.90.216.194 | ||
options: | ||
# create by ansible | ||
env-file: '/home/connect/www/commcare-connect/docker.env' | ||
celery: | ||
hosts: | ||
- 3.90.216.194 | ||
options: | ||
# create by ansible | ||
env-file: '/home/connect/www/commcare-connect/docker.env' | ||
cmd: /start_celery | ||
labels: | ||
traefik.enable: false | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
- hosts: web0 | ||
become: true | ||
strategy: free | ||
vars: | ||
- secrets: "{{ lookup('community.general.onepassword', 'Ansible Secrets', subdomain='dimagi', vault='CommCare Connect', field='secrets_yaml') | from_yaml }}" | ||
roles: | ||
- role: connect |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters