mirror of
				https://github.com/spantaleev/matrix-docker-ansible-deploy.git
				synced 2025-10-31 07:17:57 +01:00 
			
		
		
		
	Rename file names and references to those files
Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org>
This commit is contained in:
		| @@ -28,13 +28,13 @@ matrix_postmoogle_container_additional_networks_custom: [] | ||||
| # A list of extra arguments to pass to the container | ||||
| matrix_postmoogle_container_extra_arguments: [] | ||||
| 
 | ||||
| # List of systemd services that matrix-bot-postmoogle.service depends on | ||||
| # List of systemd services that matrix-postmoogle.service depends on | ||||
| matrix_postmoogle_systemd_required_services_list: "{{ matrix_postmoogle_systemd_required_services_list_default + matrix_postmoogle_systemd_required_services_list_auto + matrix_postmoogle_systemd_required_services_list_custom }}" | ||||
| matrix_postmoogle_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" | ||||
| matrix_postmoogle_systemd_required_services_list_auto: [] | ||||
| matrix_postmoogle_systemd_required_services_list_custom: [] | ||||
| 
 | ||||
| # List of systemd services that matrix-bot-postmoogle.service wants | ||||
| # List of systemd services that matrix-postmoogle.service wants | ||||
| matrix_postmoogle_systemd_wanted_services_list: [] | ||||
| 
 | ||||
| # Database-related configuration fields. | ||||
| @@ -2,9 +2,9 @@ | ||||
| 
 | ||||
| - tags: | ||||
|     - setup-all | ||||
|     - setup-bot-postmoogle | ||||
|     - setup-postmoogle | ||||
|     - install-all | ||||
|     - install-bot-postmoogle | ||||
|     - install-postmoogle | ||||
|   block: | ||||
|     - when: matrix_postmoogle_enabled | bool | ||||
|       ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" | ||||
| @@ -14,7 +14,7 @@ | ||||
| 
 | ||||
| - tags: | ||||
|     - setup-all | ||||
|     - setup-bot-postmoogle | ||||
|     - setup-postmoogle | ||||
|   block: | ||||
|     - when: not matrix_postmoogle_enabled | bool | ||||
|       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml" | ||||
| @@ -18,7 +18,7 @@ | ||||
|               caller: "{{ role_path | basename }}" | ||||
|               engine_variable_name: 'matrix_postmoogle_database_engine' | ||||
|               engine_old: 'sqlite' | ||||
|               systemd_services_to_stop: ['matrix-bot-postmoogle.service'] | ||||
|               systemd_services_to_stop: ['matrix-postmoogle.service'] | ||||
| 
 | ||||
|         - ansible.builtin.set_fact: | ||||
|             matrix_postmoogle_requires_restart: true | ||||
| @@ -86,9 +86,9 @@ | ||||
|     driver: bridge | ||||
|     driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}" | ||||
| 
 | ||||
| - name: Ensure matrix-bot-postmoogle.service installed | ||||
| - name: Ensure matrix-postmoogle.service installed | ||||
|   ansible.builtin.template: | ||||
|     src: "{{ role_path }}/templates/systemd/matrix-bot-postmoogle.service.j2" | ||||
|     dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-postmoogle.service" | ||||
|     src: "{{ role_path }}/templates/systemd/matrix-postmoogle.service.j2" | ||||
|     dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-postmoogle.service" | ||||
|     mode: 0644 | ||||
|   register: matrix_postmoogle_systemd_service_result | ||||
| @@ -2,21 +2,21 @@ | ||||
| 
 | ||||
| - name: Check existence of matrix-postmoogle service | ||||
|   ansible.builtin.stat: | ||||
|     path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-postmoogle.service" | ||||
|     path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-postmoogle.service" | ||||
|   register: matrix_postmoogle_service_stat | ||||
| 
 | ||||
| - when: matrix_postmoogle_service_stat.stat.exists | bool | ||||
|   block: | ||||
|     - name: Ensure matrix-postmoogle is stopped | ||||
|       ansible.builtin.service: | ||||
|         name: matrix-bot-postmoogle | ||||
|         name: matrix-postmoogle | ||||
|         state: stopped | ||||
|         enabled: false | ||||
|         daemon_reload: true | ||||
| 
 | ||||
|     - name: Ensure matrix-bot-postmoogle.service doesn't exist | ||||
|     - name: Ensure matrix-postmoogle.service doesn't exist | ||||
|       ansible.builtin.file: | ||||
|         path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-bot-postmoogle.service" | ||||
|         path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-postmoogle.service" | ||||
|         state: absent | ||||
| 
 | ||||
|     - name: Ensure Matrix postmoogle paths don't exist | ||||
| @@ -1,6 +1,6 @@ | ||||
| #jinja2: lstrip_blocks: "True" | ||||
| [Unit] | ||||
| Description=Matrix Postmoogle bot | ||||
| Description=Matrix Postmoogle bridge | ||||
| {% for service in matrix_postmoogle_systemd_required_services_list %} | ||||
| Requires={{ service }} | ||||
| After={{ service }} | ||||
| @@ -13,12 +13,12 @@ DefaultDependencies=no | ||||
| [Service] | ||||
| Type=simple | ||||
| Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}" | ||||
| ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-postmoogle 2>/dev/null || true' | ||||
| ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-postmoogle 2>/dev/null || true' | ||||
| ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-postmoogle 2>/dev/null || true' | ||||
| ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-postmoogle 2>/dev/null || true' | ||||
| 
 | ||||
| ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ | ||||
| 			--rm \ | ||||
| 			--name=matrix-bot-postmoogle \ | ||||
| 			--name=matrix-postmoogle \ | ||||
| 			--log-driver=none \ | ||||
| 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ | ||||
| 			--cap-drop=ALL \ | ||||
| @@ -39,16 +39,16 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ | ||||
| 			{{ matrix_postmoogle_docker_image }} | ||||
| 
 | ||||
| {% for network in matrix_postmoogle_container_additional_networks %} | ||||
| ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-postmoogle | ||||
| ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-postmoogle | ||||
| {% endfor %} | ||||
| 
 | ||||
| ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-bot-postmoogle | ||||
| ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-postmoogle | ||||
| 
 | ||||
| ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-postmoogle 2>/dev/null || true' | ||||
| ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-postmoogle 2>/dev/null || true' | ||||
| ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-postmoogle 2>/dev/null || true' | ||||
| ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-postmoogle 2>/dev/null || true' | ||||
| Restart=always | ||||
| RestartSec=30 | ||||
| SyslogIdentifier=matrix-bot-postmoogle | ||||
| SyslogIdentifier=matrix-postmoogle | ||||
| 
 | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
		Reference in New Issue
	
	Block a user