From 3fbea864c1a0f7a1096f08ddd475a2d5aea67951 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 10 May 2019 07:08:29 +0200 Subject: [PATCH] Remove hubot-kredits from IRC hal8000 --- .../kosmos-hubot/recipes/hal8000.rb | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb index 26d3199..87e92c6 100644 --- a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb +++ b/site-cookbooks/kosmos-hubot/recipes/hal8000.rb @@ -31,9 +31,6 @@ include_recipe "kosmos-nodejs" include_recipe "kosmos-redis" include_recipe "kosmos-hubot::_user" -# Needed for hubot-kredits -include_recipe "kosmos-ipfs" - unless node.chef_environment == "development" include_recipe 'firewall' firewall_rule 'hubot_express_hal8000_freenode' do @@ -41,11 +38,6 @@ unless node.chef_environment == "development" protocol :tcp command :allow end - firewall_rule 'ipfs_swarm_p2p' do - port 4001 - protocol :tcp - command :allow - end end hal8000_freenode_data_bag_item = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode') @@ -78,7 +70,6 @@ application hal8000_path do "hubot-rss-reader", "hubot-incoming-webhook", "hubot-auth", - "hubot-kredits", "hubot-schedule" ].to_json end @@ -114,33 +105,17 @@ application hal8000_path do "HUBOT_RSS_PRINTERROR" => "false", "HUBOT_RSS_IRCCOLORS" => "true", "HUBOT_PLUSPLUS_POINTS_TERM" => "karma,karma", - "EXPRESS_PORT" => node['hal8000']['http_port'], "HUBOT_RSS_HEADER" => "Update:", "HUBOT_AUTH_ADMIN" => "bkero,derbumi,galfert,gregkare,slvrbckt,raucao", "HUBOT_HELP_REPLY_IN_PRIVATE" => "true", "WEBHOOK_TOKEN" => hal8000_freenode_data_bag_item['webhook_token'], - "IPFS_API_HOST" => node['hal8000']['kredits']['ipfs_host'], - "IPFS_API_PORT" => node['hal8000']['kredits']['ipfs_port'], - "IPFS_API_PROTOCOL" => node['hal8000']['kredits']['ipfs_protocol'], - "KREDITS_ROOM" => node['hal8000']['kredits']['room'], - "KREDITS_WEBHOOK_TOKEN" => hal8000_freenode_data_bag_item['kredits_webhook_token'], - "KREDITS_PROVIDER_URL" => node['hal8000']['kredits']['provider_url'], - "KREDITS_NETWORK_ID" => node['hal8000']['kredits']['network_id'], - "KREDITS_WALLET_PATH" => node['hal8000']['kredits']['wallet_path'], - "KREDITS_WALLET_PASSWORD" => hal8000_freenode_data_bag_item['kredits_wallet_password'], - "KREDITS_MEDIAWIKI_URL" => node['hal8000']['kredits']['mediawiki_url'], - "KREDITS_GITHUB_REPO_BLACKLIST" => node['hal8000']['kredits']['github_repo_blacklist'], - "KREDITS_GITEA_REPO_BLACKLIST" => node['hal8000']['kredits']['gitea_repo_blacklist'] + "EXPRESS_PORT" => node['hal8000']['http_port'] } ) notifies :run, "execute[systemctl daemon-reload]", :delayed notifies :restart, "service[hal8000_nodejs]", :delayed end - cookbook_file "#{name}/wallet.json" do - source "wallet.json" - end - service "hal8000_nodejs" do action [:enable, :start] end