merge upstream
This commit is contained in:
parent
739cd0e31d
commit
1e54b1d1a5
@ -119,7 +119,7 @@
|
|||||||
"default": "{{ matrix_synapse_max_upload_size_mb }}",
|
"default": "{{ matrix_synapse_max_upload_size_mb }}",
|
||||||
"choices": "",
|
"choices": "",
|
||||||
"new_question": true,
|
"new_question": true,
|
||||||
"variable": "matrix_synapse_max_upload_size_mb",
|
"variable": "matrix_synapse_max_upload_size_mb_raw",
|
||||||
"type": "text"
|
"type": "text"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
|
||||||
|
- tags: always
|
||||||
|
block:
|
||||||
- name: Include vars in organisation.yml
|
- name: Include vars in organisation.yml
|
||||||
include_vars:
|
include_vars:
|
||||||
file: '/var/lib/awx/projects/clients/{{ member_id }}/organisation.yml'
|
file: '/var/lib/awx/projects/clients/{{ member_id }}/organisation.yml'
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
|
|
||||||
|
- tags: always
|
||||||
|
block:
|
||||||
- name: Include vars in matrix_vars.yml
|
- name: Include vars in matrix_vars.yml
|
||||||
include_vars:
|
include_vars:
|
||||||
file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
|
file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
|
||||||
|
@ -1,78 +1,117 @@
|
|||||||
|
|
||||||
# Load initial hosting and organisation variables from AWX volume
|
# Load initial hosting and organisation variables from AWX volume
|
||||||
- include_tasks: "{{ role_path }}/tasks/load_hosting_and_org_variables.yml"
|
- include_tasks:
|
||||||
|
file: "load_hosting_and_org_variables.yml"
|
||||||
|
apply:
|
||||||
|
tags: always
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
# Perform a backup of the server
|
# Perform a backup of the server
|
||||||
- include_tasks: "{{ role_path }}/tasks/backup_server.yml"
|
- include_tasks:
|
||||||
|
file: "backup_server.yml"
|
||||||
|
apply:
|
||||||
|
tags: backup-server
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- backup-server
|
- backup-server
|
||||||
|
|
||||||
# Create a user account if called
|
# Create a user account if called
|
||||||
- include_tasks: "{{ role_path }}/tasks/create_user.yml"
|
- include_tasks:
|
||||||
|
file: "create_user.yml"
|
||||||
|
apply:
|
||||||
|
tags: create-user
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- create-user
|
- create-user
|
||||||
|
|
||||||
# Perform extra self-check functions
|
# Perform extra self-check functions
|
||||||
- include_tasks: "{{ role_path }}/tasks/self_check.yml"
|
- include_tasks:
|
||||||
|
file: "self_check.yml"
|
||||||
|
apply:
|
||||||
|
tags: self-check
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- self-check
|
- self-check
|
||||||
|
|
||||||
# Import configs, media repo from /chroot/backup import
|
# Import configs, media repo from /chroot/backup import
|
||||||
- include_tasks: "{{ role_path }}/tasks/import_awx.yml"
|
- include_tasks:
|
||||||
|
file: "import_awx.yml"
|
||||||
|
apply:
|
||||||
|
tags: import-awx
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- import-awx
|
- import-awx
|
||||||
|
|
||||||
# Configure SFTP so user can upload a static website or access the servers export
|
# Configure SFTP so user can upload a static website or access the servers export
|
||||||
- include_tasks: "{{ role_path }}/tasks/customise_website_access_export.yml"
|
- include_tasks:
|
||||||
|
file: "customise_website_access_export.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-nginx-proxy
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-nginx-proxy
|
- setup-nginx-proxy
|
||||||
|
|
||||||
# Additional playbook to set the variable file during Element configuration
|
# Additional playbook to set the variable file during Element configuration
|
||||||
- include_tasks: "{{ role_path }}/tasks/set_variables_element.yml"
|
- include_tasks:
|
||||||
|
file: "set_variables_element.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-client-element
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-client-element
|
- setup-client-element
|
||||||
|
|
||||||
# Additional playbook to set the variable file during Synapse configuration
|
# Additional playbook to set the variable file during Synapse configuration
|
||||||
- include_tasks: "{{ role_path }}/tasks/set_variables_synapse.yml"
|
- include_tasks:
|
||||||
|
file: "set_variables_synapse.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-synapse
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-synapse
|
- setup-synapse
|
||||||
|
|
||||||
# Additional playbook to set the variable file during Jitsi configuration
|
# Additional playbook to set the variable file during Jitsi configuration
|
||||||
- include_tasks: "{{ role_path }}/tasks/set_variables_jitsi.yml"
|
- include_tasks:
|
||||||
|
file: "set_variables_jitsi.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-jitsi
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-jitsi
|
- setup-jitsi
|
||||||
|
|
||||||
# Additional playbook to set the variable file during Ma1sd configuration
|
# Additional playbook to set the variable file during Ma1sd configuration
|
||||||
- include_tasks: "{{ role_path }}/tasks/set_variables_ma1sd.yml"
|
- include_tasks:
|
||||||
|
file: "set_variables_ma1sd.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-ma1sd
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-ma1sd
|
- setup-ma1sd
|
||||||
|
|
||||||
# Additional playbook to set the variable file during Corporal configuration
|
# Additional playbook to set the variable file during Corporal configuration
|
||||||
- include_tasks: "{{ role_path }}/tasks/set_variables_corporal.yml"
|
- include_tasks:
|
||||||
|
file: "set_variables_corporal.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-corporal
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-corporal
|
- setup-corporal
|
||||||
|
|
||||||
# Additional playbook to set the variable file during Synapse Admin configuration
|
# Additional playbook to set the variable file during Synapse Admin configuration
|
||||||
- include_tasks: "{{ role_path }}/tasks/set_variables_synapse_admin.yml"
|
- include_tasks:
|
||||||
|
file: "set_variables_synapse_admin.yml"
|
||||||
|
apply:
|
||||||
|
tags: setup-synapse-admin
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- setup-synapse-admin
|
- setup-synapse-admin
|
||||||
|
|
||||||
# Load newly formed matrix variables from tower volume
|
# Load newly formed matrix variables from tower volume
|
||||||
- include_tasks: "{{ role_path }}/tasks/load_matrix_variables.yml"
|
- include_tasks:
|
||||||
|
file: "load_matrix_variables.yml"
|
||||||
|
apply:
|
||||||
|
tags: always
|
||||||
when: run_setup|bool and matrix_awx_enabled|bool
|
when: run_setup|bool and matrix_awx_enabled|bool
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
@ -1,4 +1,14 @@
|
|||||||
|
|
||||||
|
- name: Limit max upload size to 100MB part 1
|
||||||
|
set_fact:
|
||||||
|
matrix_synapse_max_upload_size_mb: "100"
|
||||||
|
when: matrix_synapse_max_upload_size_mb_raw|int >= 100
|
||||||
|
|
||||||
|
- name: Limit max upload size to 100MB part 2
|
||||||
|
set_fact:
|
||||||
|
matrix_synapse_max_upload_size_mb: "{{ matrix_synapse_max_upload_size_mb_raw }}"
|
||||||
|
when: matrix_synapse_max_upload_size_mb_raw|int < 100
|
||||||
|
|
||||||
- name: Record Synapse variables locally on AWX
|
- name: Record Synapse variables locally on AWX
|
||||||
delegate_to: 127.0.0.1
|
delegate_to: 127.0.0.1
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
Loading…
Reference in New Issue
Block a user