pero 0.5.2 → 0.5.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/pero/docker.rb +14 -2
- data/lib/pero/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e8fc62fc16984c838f034444f6dc537009aaa019e460a5998bad1184411c8a5b
|
4
|
+
data.tar.gz: 02233a95f14a8a58e622cfc1cb23cdc55edb81b2ede70bd015872ad642788189
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 88141e0b5932f838695df5fca5a558a1b9523a8486201d643bf866cbf019771f011d8dede89d363518fe70873b4d5fa86dd1746ba6bc16e2a3cafe6f4af729af
|
7
|
+
data.tar.gz: cc8ad0c0c15759f70a318121dcc4cf567138c35e1321e460820563112c132c65efcc1d853bfa69ba2612617436c13e8a338851dd0a29b49eb946ba6da09de1e9
|
data/lib/pero/docker.rb
CHANGED
@@ -149,9 +149,16 @@ RUN sed -i "s|#baseurl=|baseurl=|g" /etc/yum.repos.d/CentOS-Base.repo \
|
|
149
149
|
''
|
150
150
|
end
|
151
151
|
|
152
|
+
legacy_signing = if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
|
153
|
+
"RUN echo 'LegacySigningMDs md5' >> /etc/pki/tls/legacy-settings"
|
154
|
+
else
|
155
|
+
''
|
156
|
+
end
|
157
|
+
|
152
158
|
<<-EOS
|
153
159
|
FROM #{from_image}
|
154
160
|
#{vault_repo}
|
161
|
+
#{legacy_signing}
|
155
162
|
RUN curl -L -k -O https://yum.puppetlabs.com/#{release_package} && \
|
156
163
|
rpm -ivh #{release_package}
|
157
164
|
RUN yum install -y #{package_name}-#{server_version}
|
@@ -161,7 +168,7 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
|
|
161
168
|
end
|
162
169
|
|
163
170
|
def create_ca
|
164
|
-
|
171
|
+
if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
|
165
172
|
'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
|
166
173
|
elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
|
167
174
|
'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
|
@@ -171,7 +178,12 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
|
|
171
178
|
end
|
172
179
|
|
173
180
|
def run_cmd
|
174
|
-
|
181
|
+
if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
|
182
|
+
# /var/puppet/run is created for the first time by running `puppet master`,
|
183
|
+
# but `puppet master` will fail because the permissions are wrong.
|
184
|
+
# So, let the `puppet master` fail once, fix the permission of /var/puppet/run, and execute `puppet master` again.
|
185
|
+
'puppet master --no-daemonize --verbose || (chown puppet: /var/puppet/run && puppet master --no-daemonize --verbose)'
|
186
|
+
elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
|
175
187
|
'puppet master --no-daemonize --verbose'
|
176
188
|
elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
|
177
189
|
'puppetserver foreground'
|
data/lib/pero/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pero
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- pyama86
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-04-
|
11
|
+
date: 2021-04-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|