Re-domain matrix and servers
This commit is contained in:
		
							parent
							
								
									03ccb49229
								
							
						
					
					
						commit
						2d66759961
					
				
					 3 changed files with 9 additions and 9 deletions
				
			
		| 
						 | 
					@ -3,7 +3,7 @@ all:
 | 
				
			||||||
    local-dev:
 | 
					    local-dev:
 | 
				
			||||||
      ansible_connection: local
 | 
					      ansible_connection: local
 | 
				
			||||||
    node001:
 | 
					    node001:
 | 
				
			||||||
      ansible_host: node001.serguzim.net
 | 
					      ansible_host: node001.vpn.serguzim.net
 | 
				
			||||||
      ansible_port: "{{ vault_node001.ansible_port }}"
 | 
					      ansible_port: "{{ vault_node001.ansible_port }}"
 | 
				
			||||||
      ansible_user: "{{ vault_node001.ansible_user }}"
 | 
					      ansible_user: "{{ vault_node001.ansible_user }}"
 | 
				
			||||||
      host_vpn:
 | 
					      host_vpn:
 | 
				
			||||||
| 
						 | 
					@ -16,7 +16,7 @@ all:
 | 
				
			||||||
          - minecraft-2_data
 | 
					          - minecraft-2_data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    node002:
 | 
					    node002:
 | 
				
			||||||
      ansible_host: node002.serguzim.net
 | 
					      ansible_host: node002.vpn.serguzim.net
 | 
				
			||||||
      ansible_port: "{{ vault_node002.ansible_port }}"
 | 
					      ansible_port: "{{ vault_node002.ansible_port }}"
 | 
				
			||||||
      ansible_user: "{{ vault_node002.ansible_user }}"
 | 
					      ansible_user: "{{ vault_node002.ansible_user }}"
 | 
				
			||||||
      host_vpn:
 | 
					      host_vpn:
 | 
				
			||||||
| 
						 | 
					@ -41,7 +41,7 @@ all:
 | 
				
			||||||
          - vikunja_data
 | 
					          - vikunja_data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    node003:
 | 
					    node003:
 | 
				
			||||||
      ansible_host: node003.serguzim.net
 | 
					      ansible_host: node003.vpn.serguzim.net
 | 
				
			||||||
      ansible_port: "{{ vault_node003.ansible_port }}"
 | 
					      ansible_port: "{{ vault_node003.ansible_port }}"
 | 
				
			||||||
      ansible_user: "{{ vault_node003.ansible_user }}"
 | 
					      ansible_user: "{{ vault_node003.ansible_user }}"
 | 
				
			||||||
      host_vpn:
 | 
					      host_vpn:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,7 +11,7 @@ healthcheck_env:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  HTTP_HC_UID: "{{ vault_healthcheck.hc_uid.http }}"
 | 
					  HTTP_HC_UID: "{{ vault_healthcheck.hc_uid.http }}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  MATRIX_SERVER: https://matrix.msrg.cc
 | 
					  MATRIX_SERVER: https://matrix.serguzim.me
 | 
				
			||||||
  MATRIX_SERVER_FEDTESTER: msrg.cc
 | 
					  MATRIX_SERVER_FEDTESTER: msrg.cc
 | 
				
			||||||
  MATRIX_HC_UID: "{{ vault_healthcheck.hc_uid.matrix }}"
 | 
					  MATRIX_HC_UID: "{{ vault_healthcheck.hc_uid.matrix }}"
 | 
				
			||||||
  MATRIX_TOKEN: "{{ vault_healthcheck.matrix.token }}"
 | 
					  MATRIX_TOKEN: "{{ vault_healthcheck.matrix.token }}"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
synapse_svc:
 | 
					synapse_svc:
 | 
				
			||||||
  name: synapse
 | 
					  name: synapse
 | 
				
			||||||
  domain: matrix.msrg.cc
 | 
					  domain: matrix.serguzim.me
 | 
				
			||||||
  docker_host: synapse-admin
 | 
					  docker_host: synapse-admin
 | 
				
			||||||
  port: 80
 | 
					  port: 80
 | 
				
			||||||
  caddy_extra: |
 | 
					  caddy_extra: |
 | 
				
			||||||
| 
						 | 
					@ -12,9 +12,9 @@ synapse_svc:
 | 
				
			||||||
        reverse_proxy synapse:8008
 | 
					        reverse_proxy synapse:8008
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  extra_svcs:
 | 
					  extra_svcs:
 | 
				
			||||||
    - domain: matrix.msrg.cc:8448
 | 
					    - domain: matrix.serguzim.me:8448
 | 
				
			||||||
      additional_domains:
 | 
					      additional_domains:
 | 
				
			||||||
        - msrg.cc:8448
 | 
					        - serguzim.me:8448
 | 
				
			||||||
      docker_host: synapse
 | 
					      docker_host: synapse
 | 
				
			||||||
      port: 8008
 | 
					      port: 8008
 | 
				
			||||||
  db:
 | 
					  db:
 | 
				
			||||||
| 
						 | 
					@ -26,12 +26,12 @@ synapse_svc:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
synapse_env:
 | 
					synapse_env:
 | 
				
			||||||
  SYNAPSE_CONFIG_PATH: "{{ ('/', svc.config_path) | path_join }}"
 | 
					  SYNAPSE_CONFIG_PATH: "{{ ('/', svc.config_path) | path_join }}"
 | 
				
			||||||
  REACT_APP_SERVER: https://matrix.msrg.cc
 | 
					  REACT_APP_SERVER: https://matrix.serguzim.me
 | 
				
			||||||
 | 
					
 | 
				
			||||||
synapse_yml:
 | 
					synapse_yml:
 | 
				
			||||||
  server_name: msrg.cc
 | 
					  server_name: msrg.cc
 | 
				
			||||||
  pid_file: "{{ (svc.config_path, 'homeserver.pid') | path_join }}"
 | 
					  pid_file: "{{ (svc.config_path, 'homeserver.pid') | path_join }}"
 | 
				
			||||||
  public_baseurl: https://matrix.msrg.cc/
 | 
					  public_baseurl: https://matrix.serguzim.me/
 | 
				
			||||||
  allow_public_rooms_without_auth: true
 | 
					  allow_public_rooms_without_auth: true
 | 
				
			||||||
  allow_public_rooms_over_federation: true
 | 
					  allow_public_rooms_over_federation: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue