puppetfactory 0.5.2 → 0.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/puppetfactory/plugins/docker.rb +8 -1
- data/lib/puppetfactory/plugins/shell_user.rb +2 -2
- metadata +12 -12
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 98a14b1df3c7c1c6fdc4a8ab870ccf579e379374
|
|
4
|
+
data.tar.gz: 330ee7f16af7a0d4c9cc28f49572ba5fcc721fbb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0facd2f02cb71826e570aedcededc5b9a7350d7de4ea373c2080a7cdf49c9d4fd8150b83d6c8dc8b6c24d5f15179e300c7d2c3bc2d2bcfff1ca8d8946d337449
|
|
7
|
+
data.tar.gz: 8a4f20a8f41b1557cbed4f824146376789f870341d3d338a271d8b72f55dd1e3a71229fa1890710a7aded41fba6a26150b97b10e9ada934129ffa106a2c637e3
|
|
@@ -23,7 +23,7 @@ class Puppetfactory::Plugins::Docker < Puppetfactory::Plugins
|
|
|
23
23
|
@container = options[:container_name] || 'centosagent'
|
|
24
24
|
@group = options[:docker_group] || 'docker'
|
|
25
25
|
@docker_ip = options[:docker_ip] || `facter ipaddress_docker0`.strip
|
|
26
|
-
@privileged = options[:privileged] ||
|
|
26
|
+
@privileged = options[:privileged] || false
|
|
27
27
|
end
|
|
28
28
|
|
|
29
29
|
def create(username, password)
|
|
@@ -67,6 +67,13 @@ class Puppetfactory::Plugins::Docker < Puppetfactory::Plugins
|
|
|
67
67
|
"Image" => "#{@container}",
|
|
68
68
|
"HostConfig" => {
|
|
69
69
|
"Privileged" => @privileged,
|
|
70
|
+
"SecurityOpt" => [
|
|
71
|
+
"seccomp=unconfined"
|
|
72
|
+
],
|
|
73
|
+
"Tmpfs" => {
|
|
74
|
+
"/run" => "",
|
|
75
|
+
"/tmp" => ""
|
|
76
|
+
},
|
|
70
77
|
"Binds" => binds,
|
|
71
78
|
"ExtraHosts" => [
|
|
72
79
|
"#{@master} puppet:#{@docker_ip}"
|
|
@@ -19,8 +19,8 @@ class Puppetfactory::Plugins::ShellUser < Puppetfactory::Plugins
|
|
|
19
19
|
end
|
|
20
20
|
|
|
21
21
|
def create(username, password)
|
|
22
|
-
unless username =~ /^[a-z_][a-z0-9_]{
|
|
23
|
-
$logger.error "Invalid username. '#{username}' does not match regex /^[a-z_][a-z0-9_]{
|
|
22
|
+
unless username =~ /^[a-z_][a-z0-9_]{2,30}$/
|
|
23
|
+
$logger.error "Invalid username. '#{username}' does not match regex /^[a-z_][a-z0-9_]{2,30}$/"
|
|
24
24
|
raise "Invalid username #{username}."
|
|
25
25
|
end
|
|
26
26
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: puppetfactory
|
|
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
|
- Ben Ford
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2016-10-
|
|
12
|
+
date: 2016-10-12 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: sinatra
|
|
@@ -136,16 +136,18 @@ executables:
|
|
|
136
136
|
extensions: []
|
|
137
137
|
extra_rdoc_files: []
|
|
138
138
|
files:
|
|
139
|
-
- README.md
|
|
140
139
|
- LICENSE
|
|
140
|
+
- README.md
|
|
141
141
|
- bin/pfsh
|
|
142
142
|
- bin/puppetfactory
|
|
143
|
+
- lib/puppetfactory.rb
|
|
143
144
|
- lib/puppetfactory/cli.rb
|
|
144
145
|
- lib/puppetfactory/dashboard/rake_tasks.rb
|
|
145
146
|
- lib/puppetfactory/dashboard/serverspec_helper.rb
|
|
146
147
|
- lib/puppetfactory/dashboard/spec_helper.rb
|
|
147
148
|
- lib/puppetfactory/helpers.rb
|
|
148
149
|
- lib/puppetfactory/monkeypatches.rb
|
|
150
|
+
- lib/puppetfactory/plugins.rb
|
|
149
151
|
- lib/puppetfactory/plugins/certificates.rb
|
|
150
152
|
- lib/puppetfactory/plugins/classification.rb
|
|
151
153
|
- lib/puppetfactory/plugins/code_manager.rb
|
|
@@ -162,14 +164,6 @@ files:
|
|
|
162
164
|
- lib/puppetfactory/plugins/r10k.rb
|
|
163
165
|
- lib/puppetfactory/plugins/shell_user.rb
|
|
164
166
|
- lib/puppetfactory/plugins/user_environment.rb
|
|
165
|
-
- lib/puppetfactory/plugins.rb
|
|
166
|
-
- lib/puppetfactory.rb
|
|
167
|
-
- views/dashboard.erb
|
|
168
|
-
- views/home.erb
|
|
169
|
-
- views/index.erb
|
|
170
|
-
- views/logs.erb
|
|
171
|
-
- views/shell.erb
|
|
172
|
-
- views/users.erb
|
|
173
167
|
- public/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
|
|
174
168
|
- public/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
|
|
175
169
|
- public/css/images/ui-bg_flat_10_000000_40x100.png
|
|
@@ -239,6 +233,12 @@ files:
|
|
|
239
233
|
- templates/init_scripts.erb
|
|
240
234
|
- templates/puppet.conf.erb
|
|
241
235
|
- templates/site.pp.erb
|
|
236
|
+
- views/dashboard.erb
|
|
237
|
+
- views/home.erb
|
|
238
|
+
- views/index.erb
|
|
239
|
+
- views/logs.erb
|
|
240
|
+
- views/shell.erb
|
|
241
|
+
- views/users.erb
|
|
242
242
|
homepage: https://github.com/puppetlabs/puppetfactory
|
|
243
243
|
licenses:
|
|
244
244
|
- Apache-2.0
|
|
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
259
259
|
version: '0'
|
|
260
260
|
requirements: []
|
|
261
261
|
rubyforge_project:
|
|
262
|
-
rubygems_version: 2.
|
|
262
|
+
rubygems_version: 2.2.5
|
|
263
263
|
signing_key:
|
|
264
264
|
specification_version: 4
|
|
265
265
|
summary: Stands up a graphical classroom manager with containerized puppet agents.
|