mirror of
				https://github.com/kevinveenbirkenbach/computer-playbook.git
				synced 2025-10-31 10:19:09 +00:00 
			
		
		
		
	Removed set_fact https_port
This commit is contained in:
		| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "include tasks update-repository-with-files.yml" | ||||
|   include_tasks: update-repository-with-files.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
| @@ -16,8 +16,11 @@ | ||||
| #  notify: restart nginx | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: configure websocket_upgrade.conf | ||||
|   copy:  | ||||
|   | ||||
| @@ -9,11 +9,6 @@ | ||||
|     - domains[application_id] is string | ||||
|   # Default case: One domain exists. Some applications like matrix don't have an default domain | ||||
|  | ||||
| - name: "Set global http_port to {{ ports.localhost.http[application_id] }}" | ||||
|   set_fact: | ||||
|     http_port: "{{ ports.localhost.http[application_id] if application_id in ports.localhost.http else None }}" | ||||
|   # Default case: One port exists. Some applications like matrix don't have an default port | ||||
|  | ||||
| - name: "remove {{ docker_compose.directories.instance }} and all its contents" | ||||
|   file: | ||||
|     path: "{{ docker_compose.directories.instance }}" | ||||
|   | ||||
| @@ -11,8 +11,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "cleanup central database from {{application_id}}_default network" | ||||
|   command: | ||||
|   | ||||
| @@ -1,8 +1,11 @@ | ||||
| --- | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: create elasticsearch-sysctl.conf | ||||
|   copy: | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -1,6 +1,9 @@ | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "docker jenkins" | ||||
|   docker_compose: | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|   loop: "{{ domains }}" | ||||
|   loop_control: | ||||
|     loop_var: domain | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-compose | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: Create {{domain}}.conf if LDAP is exposed to internet | ||||
|   template:  | ||||
|   | ||||
| @@ -13,8 +13,11 @@ | ||||
|       {% endif %} | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|   vars: | ||||
|     nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 31M;" | ||||
|  | ||||
|   | ||||
| @@ -4,7 +4,7 @@ map $http_upgrade $connection_upgrade { | ||||
| } | ||||
|  | ||||
| server { | ||||
|   server_name {{domain}}; | ||||
|   server_name {{domains[application_id]}}; | ||||
|  | ||||
|   {% include 'roles/letsencrypt/templates/ssl_header.j2' %} | ||||
|  | ||||
|   | ||||
| @@ -5,8 +5,11 @@ | ||||
|   when: run_once_docker_matomo is not defined | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|   when: run_once_docker_matomo is not defined | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   | ||||
| @@ -1,9 +1,10 @@ | ||||
| server { | ||||
|     # Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary | ||||
|     {# Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary #} | ||||
|     {# Could be that this is related to the set_fact use #} | ||||
|     {% set domain = domains.matrix_synapse %} | ||||
|     {% set http_port = ports.localhost.http.matrix_synapse %} | ||||
|  | ||||
|     server_name {{domain}}; | ||||
|     server_name {{domains.matrix_synapse}}; | ||||
|     {% include 'roles/letsencrypt/templates/ssl_header.j2' %} | ||||
|      | ||||
|     # For the federation port | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: add docker-compose.yml | ||||
|   template: src=docker-compose.yml.j2 dest={{docker_compose.directories.instance}}docker-compose.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "Create {{openproject_plugins_service}}" | ||||
|   file: | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-compose | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-compose | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "include role docker-repository-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "include role docker-repository-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   | ||||
| @@ -4,13 +4,14 @@ | ||||
|     name: docker-central-database | ||||
|    | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   loop: "{{ domains.wordpress }}" | ||||
|   loop_control: | ||||
|     loop_var: domain | ||||
|   vars: | ||||
|     nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size {{wordpress_max_upload_size}};" | ||||
|     http_port: 	                                    "{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "Transfering upload.ini to {{docker_compose.directories.instance}}" | ||||
|   template: | ||||
|   | ||||
| @@ -4,8 +4,11 @@ | ||||
|     name: docker-central-database | ||||
|  | ||||
| - name: "include role nginx-domain-setup for {{application_id}}" | ||||
|   include_role:  | ||||
|   include_role: | ||||
|     name: nginx-domain-setup | ||||
|   vars: | ||||
|     domain: 	"{{ domains[application_id] }}" | ||||
|     http_port: 	"{{ ports.localhost.http[application_id] }}" | ||||
|  | ||||
| - name: "copy docker-compose.yml and env file" | ||||
|   include_tasks: copy-docker-compose-and-env.yml | ||||
|   | ||||
		Reference in New Issue
	
	Block a user