mirror of
				https://github.com/spantaleev/matrix-docker-ansible-deploy.git
				synced 2025-11-04 09:08:56 +01:00 
			
		
		
		
	matrix-etherpad: fail when mode is 'dimension', but dimension is disabled
This commit is contained in:
		@@ -4,6 +4,12 @@
 | 
			
		||||
  tags:
 | 
			
		||||
    - always
 | 
			
		||||
 | 
			
		||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
 | 
			
		||||
  when: run_setup | bool and matrix_etherpad_enabled | bool
 | 
			
		||||
  tags:
 | 
			
		||||
    - setup-all
 | 
			
		||||
    - setup-etherpad
 | 
			
		||||
 | 
			
		||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
 | 
			
		||||
  when: run_setup | bool and matrix_etherpad_enabled | bool
 | 
			
		||||
  tags:
 | 
			
		||||
@@ -15,9 +21,3 @@
 | 
			
		||||
  tags:
 | 
			
		||||
    - setup-all
 | 
			
		||||
    - setup-etherpad
 | 
			
		||||
 | 
			
		||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
 | 
			
		||||
  when: run_setup | bool and matrix_etherpad_enabled | bool
 | 
			
		||||
  tags:
 | 
			
		||||
    - setup-all
 | 
			
		||||
    - setup-etherpad
 | 
			
		||||
 
 | 
			
		||||
@@ -5,3 +5,9 @@
 | 
			
		||||
    msg: >-
 | 
			
		||||
      Etherpad requires a dedicated Postgres database. Please enable the built in one, or configure an external DB by redefining "matrix_etherpad_database_hostname"
 | 
			
		||||
  when: matrix_etherpad_database_hostname == "matrix-postgres" and not matrix_postgres_enabled
 | 
			
		||||
 | 
			
		||||
- name: Fail if wrong mode selected
 | 
			
		||||
  ansible.builtin.fail:
 | 
			
		||||
    msg: >-
 | 
			
		||||
      You're using Etherpad in 'dimension' mode (`matrix_etherpad_serving_mode: dimension`), which tries to host Etherpad at the Dimension subdomain - `{{ matrix_server_fqn_dimension }}`. However, this isn't possible because Dimension is not enabled. To resolve the problem, either enable Dimension (`matrix_dimension_enabled: true`) or switch Etherpad to standalone mode (`matrix_etherpad_mode: standalone`) and have it served on its own domain (`{{ matrix_server_fqn_etherpad }}`).
 | 
			
		||||
  when: matrix_etherpad_enabled | bool and matrix_etherpad_mode == 'dimension' and not matrix_dimension_enabled | default(False) | bool
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user