takeltau 0.37.1 → 0.37.3
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6e297c80af53f6afcb49ac3728e6c5833a53fdbaf745d1df9f2cc024da99a87e
|
4
|
+
data.tar.gz: 29593c7d300c8f960292a9527a778421a41a3b7bea203da4ec6acc25eac7113a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 54d2ce13da764a2d7fa40c344ef139605eafc5e1d6559fdaeb7dea38ff9702b7f57fa99a7c520469dac89f55800aaf2c284fc014f0735ff920dde3397a639867
|
7
|
+
data.tar.gz: 0f4d384cfaba7ccb214cfb6a0e780f662703706e706898858a6663257f9d1af3d26cab3daf24b172d583b89936d32b8f44b0d33ff3aed86b81705e6663673d9b
|
data/lib/takeltau/default.yml
CHANGED
@@ -64,7 +64,10 @@ git_hg_branch: 'main'
|
|
64
64
|
info_project_main: 'project.yml'
|
65
65
|
info_project_private: 'private/project.yml'
|
66
66
|
login_wait_for_sockets: '0'
|
67
|
-
|
68
|
-
|
69
|
-
|
67
|
+
mutagen_socket_path_mutagen_container: '~/.mutagen/daemon/daemon.sock'
|
68
|
+
mutagen_socket_path_mutagen_host: '~/.mutagen/daemon/daemon.sock'
|
69
|
+
mutagen_socket_path_gpg_container: '~/.gnupg/S.gpg-agent'
|
70
|
+
mutagen_socket_path_gpg_host: '~/.gnupg/S.gpg-agent'
|
71
|
+
mutagen_socket_path_ssh_container: '~/.gnupg/S.gpg-agent.ssh'
|
72
|
+
mutagen_socket_path_ssh_host: '~/.gnupg/S.gpg-agent.ssh'
|
70
73
|
mutagen_socket_takelage_label: 'type=takelage'
|
@@ -40,9 +40,12 @@ module Takeltau
|
|
40
40
|
@hostname = _docker_container_lib_hostname
|
41
41
|
@hostlabel = "hostname=#{@hostname}"
|
42
42
|
@takellabel = config.active['mutagen_socket_takelage_label']
|
43
|
-
@
|
44
|
-
@
|
45
|
-
@
|
43
|
+
@mutagensock_container = config.active['mutagen_socket_path_mutagen_container']
|
44
|
+
@mutagensock_host = config.active['mutagen_socket_path_mutagen_host']
|
45
|
+
@gpgsock_container = config.active['mutagen_socket_path_gpg_container']
|
46
|
+
@gpgsock_host = config.active['mutagen_socket_path_gpg_host']
|
47
|
+
@sshsock_container = config.active['mutagen_socket_path_ssh_container']
|
48
|
+
@sshsock_host = config.active['mutagen_socket_path_ssh_host']
|
46
49
|
end
|
47
50
|
# rubocop:enable Metrics/MethodLength
|
48
51
|
# rubocop:enable Metrics/AbcSize
|
@@ -10,9 +10,9 @@ module DockerContainerLib
|
|
10
10
|
def _docker_container_lib_start_sockets
|
11
11
|
return false unless mutagen_check_daemon
|
12
12
|
|
13
|
-
mutagen_socket_create 'mutagen', @
|
14
|
-
mutagen_socket_create 'gpg', @
|
15
|
-
mutagen_socket_create 'ssh', @
|
13
|
+
mutagen_socket_create 'mutagen', @mutagensock_container, @mutagensock_host
|
14
|
+
mutagen_socket_create 'gpg', @gpgsock_container, @gpgsock_host
|
15
|
+
mutagen_socket_create 'ssh', @sshsock_container, @sshsock_host
|
16
16
|
end
|
17
17
|
|
18
18
|
# Create unique docker hostname
|
@@ -5,14 +5,13 @@ module MutagenCheckDaemon
|
|
5
5
|
# Backend method for mutagen check daemon.
|
6
6
|
# @return [Boolean] is mutagen available?
|
7
7
|
# rubocop:disable Metrics/MethodLength
|
8
|
-
# rubocop:disable Metrics/AbcSize
|
9
8
|
def mutagen_check_daemon
|
10
9
|
return true if @mutagen_daemon_available
|
11
10
|
|
12
|
-
return false unless command_available_else_warn? config.active['cmd_mutagen']
|
13
|
-
|
14
11
|
log.debug 'Check mutagen status'
|
15
12
|
|
13
|
+
return false unless _mutagen_check_check_prerequisites
|
14
|
+
|
16
15
|
# are we outside of a takelage container?
|
17
16
|
unless _docker_container_lib_check_matrjoschka
|
18
17
|
unless _mutagen_check_daemon_version
|
@@ -25,11 +24,6 @@ module MutagenCheckDaemon
|
|
25
24
|
return true
|
26
25
|
end
|
27
26
|
|
28
|
-
unless _file_exists? config.active['mutagen_socket_path_mutagen']
|
29
|
-
log.error 'The mutagen socket is not available'
|
30
|
-
return false
|
31
|
-
end
|
32
|
-
|
33
27
|
unless _mutagen_check_daemon_host_connection
|
34
28
|
log.error 'A mutagen host connection is not available'
|
35
29
|
return false
|
@@ -39,11 +33,25 @@ module MutagenCheckDaemon
|
|
39
33
|
@mutagen_daemon_available = true
|
40
34
|
true
|
41
35
|
end
|
42
|
-
# rubocop:enable Metrics/AbcSize
|
43
36
|
# rubocop:enable Metrics/MethodLength
|
44
37
|
|
45
38
|
private
|
46
39
|
|
40
|
+
# Check mutagen prerequisites
|
41
|
+
def _mutagen_check_check_prerequisites
|
42
|
+
unless _file_exists? config.active['mutagen_socket_path_mutagen_container']
|
43
|
+
log.error 'The mutagen socket path in the container is not available'
|
44
|
+
return false
|
45
|
+
end
|
46
|
+
|
47
|
+
unless _file_exists? config.active['mutagen_socket_path_mutagen_host']
|
48
|
+
log.error 'The mutagen socket path on the host is not available'
|
49
|
+
return false
|
50
|
+
end
|
51
|
+
|
52
|
+
command_available_else_error? config.active['cmd_mutagen']
|
53
|
+
end
|
54
|
+
|
47
55
|
# Check mutagen host connection
|
48
56
|
# rubocop:disable Metrics/MethodLength
|
49
57
|
def _mutagen_check_daemon_host_connection
|
data/lib/takeltau/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.37.
|
1
|
+
0.37.3
|