mirror of
				https://github.com/spantaleev/matrix-docker-ansible-deploy.git
				synced 2025-10-31 07:17:57 +01:00 
			
		
		
		
	make justfile compatible with different 'just' implementations, fixes #3866
This commit is contained in:
		
							
								
								
									
										12
									
								
								justfile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								justfile
									
									
									
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| # Shows help | ||||
| default: | ||||
|     @just --list --justfile {{ justfile() }} | ||||
|     @{{ just_executable() }} --list --justfile {{ justfile() }} | ||||
|  | ||||
| # Pulls external Ansible roles | ||||
| roles: | ||||
| @@ -17,7 +17,7 @@ roles: | ||||
| update *flags: update-playbook-only | ||||
|     #!/usr/bin/env sh | ||||
|     if [ -x "$(command -v agru)" ]; then | ||||
|         echo {{ if flags == "" { "Installing roles pinned in requirements.yml…" } else if flags == "-u" { "Updating roles and pinning new versions in requirements.yml…" } else { "Unknown flags passed" } }} | ||||
|         echo {{ if flags == "" { "Installing roles pinned in requirements.yml…" } else { if flags == "-u" { "Updating roles and pinning new versions in requirements.yml…" } else { "Unknown flags passed" } } }} | ||||
|         agru {{ flags }} | ||||
|     else | ||||
|         echo "[NOTE] You are using the standard ansible-galaxy tool to install roles, which is slow and lacks other features. We recommend installing the 'agru' tool to speed up the process: https://github.com/etkecc/agru#where-to-get" | ||||
| @@ -42,7 +42,7 @@ install-all *extra_args: (run-tags "install-all,ensure-matrix-users-created,star | ||||
|  | ||||
| # Runs installation tasks for a single service | ||||
| install-service service *extra_args: | ||||
|     just --justfile {{ justfile() }} run \ | ||||
|     {{ just_executable() }} --justfile {{ justfile() }} run \ | ||||
|     --tags=install-{{ service }},start-group \ | ||||
|     --extra-vars=group={{ service }} \ | ||||
|     --extra-vars=devture_systemd_service_manager_service_restart_mode=one-by-one {{ extra_args }} | ||||
| @@ -56,7 +56,7 @@ run +extra_args: | ||||
|  | ||||
| # Runs the playbook with the given list of comma-separated tags and optional arguments | ||||
| run-tags tags *extra_args: | ||||
|     just --justfile {{ justfile() }} run --tags={{ tags }} {{ extra_args }} | ||||
|     {{ just_executable() }} --justfile {{ justfile() }} run --tags={{ tags }} {{ extra_args }} | ||||
|  | ||||
| # Runs the playbook in user-registration mode | ||||
| register-user username password admin_yes_or_no *extra_args: | ||||
| @@ -67,14 +67,14 @@ start-all *extra_args: (run-tags "start-all" extra_args) | ||||
|  | ||||
| # Starts a specific service group | ||||
| start-group group *extra_args: | ||||
|     @just --justfile {{ justfile() }} run-tags start-group --extra-vars="group={{ group }}" {{ extra_args }} | ||||
|     @{{ just_executable() }} --justfile {{ justfile() }} run-tags start-group --extra-vars="group={{ group }}" {{ extra_args }} | ||||
|  | ||||
| # Stops all services | ||||
| stop-all *extra_args: (run-tags "stop-all" extra_args) | ||||
|  | ||||
| # Stops a specific service group | ||||
| stop-group group *extra_args: | ||||
|     @just --justfile {{ justfile() }} run-tags stop-group --extra-vars="group={{ group }}" {{ extra_args }} | ||||
|     @{{ just_executable() }} --justfile {{ justfile() }} run-tags stop-group --extra-vars="group={{ group }}" {{ extra_args }} | ||||
|  | ||||
| # Rebuilds the mautrix-meta-instagram Ansible role using the mautrix-meta-messenger role as a source | ||||
| rebuild-mautrix-meta-instagram: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user