misc/ansible-base
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

[fix] role:mas

Browse source
This commit is contained in:
roydfalk 2024-10-17 18:45:45 +02:00
parent af80d094f3
commit 7bf2c1e142
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/mas/tasks/main.json
View file

@ -14,7 +14,8 @@
"loop": [ "loop": [
"{{var_mas_directory}}/conf.d", "{{var_mas_directory}}/conf.d",
"{{var_mas_directory}}/conf.d/providers", "{{var_mas_directory}}/conf.d/providers",
"{{var_mas_directory}}/conf.d/clients" "{{var_mas_directory}}/conf.d/clients",
"{{var_mas_directory}}/scripts"
], ],
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
@ -47,7 +48,8 @@
"become": true, "become": true,
"ansible.builtin.copy": { "ansible.builtin.copy": {
"src": "conf-compose.py", "src": "conf-compose.py",
"dest": "/usr/bin/mas-conf-compose", "dest": "{{var_mas_directory}}/scripts/conf-compose",
"owner": "{{var_mas_user}}",
"mode": "0700" "mode": "0700"
} }
}, },
@ -57,14 +59,14 @@
"become_user": "{{var_mas_user}}", "become_user": "{{var_mas_user}}",
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "config-base.json.j2", "src": "config-base.json.j2",
"dest": "{{var_mas_directory}}/conf.d/base.yaml" "dest": "{{var_mas_directory}}/conf.d/base.json"
} }
}, },
{ {
"name": "configuration | apply", "name": "configuration | apply",
"become": true, "become": true,
"ansible.builtin.command": { "ansible.builtin.command": {
"cmd": "/usr/bin/mas-conf-compose" "cmd": "/usr/local/bin/mas-conf-compose"
} }
}, },
{ {

4
roles/mas/templates/config-base.json.j2
View file

@ -28,7 +28,7 @@
}, },
{ {
"name": "assets" "name": "assets"
}, }
], ],
"binds": [ "binds": [
{ {
@ -59,7 +59,7 @@
"10.0.0.0/10", "10.0.0.0/10",
"127.0.0.1/8", "127.0.0.1/8",
"fd00::/8", "fd00::/8",
"::1/128", "::1/128"
], ],
"public_base": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/", "public_base": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/",
"issuer": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/" "issuer": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/"