teamd-installer 0.0.17 → 0.0.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/docker/Dockerfile +1 -1
- data/lib/teamd/installer/template_config.rb +7 -2
- data/lib/teamd/installer/version.rb +1 -1
- data/shared/remove-sshd-socket.service +8 -0
- metadata +2 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e877c1e503b9cb269582b73de707b444f7e43518
|
|
4
|
+
data.tar.gz: 74b3b2948fbd3cfd28b1c41301c66ff68b2b3d4e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 660a47fa94eeb37c561895baeb111c7f2ffff84358cf9ee1709f0cb865d96654a5e8fc435a1c6cac7ca04e8feafd8a6bff935b4e6091400a10a92561c8a7986a
|
|
7
|
+
data.tar.gz: 92cbc2b0a5958df26438164e4d5f28669b57714a8b6a70fbba7df9de0d9e6589b91fe5101362df37c5795ab1a472c82289ea837918e48748246d58f501c3eb83
|
data/docker/Dockerfile
CHANGED
|
@@ -4,6 +4,6 @@ MAINTAINER Mathias Kaufmann <me@stei.gr>
|
|
|
4
4
|
RUN apk update && \
|
|
5
5
|
apk add ruby ruby-dev ca-certificates bash wget gnupg util-linux coreutils bzip2 && \
|
|
6
6
|
gem update --system --no-ri --no-rdoc
|
|
7
|
-
RUN gem install --no-ri --no-rdoc --version 0.0.
|
|
7
|
+
RUN gem install --no-ri --no-rdoc --version 0.0.18 teamd-installer
|
|
8
8
|
|
|
9
9
|
ENTRYPOINT ["/usr/bin/teamd-installer"]
|
|
@@ -22,9 +22,9 @@ module Teamd
|
|
|
22
22
|
if inspect_etcd
|
|
23
23
|
puts "Create Unit for publishing discovery token"
|
|
24
24
|
output["coreos"]["units"] << {
|
|
25
|
-
"name" => "teamd-
|
|
25
|
+
"name" => "teamd-etcd-cloudinit-reuse.service",
|
|
26
26
|
"command" => "start",
|
|
27
|
-
"content" => "[Unit]\nDescription=Teamd Etcd2 Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/
|
|
27
|
+
"content" => "[Unit]\nDescription=Teamd Etcd2 Unit Reuse\nDocumentation=https://teamd.stei.gr/discover\nConditionPathExists=/run/systemd/system/etcd.service.d/20-cloudinit.conf\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/ln -s /run/systemd/system/etcd2.service.d /etc/systemd/system/teamd-discover.service.d",
|
|
28
28
|
}
|
|
29
29
|
else
|
|
30
30
|
puts "Create Unit for publishing discovery token"
|
|
@@ -58,6 +58,11 @@ module Teamd
|
|
|
58
58
|
"command" => "restart",
|
|
59
59
|
"content" => "[Socket]\nListenStream=#{@sshd_port}\nAccept=yes",
|
|
60
60
|
}
|
|
61
|
+
output["coreos"]["units"] << {
|
|
62
|
+
"name" => "remove-sshd-socket.service",
|
|
63
|
+
"command" => "start",
|
|
64
|
+
"content" => "[Unit]\nDescription=Remove SSHd Socket before reboot\nBefore=shutdown.target reboot.target halt.target\nDefaultDependencies=no\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/rm /etc/systemd/system/sshd.socket",
|
|
65
|
+
}
|
|
61
66
|
end
|
|
62
67
|
unless @dynamic_environment
|
|
63
68
|
puts "Writing static /etc/environment"
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: teamd-installer
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.18
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mathias Kaufmann
|
|
@@ -125,6 +125,7 @@ files:
|
|
|
125
125
|
- lib/teamd/installer/token_provider.rb
|
|
126
126
|
- lib/teamd/installer/version.rb
|
|
127
127
|
- shared/dynamic-environment.service
|
|
128
|
+
- shared/remove-sshd-socket.service
|
|
128
129
|
- shared/teamd-discover.service
|
|
129
130
|
- shared/teamd-etcd2-cloudinit-reuse.service
|
|
130
131
|
- teamd-installer.gemspec
|