default.yml in takelage-0.29.0

- old
+ new

@@ -31,11 +31,11 @@
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
 cmd_docker_check_daemon_docker_info: 'docker info'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
-cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --extra=%{extra} %{entrypoint_options}'
 cmd_docker_container_create_network: 'docker network create %{network}'
 cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
 cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
 cmd_docker_container_get_containers: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
 cmd_docker_container_remove_network: 'docker network rm %{network}'
@@ -43,16 +43,10 @@
 cmd_docker_container_stop_container: 'docker stop %{container}'
 cmd_docker_image_tag_check_docker_images: 'docker images --quiet %{image}'
 cmd_docker_image_tag_list_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:latest'
 cmd_docker_image_update_docker_remove_dangling: 'docker image prune --force'
-cmd_docker_socket_config_agent_socket_path: 'gpgconf --list-dirs agent-socket'
-cmd_docker_socket_config_agent_ssh_socket_path: 'gpgconf --list-dirs agent-ssh-socket'
-cmd_docker_socket_get_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
-cmd_docker_socket_start_sudo_true: 'sudo true'
-cmd_docker_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
-cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
 cmd_git_check_clean_git_status: 'git status --porcelain'
 cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C %{dir} rev-parse'
@@ -63,10 +57,11 @@
 cmd_info_status_lib_git_key_available: 'gpg --list-key %{key}'
 cmd_info_status_gopass_root_store: 'gopass config | grep "path" | cut -d " " -f 2'
 cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_ssh_keys: 'ssh-add -l'
+cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
 cmd_mutagen_check_daemon_version: 'mutagen version'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'
 cmd_mutagen_forward_socket_check: 'mutagen forward list %{socketname}'
 cmd_mutagen_forward_socket_terminate: 'mutagen forward terminate %{socketname}'
@@ -77,14 +72,14 @@
 docker_entrypoint_options: ''
 docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
 docker_run_options: '--env GOOGLE_APPLICATION_CREDENTIALS=/hostdir/.google/default.json'
 docker_shm_size: '512M'
-docker_socket_gpg_agent_port: 17874
-docker_socket_gpg_ssh_agent_port: 17875
 docker_tag: 'latest'
 docker_user: 'takelage'
 git_main_branch: 'main'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
-mutagen_socket_path: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_mutagen: '~/.mutagen/daemon/daemon.sock'
+mutagen_socket_path_gpg: '~/.gnupg/S.gpg-agent'
+mutagen_socket_path_ssh: '~/.gnupg/S.gpg-agent.ssh'
 mutagen_socket_takelage_label: 'type=takelage-socket'