Merge branch 'master' into feature/7-ejabberd
This commit is contained in:
Greg Karékinian
commit
98a13b08a1
6
Gemfile
6
Gemfile
@ -1,8 +1,8 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'chef', '~> 12.21.1'
|
gem 'chef', '~> 14.9.13'
|
||||||
gem 'berkshelf', '~> 6.3'
|
gem 'berkshelf', '~> 7.0'
|
||||||
gem 'knife-solo', '>= 0.7.0.pre3'
|
gem 'knife-solo', '~> 0.7.0'
|
||||||
gem 'knife-solo_data_bag'
|
gem 'knife-solo_data_bag'
|
||||||
gem 'cookstyle'
|
gem 'cookstyle'
|
||||||
gem 'test-kitchen'
|
gem 'test-kitchen'
|
||||||
|
|||||||
230
Gemfile.lock
230
Gemfile.lock
@ -1,59 +1,43 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
addressable (2.5.1)
|
addressable (2.5.2)
|
||||||
public_suffix (~> 2.0, >= 2.0.2)
|
public_suffix (>= 2.0.2, < 4.0)
|
||||||
artifactory (2.8.1)
|
|
||||||
ast (2.3.0)
|
ast (2.3.0)
|
||||||
berkshelf (6.3.2)
|
berkshelf (7.0.7)
|
||||||
buff-config (~> 2.0)
|
chef (>= 13.6.52)
|
||||||
buff-extensions (~> 2.0)
|
chef-config
|
||||||
chef (>= 12.7.2, < 14.0)
|
|
||||||
cleanroom (~> 1.0)
|
cleanroom (~> 1.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
faraday (~> 0.9)
|
minitar (>= 0.6)
|
||||||
httpclient (~> 2.7)
|
|
||||||
minitar (~> 0.5, >= 0.5.4)
|
|
||||||
mixlib-archive (~> 0.4)
|
mixlib-archive (~> 0.4)
|
||||||
|
mixlib-config (>= 2.2.5)
|
||||||
mixlib-shellout (~> 2.0)
|
mixlib-shellout (~> 2.0)
|
||||||
octokit (~> 4.0)
|
octokit (~> 4.0)
|
||||||
retryable (~> 2.0)
|
retryable (~> 2.0)
|
||||||
ridley (~> 5.0)
|
|
||||||
solve (~> 4.0)
|
solve (~> 4.0)
|
||||||
thor (~> 0.19, < 0.19.2)
|
thor (>= 0.20)
|
||||||
buff-config (2.0.0)
|
|
||||||
buff-extensions (~> 2.0)
|
|
||||||
varia_model (~> 0.6)
|
|
||||||
buff-extensions (2.0.0)
|
|
||||||
buff-ignore (1.2.0)
|
|
||||||
buff-ruby_engine (1.0.0)
|
|
||||||
buff-shell_out (1.1.0)
|
|
||||||
buff-ruby_engine (~> 1.0)
|
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
celluloid (0.16.0)
|
chef (14.9.13)
|
||||||
timers (~> 4.0.0)
|
|
||||||
celluloid-io (0.16.2)
|
|
||||||
celluloid (>= 0.16.0)
|
|
||||||
nio4r (>= 1.1.0)
|
|
||||||
chef (12.21.1)
|
|
||||||
addressable
|
addressable
|
||||||
bundler (>= 1.10)
|
bundler (>= 1.10)
|
||||||
chef-config (= 12.21.1)
|
chef-config (= 14.9.13)
|
||||||
chef-zero (>= 4.8, < 13)
|
chef-zero (>= 13.0)
|
||||||
diff-lcs (~> 1.2, >= 1.2.4)
|
diff-lcs (~> 1.2, >= 1.2.4)
|
||||||
erubis (~> 2.7)
|
erubis (~> 2.7)
|
||||||
|
ffi (~> 1.9, >= 1.9.25)
|
||||||
ffi-yajl (~> 2.2)
|
ffi-yajl (~> 2.2)
|
||||||
highline (~> 1.6, >= 1.6.9)
|
highline (~> 1.6, >= 1.6.9)
|
||||||
iniparse (~> 1.4)
|
iniparse (~> 1.4)
|
||||||
mixlib-archive (~> 0.4)
|
mixlib-archive (>= 0.4, < 2.0)
|
||||||
mixlib-authentication (~> 1.4)
|
mixlib-authentication (~> 2.1)
|
||||||
mixlib-cli (~> 1.7)
|
mixlib-cli (~> 1.7)
|
||||||
mixlib-log (~> 1.3)
|
mixlib-log (~> 2.0, >= 2.0.3)
|
||||||
mixlib-shellout (~> 2.0)
|
mixlib-shellout (~> 2.4)
|
||||||
net-sftp (~> 2.1, >= 2.1.2)
|
net-sftp (~> 2.1, >= 2.1.2)
|
||||||
net-ssh (>= 2.9, < 5.0)
|
net-ssh (~> 4.2)
|
||||||
net-ssh-multi (~> 1.2, >= 1.2.1)
|
net-ssh-multi (~> 1.2, >= 1.2.1)
|
||||||
ohai (>= 8.6.0.alpha.1, < 13)
|
ohai (~> 14.0)
|
||||||
plist (~> 3.2)
|
plist (~> 3.2)
|
||||||
proxifier (~> 1.0)
|
proxifier (~> 1.0)
|
||||||
rspec-core (~> 3.5)
|
rspec-core (~> 3.5)
|
||||||
@ -64,59 +48,65 @@ GEM
|
|||||||
specinfra (~> 2.10)
|
specinfra (~> 2.10)
|
||||||
syslog-logger (~> 1.6)
|
syslog-logger (~> 1.6)
|
||||||
uuidtools (~> 2.1.5)
|
uuidtools (~> 2.1.5)
|
||||||
chef-config (12.21.1)
|
chef-config (14.9.13)
|
||||||
addressable
|
addressable
|
||||||
fuzzyurl
|
fuzzyurl
|
||||||
mixlib-config (~> 2.0)
|
mixlib-config (>= 2.2.12, < 3.0)
|
||||||
mixlib-shellout (~> 2.0)
|
mixlib-shellout (~> 2.0)
|
||||||
chef-zero (5.3.2)
|
tomlrb (~> 1.2)
|
||||||
|
chef-zero (14.0.11)
|
||||||
ffi-yajl (~> 2.2)
|
ffi-yajl (~> 2.2)
|
||||||
hashie (>= 2.0, < 4.0)
|
hashie (>= 2.0, < 4.0)
|
||||||
mixlib-log (~> 1.3)
|
mixlib-log (~> 2.0)
|
||||||
rack (~> 2.0)
|
rack (~> 2.0, >= 2.0.6)
|
||||||
uuidtools (~> 2.1)
|
uuidtools (~> 2.1)
|
||||||
cleanroom (1.0.0)
|
cleanroom (1.0.0)
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.1.4)
|
||||||
cookstyle (1.3.1)
|
cookstyle (1.3.1)
|
||||||
rubocop (= 0.47.1)
|
rubocop (= 0.47.1)
|
||||||
diff-lcs (1.3)
|
diff-lcs (1.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
faraday (0.14.0)
|
faraday (0.15.4)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
ffi (1.9.18)
|
ffi (1.10.0)
|
||||||
ffi-yajl (2.3.1)
|
ffi-yajl (2.3.1)
|
||||||
libyajl2 (~> 1.2)
|
libyajl2 (~> 1.2)
|
||||||
fuzzyurl (0.9.0)
|
fuzzyurl (0.9.0)
|
||||||
hashie (3.5.5)
|
gssapi (1.2.0)
|
||||||
highline (1.7.8)
|
ffi (>= 1.0.1)
|
||||||
hitimes (1.2.6)
|
gyoku (1.3.1)
|
||||||
|
builder (>= 2.1.2)
|
||||||
|
hashie (3.6.0)
|
||||||
|
highline (1.7.10)
|
||||||
httpclient (2.8.3)
|
httpclient (2.8.3)
|
||||||
iniparse (1.4.4)
|
iniparse (1.4.4)
|
||||||
ipaddress (0.8.3)
|
ipaddress (0.8.3)
|
||||||
json (2.1.0)
|
knife-solo (0.7.0)
|
||||||
knife-solo (0.7.0.pre3)
|
|
||||||
chef (>= 10.20)
|
chef (>= 10.20)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
net-ssh (>= 2.7)
|
net-ssh (>= 2.7)
|
||||||
knife-solo_data_bag (2.1.0)
|
knife-solo_data_bag (2.1.0)
|
||||||
libyajl2 (1.2.0)
|
libyajl2 (1.2.0)
|
||||||
minitar (0.6.1)
|
little-plugger (1.1.4)
|
||||||
mixlib-archive (0.4.1)
|
logging (2.2.2)
|
||||||
mixlib-log
|
little-plugger (~> 1.1)
|
||||||
mixlib-authentication (1.4.1)
|
multi_json (~> 1.10)
|
||||||
|
minitar (0.8)
|
||||||
|
mixlib-archive (0.4.19)
|
||||||
mixlib-log
|
mixlib-log
|
||||||
|
mixlib-authentication (2.1.1)
|
||||||
mixlib-cli (1.7.0)
|
mixlib-cli (1.7.0)
|
||||||
mixlib-config (2.2.4)
|
mixlib-config (2.2.18)
|
||||||
mixlib-install (2.1.12)
|
tomlrb
|
||||||
artifactory
|
mixlib-install (3.11.5)
|
||||||
mixlib-shellout
|
mixlib-shellout
|
||||||
mixlib-versioning
|
mixlib-versioning
|
||||||
thor
|
thor
|
||||||
mixlib-log (1.7.1)
|
mixlib-log (2.0.9)
|
||||||
mixlib-shellout (2.2.7)
|
mixlib-shellout (2.4.4)
|
||||||
mixlib-versioning (1.1.0)
|
mixlib-versioning (1.2.7)
|
||||||
molinillo (0.6.5)
|
molinillo (0.6.6)
|
||||||
multi_json (1.12.1)
|
multi_json (1.13.1)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
@ -129,66 +119,48 @@ GEM
|
|||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh-gateway (>= 1.2.0)
|
net-ssh-gateway (>= 1.2.0)
|
||||||
net-telnet (0.1.1)
|
net-telnet (0.1.1)
|
||||||
nio4r (2.3.0)
|
nori (2.6.0)
|
||||||
octokit (4.8.0)
|
octokit (4.13.0)
|
||||||
sawyer (~> 0.8.0, >= 0.5.3)
|
sawyer (~> 0.8.0, >= 0.5.3)
|
||||||
ohai (8.24.1)
|
ohai (14.8.10)
|
||||||
chef-config (>= 12.5.0.alpha.1, < 14)
|
chef-config (>= 12.8, < 15)
|
||||||
ffi (~> 1.9)
|
ffi (~> 1.9)
|
||||||
ffi-yajl (~> 2.2)
|
ffi-yajl (~> 2.2)
|
||||||
ipaddress
|
ipaddress
|
||||||
mixlib-cli
|
mixlib-cli (>= 1.7.0)
|
||||||
mixlib-config (~> 2.0)
|
mixlib-config (~> 2.0)
|
||||||
mixlib-log (>= 1.7.1, < 2.0)
|
mixlib-log (~> 2.0, >= 2.0.1)
|
||||||
mixlib-shellout (~> 2.0)
|
mixlib-shellout (~> 2.0)
|
||||||
plist (~> 3.1)
|
plist (~> 3.1)
|
||||||
systemu (~> 2.6.4)
|
systemu (~> 2.6.4)
|
||||||
wmi-lite (~> 1.0)
|
wmi-lite (~> 1.0)
|
||||||
parser (2.4.0.0)
|
parser (2.4.0.0)
|
||||||
ast (~> 2.2)
|
ast (~> 2.2)
|
||||||
plist (3.3.0)
|
plist (3.5.0)
|
||||||
powerpack (0.1.1)
|
powerpack (0.1.1)
|
||||||
proxifier (1.0.3)
|
proxifier (1.0.3)
|
||||||
public_suffix (2.0.5)
|
public_suffix (3.0.3)
|
||||||
rack (2.0.3)
|
rack (2.0.6)
|
||||||
rainbow (2.2.2)
|
rainbow (2.2.2)
|
||||||
rake
|
rake
|
||||||
rake (12.0.0)
|
rake (12.0.0)
|
||||||
retryable (2.0.4)
|
retryable (2.0.4)
|
||||||
ridley (5.1.1)
|
rspec (3.8.0)
|
||||||
addressable
|
rspec-core (~> 3.8.0)
|
||||||
buff-config (~> 2.0)
|
rspec-expectations (~> 3.8.0)
|
||||||
buff-extensions (~> 2.0)
|
rspec-mocks (~> 3.8.0)
|
||||||
buff-ignore (~> 1.2)
|
rspec-core (3.8.0)
|
||||||
buff-shell_out (~> 1.0)
|
rspec-support (~> 3.8.0)
|
||||||
celluloid (~> 0.16.0)
|
rspec-expectations (3.8.2)
|
||||||
celluloid-io (~> 0.16.1)
|
|
||||||
chef-config (>= 12.5.0)
|
|
||||||
erubis
|
|
||||||
faraday (~> 0.9)
|
|
||||||
hashie (>= 2.0.2, < 4.0.0)
|
|
||||||
httpclient (~> 2.7)
|
|
||||||
json (>= 1.7.7)
|
|
||||||
mixlib-authentication (>= 1.3.0)
|
|
||||||
retryable (~> 2.0)
|
|
||||||
semverse (~> 2.0)
|
|
||||||
varia_model (~> 0.6)
|
|
||||||
rspec (3.6.0)
|
|
||||||
rspec-core (~> 3.6.0)
|
|
||||||
rspec-expectations (~> 3.6.0)
|
|
||||||
rspec-mocks (~> 3.6.0)
|
|
||||||
rspec-core (3.6.0)
|
|
||||||
rspec-support (~> 3.6.0)
|
|
||||||
rspec-expectations (3.6.0)
|
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.6.0)
|
rspec-support (~> 3.8.0)
|
||||||
rspec-its (1.2.0)
|
rspec-its (1.2.0)
|
||||||
rspec-core (>= 3.0.0)
|
rspec-core (>= 3.0.0)
|
||||||
rspec-expectations (>= 3.0.0)
|
rspec-expectations (>= 3.0.0)
|
||||||
rspec-mocks (3.6.0)
|
rspec-mocks (3.8.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.6.0)
|
rspec-support (~> 3.8.0)
|
||||||
rspec-support (3.6.0)
|
rspec-support (3.8.0)
|
||||||
rspec_junit_formatter (0.2.3)
|
rspec_junit_formatter (0.2.3)
|
||||||
builder (< 4)
|
builder (< 4)
|
||||||
rspec-core (>= 2, < 4, != 2.12.0)
|
rspec-core (>= 2, < 4, != 2.12.0)
|
||||||
@ -199,55 +171,71 @@ GEM
|
|||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||||
ruby-progressbar (1.8.1)
|
ruby-progressbar (1.8.1)
|
||||||
safe_yaml (1.0.4)
|
rubyntlm (0.6.2)
|
||||||
|
rubyzip (1.2.2)
|
||||||
sawyer (0.8.1)
|
sawyer (0.8.1)
|
||||||
addressable (>= 2.3.5, < 2.6)
|
addressable (>= 2.3.5, < 2.6)
|
||||||
faraday (~> 0.8, < 1.0)
|
faraday (~> 0.8, < 1.0)
|
||||||
semverse (2.0.0)
|
semverse (3.0.0)
|
||||||
serverspec (2.39.1)
|
serverspec (2.41.3)
|
||||||
multi_json
|
multi_json
|
||||||
rspec (~> 3.0)
|
rspec (~> 3.0)
|
||||||
rspec-its
|
rspec-its
|
||||||
specinfra (~> 2.68)
|
specinfra (~> 2.72)
|
||||||
sfl (2.3)
|
sfl (2.3)
|
||||||
solve (4.0.0)
|
solve (4.0.2)
|
||||||
molinillo (~> 0.6)
|
molinillo (~> 0.6)
|
||||||
semverse (>= 1.1, < 3.0)
|
semverse (>= 1.1, < 4.0)
|
||||||
specinfra (2.68.1)
|
specinfra (2.76.9)
|
||||||
net-scp
|
net-scp
|
||||||
net-ssh (>= 2.7, < 5.0)
|
net-ssh (>= 2.7)
|
||||||
net-telnet
|
net-telnet (= 0.1.1)
|
||||||
sfl
|
sfl
|
||||||
syslog-logger (1.6.8)
|
syslog-logger (1.6.8)
|
||||||
systemu (2.6.5)
|
systemu (2.6.5)
|
||||||
test-kitchen (1.16.0)
|
test-kitchen (1.24.0)
|
||||||
mixlib-install (>= 1.2, < 3.0)
|
mixlib-install (~> 3.6)
|
||||||
mixlib-shellout (>= 1.2, < 3.0)
|
mixlib-shellout (>= 1.2, < 3.0)
|
||||||
net-scp (~> 1.1)
|
net-scp (~> 1.1)
|
||||||
net-ssh (>= 2.9, < 5.0)
|
net-ssh (>= 2.9, < 5.0)
|
||||||
net-ssh-gateway (~> 1.2)
|
net-ssh-gateway (~> 1.2)
|
||||||
safe_yaml (~> 1.0)
|
thor (~> 0.19)
|
||||||
thor (~> 0.19, < 0.19.2)
|
winrm (~> 2.0)
|
||||||
thor (0.19.1)
|
winrm-elevated (~> 1.0)
|
||||||
timers (4.0.4)
|
winrm-fs (~> 1.1)
|
||||||
hitimes
|
thor (0.20.3)
|
||||||
|
tomlrb (1.2.8)
|
||||||
unicode-display_width (1.2.1)
|
unicode-display_width (1.2.1)
|
||||||
uuidtools (2.1.5)
|
uuidtools (2.1.5)
|
||||||
varia_model (0.6.0)
|
winrm (2.3.1)
|
||||||
buff-extensions (~> 2.0)
|
builder (>= 2.1.2)
|
||||||
hashie (>= 2.0.2, < 4.0.0)
|
erubis (~> 2.7)
|
||||||
wmi-lite (1.0.0)
|
gssapi (~> 1.2)
|
||||||
|
gyoku (~> 1.0)
|
||||||
|
httpclient (~> 2.2, >= 2.2.0.2)
|
||||||
|
logging (>= 1.6.1, < 3.0)
|
||||||
|
nori (~> 2.0)
|
||||||
|
rubyntlm (~> 0.6.0, >= 0.6.1)
|
||||||
|
winrm-elevated (1.1.1)
|
||||||
|
winrm (~> 2.0)
|
||||||
|
winrm-fs (~> 1.0)
|
||||||
|
winrm-fs (1.3.2)
|
||||||
|
erubis (~> 2.7)
|
||||||
|
logging (>= 1.6.1, < 3.0)
|
||||||
|
rubyzip (~> 1.1)
|
||||||
|
winrm (~> 2.0)
|
||||||
|
wmi-lite (1.0.2)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
berkshelf (~> 6.3)
|
berkshelf (~> 7.0)
|
||||||
chef (~> 12.21.1)
|
chef (~> 14.9.13)
|
||||||
cookstyle
|
cookstyle
|
||||||
knife-solo (>= 0.7.0.pre3)
|
knife-solo (~> 0.7.0)
|
||||||
knife-solo_data_bag
|
knife-solo_data_bag
|
||||||
test-kitchen
|
test-kitchen
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.17.1
|
1.17.3
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
build_essential 'backup gem'
|
build_essential 'backup gem'
|
||||||
|
|
||||||
package ["ruby", "ruby-dev"]
|
package ["ruby"]
|
||||||
|
|
||||||
gem_package 'backup' do
|
gem_package 'backup' do
|
||||||
version '5.0.0.beta.2'
|
version '5.0.0.beta.2'
|
||||||
|
|||||||
@ -72,7 +72,8 @@ application botka_freenode_path do
|
|||||||
"GCM_API_KEY" => botka_freenode_data_bag_item['gcm_api_key'],
|
"GCM_API_KEY" => botka_freenode_data_bag_item['gcm_api_key'],
|
||||||
"VAPID_SUBJECT" => "https://kosmos.org",
|
"VAPID_SUBJECT" => "https://kosmos.org",
|
||||||
"VAPID_PUBLIC_KEY" => botka_freenode_data_bag_item['vapid_public_key'],
|
"VAPID_PUBLIC_KEY" => botka_freenode_data_bag_item['vapid_public_key'],
|
||||||
"VAPID_PRIVATE_KEY" => botka_freenode_data_bag_item['vapid_private_key']
|
"VAPID_PRIVATE_KEY" => botka_freenode_data_bag_item['vapid_private_key'],
|
||||||
|
"REDIS_URL" => "redis://localhost:6379/botka"
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
notifies :run, "execute[systemctl daemon-reload]", :delayed
|
notifies :run, "execute[systemctl daemon-reload]", :delayed
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user