Skip to content

Commit 66f0766

Browse files
committed
[infra] update dashmate configs and Fix ZeroSSL undefined variable checks
1 parent 21a21bb commit 66f0766

File tree

3 files changed

+49
-7
lines changed

3 files changed

+49
-7
lines changed

ansible/group_vars/all

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ tenderdash_compose_path: '{{ dashd_home }}/{{ tenderdash_compose_project_name }}
4141

4242
# DAPI
4343
dapi_image: dashpay/dapi
44+
rs_dapi_image: dashpay/rs-dapi
4445

4546
# Gateway
4647
gateway_image: envoyproxy/envoy

ansible/roles/dashmate/tasks/ssl/zerossl.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,25 @@
101101
community.aws.ssm_parameter:
102102
name: '{{ dashmate_zerossl_ssm_path }}-id'
103103
value: '{{ dashmate_zerossl_config_certificate_id }}'
104-
when: dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
104+
when:
105+
- dashmate_zerossl_config_certificate_id is defined
106+
- dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
105107

106108
- name: Read new generated ZeroSSL private key file to variable
107109
ansible.builtin.slurp:
108110
src: '{{ dashmate_zerossl_keys_path }}/{{ dashmate_zerossl_private_key_file_name }}'
109111
register: dashmate_zerossl_private_key_file
110-
when: dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
112+
when:
113+
- dashmate_zerossl_config_certificate_id is defined
114+
- dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
111115

112116
- name: Read new generated ZeroSSL CSR file to variable
113117
ansible.builtin.slurp:
114118
src: '{{ dashmate_zerossl_keys_path }}/{{ dashmate_zerossl_csr_file_name }}'
115119
register: dashmate_zerossl_csr_file
116-
when: dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
120+
when:
121+
- dashmate_zerossl_config_certificate_id is defined
122+
- dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
117123

118124
- name: Set new generated ZeroSSL CSR and private key files
119125
ansible.builtin.set_fact:
@@ -122,7 +128,9 @@
122128
content: '{{ dashmate_zerossl_private_key_file.content | b64decode }}'
123129
- name: "{{ dashmate_zerossl_csr_file_name }}"
124130
content: '{{ dashmate_zerossl_csr_file.content | b64decode }}'
125-
when: dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
131+
when:
132+
- dashmate_zerossl_config_certificate_id is defined
133+
- dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
126134

127135
- name: Update ZeroSSL private key and CSR files in AWS SSM parameter store
128136
delegate_to: localhost
@@ -131,4 +139,6 @@
131139
name: '{{ dashmate_zerossl_ssm_path }}-{{ item.name }}'
132140
value: '{{ item.content }}'
133141
loop: '{{ dashmate_zerossl_files }}'
134-
when: dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id
142+
when:
143+
- dashmate_zerossl_config_certificate_id is defined
144+
- dashmate_zerossl_ssm_certificate_id != dashmate_zerossl_config_certificate_id

ansible/roles/dashmate/templates/dashmate.json.j2

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@
144144
"includeOnly": [],
145145
"exclude": []
146146
}
147+
},
148+
"zmq": {
149+
"host": "0.0.0.0",
150+
"port": {{ dashd_zmq_port }}
147151
}
148152
},
149153
"platform": {
@@ -228,6 +232,9 @@
228232
}
229233
},
230234
"dapi": {
235+
"deprecated": {
236+
"enabled": false
237+
},
231238
"api": {
232239
"docker": {
233240
"image": "{{ dapi_image }}",
@@ -237,11 +244,35 @@
237244
"build": {
238245
"enabled": false,
239246
"context": "{{ dashmate_source_dir }}",
240-
"dockerFile": "{{ dashmate_source_dir }}/packages/dapi/Dockerfile",
241-
"target": ""
247+
"dockerFile": "{{ dashmate_source_dir }}/Dockerfile",
248+
"target": "dapi"
242249
}
243250
},
244251
"waitForStResultTimeout": {{ dashmate_platform_dapi_api_wait_for_st_result_timeout }}
252+
},
253+
"rsDapi": {
254+
"docker": {
255+
"image": "{% if rs_dapi_image is defined %}{{ rs_dapi_image }}{% else %}{{ dapi_image | regex_replace('^dashpay/dapi:', 'dashpay/rs-dapi:') }}{% endif %}",
256+
"deploy": {
257+
"replicas": {{ dashmate_platform_dapi_api_docker_deploy_replicas }}
258+
},
259+
"build": {
260+
"enabled": false,
261+
"context": "{{ dashmate_source_dir }}",
262+
"dockerFile": "{{ dashmate_source_dir }}/Dockerfile",
263+
"target": "rs-dapi"
264+
}
265+
},
266+
"metrics": {
267+
"host": "127.0.0.1",
268+
"port": 9091
269+
},
270+
"logs": {
271+
"level": "debug",
272+
"jsonFormat": false,
273+
"accessLogPath": null,
274+
"accessLogFormat": "combined"
275+
}
245276
}
246277
},
247278
"drive": {

0 commit comments

Comments
 (0)