diff --git a/site-cookbooks/kosmos-hubot/metadata.rb b/site-cookbooks/kosmos-hubot/metadata.rb index a325be4..b2094c9 100644 --- a/site-cookbooks/kosmos-hubot/metadata.rb +++ b/site-cookbooks/kosmos-hubot/metadata.rb @@ -7,8 +7,8 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '0.2.0' depends 'kosmos-nodejs' -depends 'kosmos-redis' depends 'firewall' depends 'application_javascript' depends 'kosmos-ipfs' depends 'git' +depends 'redisio' diff --git a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb index bb00c33..16cd272 100644 --- a/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb +++ b/site-cookbooks/kosmos-hubot/recipes/botka_freenode.rb @@ -12,8 +12,9 @@ build_essential app_name do compile_time true end +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe "kosmos-nodejs" -include_recipe "kosmos-redis" application app_path do data_bag = Chef::EncryptedDataBagItem.load('credentials', app_name) diff --git a/site-cookbooks/kosmos-hubot/recipes/botka_irc-libera-chat.rb b/site-cookbooks/kosmos-hubot/recipes/botka_irc-libera-chat.rb index 144e7f5..d30ad9d 100644 --- a/site-cookbooks/kosmos-hubot/recipes/botka_irc-libera-chat.rb +++ b/site-cookbooks/kosmos-hubot/recipes/botka_irc-libera-chat.rb @@ -13,8 +13,9 @@ build_essential app_name do compile_time true end +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe "kosmos-nodejs" -include_recipe "kosmos-redis" include_recipe "kosmos-hubot::_user" application app_path do diff --git a/site-cookbooks/kosmos-hubot/recipes/default.rb b/site-cookbooks/kosmos-hubot/recipes/default.rb index 3a787b3..bd18edc 100644 --- a/site-cookbooks/kosmos-hubot/recipes/default.rb +++ b/site-cookbooks/kosmos-hubot/recipes/default.rb @@ -3,8 +3,9 @@ # Recipe:: default # +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe "kosmos-nodejs" -include_recipe "kosmos-redis" include_recipe "kosmos-hubot::_user" include_recipe "kosmos-hubot::hal8000" diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb index b8d461d..20a5983 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb @@ -7,8 +7,9 @@ build_essential 'hal8000' do compile_time true end +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe "kosmos-nodejs" -include_recipe "kosmos-redis" include_recipe "kosmos-hubot::_user" unless node.chef_environment == "development" diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb index 15fbb3f..818ff6e 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb @@ -12,8 +12,9 @@ build_essential app_name do compile_time true end +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe "kosmos-nodejs" -include_recipe "kosmos-redis" include_recipe "kosmos-hubot::_user" # Needed for hubot-kredits diff --git a/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb b/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb index 8e27347..b254622 100644 --- a/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb +++ b/site-cookbooks/kosmos-hubot/templates/default/nodejs.systemd.service.erb @@ -1,8 +1,8 @@ [Unit] Description=Start nodejs app <% unless @without_redis %> -Requires=redis-server.service -After=redis-server.service +Requires=redis@6379.service +After=redis@6379.service <% end %> [Service] diff --git a/site-cookbooks/sockethub/metadata.rb b/site-cookbooks/sockethub/metadata.rb index db2d286..def42c4 100644 --- a/site-cookbooks/sockethub/metadata.rb +++ b/site-cookbooks/sockethub/metadata.rb @@ -6,7 +6,7 @@ description 'Installs/Configures sockethub' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '0.2.0' -depends 'kosmos-redis' +depends 'firewall' +depends 'redisio' depends 'kosmos-nodejs' depends 'kosmos-nginx' -depends 'firewall' diff --git a/site-cookbooks/sockethub/recipes/default.rb b/site-cookbooks/sockethub/recipes/default.rb index eaf9568..e258718 100644 --- a/site-cookbooks/sockethub/recipes/default.rb +++ b/site-cookbooks/sockethub/recipes/default.rb @@ -3,8 +3,9 @@ # Recipe:: default # +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe 'kosmos-nodejs' -include_recipe 'kosmos-redis' user = "sockethub" group = "sockethub" @@ -46,8 +47,8 @@ systemd_unit "sockethub_nodejs.service" do content <<-EOF [Unit] Description=Start sockethub -Requires=redis-server.service -After=redis-server.service +Requires=redis@6379.service +After=redis@6379.service [Service] ExecStart=#{entry}