Skip to content

Commit 88a7d02

Browse files
committed
Make mongo usernames/password consistent
1 parent 7b6d6aa commit 88a7d02

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

ansible/group_vars/all.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ api_port: 80
7676
api_socket_server_hostname: apisock.{{ domain }}
7777
api_socket_server_rollbar_key: cad27f265e8e473c9b293615e7ed0f3a
7878
api_url: https://{{ api_hostname }}
79+
api_mongo_auth: "{{ api_mongo_user }}:{{ api_mongo_password }}"
7980
sendgrid_key: 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
8081

8182
# arithmancy
@@ -100,6 +101,7 @@ charon_port: 53
100101
clio_host_address: clio
101102
clio_port: 8008
102103
clio_mongo_database: clio
104+
clio_mongo_auth: "{{ clio_mongo_user }}:{{ clio_mongo_password }}"
103105

104106
# consul
105107
consul_api_port: 8500
@@ -239,7 +241,7 @@ swarm_container_name: swarm
239241
# navi/link
240242
link_hello_runnable_token: 5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29
241243
navi_mongo_database: navi
242-
navi_mongo_auth: "{{ api_mongo_auth }}"
244+
navi_mongo_auth: "{{ navi_mongo_user }}:{{ navi_mongo_password }}"
243245
navi_mongo_hosts: "{{ mongo_hosts }}"
244246

245247
npm_token: c0c4b32a-3de5-4e27-9d32-56c1616746d8

ansible/group_vars/alpha-mongo-create-users.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ container_tag: "3.2.6"
55

66
advance_arg: true
77

8+
admin_mongo_query: "db.createUser({user:'{{ api_mongo_user }}',pwd:'{{ api_mongo_password }}',roles:[{role:'root',db:'admin'}]});"
9+
api_mongo_query: "db.createUser({user:'{{ api_mongo_user }}',pwd:'{{ api_mongo_password }}',roles:[{role:'readWrite',db:'api'}]});"
10+
clio_mongo_query: "db.createUser({user:'{{ clio_mongo_user }}',pwd:'{{ clio_mongo_password }}',roles:[{role:'readWrite',db:'clio'}]});"
11+
navi_mongo_query: "db.createUser({user:'{{ navi_mongo_user }}',pwd:'{{ navi_mongo_password }}',roles:[{role:'readWrite',db:'navi'}]});"
12+
813
container_run_args: >
9-
mongo mongo/admin --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'root',db:'admin'}]});\" &&
10-
mongo mongo/api --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'readWrite',db:'api'}]});\" &&
11-
mongo mongo/clio --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'readWrite',db:'clio'}]});\" &&
12-
mongo mongo/navi --eval \"db.createUser({user:'{{ navi_mongo_user | default(mongo_user) }}',pwd:'{{ navi_mongo_password | default(mogno_password) }}',roles:[{role:'readWrite',db:'navi'}]});\" &&
14+
mongo {{ mongo_hosts }}/admin --eval \"{{ admin_mongo_query }}\" &&
15+
mongo {{ mongo_hosts }}/{{ api_mongo_database }} --eval \"{{ api_mongo_query }}\" &&
16+
mongo {{ mongo_hosts }}/{{ clio_mongo_database }} --eval \"{{ clio_mongo_query }}\" &&
17+
mongo {{ navi_mongo_hosts }}/{{ navi_mongo_database }} --eval \"{{ navi_mongo_query }}\" &&
1318
echo Finished

environments/delta/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ api_intercom_app_id: wqzm3rju
1515
api_mixpanel_app_id: 57260a5b6fc972e9c69184882efd009e
1616
api_mongo_user: api
1717
api_mongo_password: 72192e5a-a5e1-11e5-add9-0270db32f7ad
18-
api_mongo_auth: "{{ api_mongo_user }}:{{ api_mongo_password }}"
1918
api_mongo_database: delta
2019
api_mongo_replset_name: delta-rs0
2120
api_new_relic_app_name: delta-api-production
@@ -43,7 +42,8 @@ big_poppa_pg_pass: 27eed36a27a54ffd
4342
big_poppa_pg_user: cwallace
4443
big_poppa_worker_rollbar_token: 98cabb8440024e3a8242cf3220b802c9:5432
4544

46-
clio_mongo_auth: clio:>hjp8XL4GAwBGXPb
45+
clio_mongo_user: "clio"
46+
clio_mongo_password: ">hjp8XL4GAwBGXPb"
4747
clio_mongo_replset_name: delta-rs0
4848
clio_mongo_database: clio
4949

@@ -118,7 +118,8 @@ navi_new_relic_app_name: delta-navi
118118
navi_cookie_secret: e80173940e7bdd84734e868b6ea054a0
119119
navi_intercom_api_key: 6f6400402170e78fa1ad4418608aacc63512122b
120120
navi_intercom_app_id: wqzm3rju
121-
121+
navi_mongo_user: "navi"
122+
navi_mongo_password: "365bbf0e5a944d3fb94598dd5f69d789"
122123

123124
optimus_aws_access_id: AKIAJWSSSJYUXKNW2ZDA
124125
optimus_aws_secret_id: tyvGiCbj5jWCiQnMLvfrfD64dFo8i6prkdcga86y

environments/gamma/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ api_github_deploy_keys_bucket: runnable.deploykeys.production-beta
1313
api_mixpanel_app_id: c41affa4b08818443365c526cbb51606
1414
mongo_user: api
1515
mongo_password: 3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
16-
api_mongo_auth: "{{ mongo_user }}:{{ mongo_password }}"
16+
api_mongo_user: "{{ mongo_user }}"
17+
api_mongo_password: "{{ mongo_password }}"
1718
api_mongo_database: gamma
1819
api_mongo_replset_name: gamma-rs0
1920
api_rollbar_key: a90d9c262c7c48cfabbd32fd0a1bc61c
@@ -39,7 +40,8 @@ big_poppa_pg_pass: JFmZDuVYPt9vUxk4DBjj
3940
big_poppa_pg_user: big_poppa
4041
big_poppa_worker_rollbar_token: 98cabb8440024e3a8242cf3220b802c9
4142

42-
clio_mongo_auth: clio:Fkj8CBoMNpuhe7p*
43+
clio_mongo_user: clio
44+
clio_mongo_password: "Fkj8CBoMNpuhe7p*"
4345
clio_mongo_replset_name: gamma-rs0
4446
clio_mongo_database: clio
4547

@@ -100,8 +102,6 @@ mongo_volume_id: vol-0daf05c3686a7e0a8
100102

101103
navi_mongo_user: navi
102104
navi_mongo_password: 3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
103-
navi_mongo_auth: "{{ navi_mongo_user }}:{{ navi_mongo_password }}"
104-
105105
navi_cookie_secret: c90e5fb4e7e511e597309a79f06e9478
106106

107107
optimus_aws_access_id: AKIAJPA2ZYSVVA5V7XXQ

environments/runnable-self-hosted-2/main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ api_aws_secret_access_key: "{{ aws_secret_access_key }}"
5353
api_github_client_id: "{{ github_client_id }}"
5454
api_github_client_secret: "{{ github_client_secret }}"
5555
api_github_deploy_keys_bucket: "runnable.deploykeys.{{ environment }}"
56-
api_mongo_auth: "{{ mongo_user }}:{{ mongo_password }}"
56+
api_mongo_user: "{{ mongo_user }}"
57+
api_mongo_password: "{{ mongo_password }}"
5758
api_mongo_database: "api"
5859
api_mongo_replset_name: "{{ mongo_replset_name }}"
5960
api_s3_context_bucket: "runnable.context.resources.{{ environment }}"
@@ -70,7 +71,8 @@ big_poppa_pg_host: "{{ postgres_host }}"
7071
big_poppa_pg_pass: "{{ postgres_password}}"
7172
big_poppa_pg_user: "{{ postgres_user }}"
7273

73-
clio_mongo_auth: "{{ mongo_user }}:{{ mongo_password }}"
74+
clio_mongo_user: "{{ mongo_user }}"
75+
clio_mongo_password: "{{ mongo_password }}"
7476
clio_mongo_database: "clio"
7577

7678
kartographer_hello_runnable_github_token: "{{ hello_runnable_github_token }}"
@@ -108,8 +110,8 @@ bastion_sshd_port: 22
108110
env: "{{ environment }}"
109111
is_github_enterprise: false
110112
mongo_port: 27017
111-
navi_mongo_auth: "{{ mongo_user }}:{{ mongo_password }}"
112-
navi_mongo_database: "navi"
113+
navi_mongo_user: "{{ mongo_user }}"
114+
navi_mongo_password: "{{ mongo_password }}"
113115
navi_mongo_hosts: "mongo"
114116
node_env: "{{ environment }}"
115117
pg_host: "{{ postgres_host }}"

0 commit comments

Comments
 (0)