Merge pull request 'Deploy hubot with new hubot-kredits' (#316) from feature/315-kredits_for_reviews into master

Reviewed-on: #316

data_bags/credentials/hal8000_xmpp.json

@@ -1,58 +1,72 @@
 {
   "id": "hal8000_xmpp",
   "xmpp_password": {
-    "encrypted_data": "QDnK0ZMzbCcM8CwsIcgZJx3KExErTB4ojP9Hu1oyHD8=\n",
-    "iv": "ZnP+4pnjWRdr2a84\n",
-    "auth_tag": "Xp8rPcRPA4LAYOEY59emdg==\n",
+    "encrypted_data": "fFHM54i7mlfD9dpZWJWIsjSXGzekctbsNZc0DOSOijg=\n",
+    "iv": "kKkZ9dbk3l9Gygkz\n",
+    "auth_tag": "Sx2oYaWlrrjn27x/7+Hciw==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "webhook_token": {
-    "encrypted_data": "jRwY92Us504vKwU11qs869mUklDpDCBJ80D/ssLzMHSrq4/e\n",
-    "iv": "I4khnoXYyZaPDLn+\n",
-    "auth_tag": "gGIHP5E0aqfdSMsXTw4MNQ==\n",
+    "encrypted_data": "I1b52yjcijL8G/5rQOaK+Us4mqj3zfrS14C1FNX/QGYfk5qo\n",
+    "iv": "JKhm4WyvV09cW5WY\n",
+    "auth_tag": "EdbJQ+robm4Ekibbid8WQg==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kredits_webhook_token": {
-    "encrypted_data": "JpBDovG888hVeM0ZOyVzXfJrFJ2G3Vsk2YdFxmIlv+itjUk=\n",
-    "iv": "14b4Igw2oPApOQJH\n",
-    "auth_tag": "vNLbNV4E6x4vWNHxNfbMlA==\n",
+    "encrypted_data": "xybuwYnGSyOZd+C89mkXYQNp3QOdGCNby7T26VHQw9cJ9BI=\n",
+    "iv": "p4JRoucq6402kJTA\n",
+    "auth_tag": "Q9tRvbk9Yeii7BAqB153PA==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kredits_wallet_password": {
-    "encrypted_data": "A9fGuzvhpNQiVJWGzDzXRZdHNZFmYmLQY7QVuiTRRCQUoA==\n",
-    "iv": "gNaM0ccaUWjPSXY2\n",
-    "auth_tag": "qOzVDyRsLQrEK5UOiiw/AQ==\n",
+    "encrypted_data": "GiWqyYSRipI7+HTV2mlaWZBchPkDSAqf0c0GwmcGXzuc6g==\n",
+    "iv": "txQNno2CBfscTEZ9\n",
+    "auth_tag": "NUEYUOOYIczFW11T8RPApg==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kredits_session_secret": {
-    "encrypted_data": "Kfc3RI8z+wRTKZe8mKmXBLOercqAGikF5nVzCrMjSpQtPGi2yq7glq9ZZWeo\nJOsichMMyZAw\n",
-    "iv": "9XZbR0EC8QdOVAF+\n",
-    "auth_tag": "pupr2kFS4kQ+umiKC1PDpw==\n",
+    "encrypted_data": "BZoUrStW49IHALMNBMZFQwu40VeuUF++JRI7MqggXhSCWu9l5MIuBjwiOd9O\nUXaAfY3NgrYC\n",
+    "iv": "yGLVq+owGBs7UHle\n",
+    "auth_tag": "ar81Cg0/ae83pNqkTos+Zg==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "gitea_token": {
+    "encrypted_data": "8cN3+ptBOv4Ha0VBrq94fXnuLSYUWU3WaRXcblt4KSak3GMziYCTVw2mYxbE\nsfrYH7Ukypht/mEu+kY=\n",
+    "iv": "Vz7f+khl5VNdbtaG\n",
+    "auth_tag": "OXWUsIUcazdSfQIlevpKPg==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "github_token": {
+    "encrypted_data": "13MyNGNRKiKIrfwauhV/XS7rIzaflHL+BARDO/JMMUxoG8vsNvci5gHBHr95\nr9hqRu218czoZFl/O/Q=\n",
+    "iv": "QuC8lFzZwH73J4Dy\n",
+    "auth_tag": "ZZdBCh/K3l8i1QKpT8aR1A==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kredits_github_key": {
-    "encrypted_data": "IdqQQTXOAisa3sVzQamEd34EbAeYjO0atjBbqapF/XfXkLVMUhSO\n",
-    "iv": "PbaqtSGt12vnoZjk\n",
-    "auth_tag": "xpqsDOKjbTYDagFuGSlvxw==\n",
+    "encrypted_data": "5iAJpKHyGIpNnB7xo03p150Gs4chTlx5cWBXXeo8QVzho5aBOhjc\n",
+    "iv": "6X1u9Y0SPPZrS26f\n",
+    "auth_tag": "KMB9VG/M3emW6Cd9kX23Zg==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kredits_github_secret": {
-    "encrypted_data": "JK586fy5K2dAjX+wiJmWK+1giBlQu/9tm9/UAzsOyAS6hmGNOsdlFLGrVsjI\nHbOkIn1vS57EHmqZiGo=\n",
-    "iv": "bTBX91vQgJtdM4MY\n",
-    "auth_tag": "pcENZKhtxsuOmMIPlhm2tw==\n",
+    "encrypted_data": "bY2Aa7h3gJ8owtK9HZ0Fnvi35HtvAKX25R1WF1Lgmqj8tKIASnDjTHTh38b2\nfa8NFt4OAwrOkIDK6sM=\n",
+    "iv": "quCBdq6e5Hs3O5Yr\n",
+    "auth_tag": "jOAcMTyqSJ04H8ZPVZz6Zw==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "kredits_zoom_jwt": {
-    "encrypted_data": "R/I10igSfB1eIrIbOhtGwYY+6XFFH1enizyJ7N7855m99NXm2660QT4m67N4\nppFihQFedrVV2jZv8Dj7ukG4eqW2bkN5stCaBr/TjBx+yLKc9kwVEOnLcIO+\n4Ai+9RyfVki5kojr8RmeQ1hRpCdYKYlmOLnBL/3O37P47kTucvsfLDL1cYDW\ncfilEvPJ7TKht4n1Wge1rnzjRtjZINMSRhA8Q6+VILnQUx8BGTQf8sLgrddc\nLVqrufffD+Xe0UYHAZZSskNVc9mZsGc=\n",
-    "iv": "+8jH30NqjhDcQh7T\n",
-    "auth_tag": "drSgM9mWt49A1pGnVEhwkA==\n",
+    "encrypted_data": "d/UWwRN99Tel0oHBwrXptDzQ8k2GpWers8+aD4bfVqM4aoHex7+4/IQE529i\n2wm//3yxzPfVicqnYvToWDorKvL7buZdQmTJNRdN7gxjt+NLNtB4FYWImNnI\ntfyufpx3bYsA1ULLfoO14QDm/nfvf8jsftArwXZZMLEbCHrS7E4LYS9+UVQM\nRytRTgQhCtB9hPSUwykZ3OgYrJnm5HCPss+IHaTDmPG5jY8xZs4xvUdeFa6T\nkzsfpXf5aIzxei5UEl75mTm3XXAARvc=\n",
+    "iv": "6WaZCHRuUp46xTAG\n",
+    "auth_tag": "ZA2gb03AO/GGq8Kl+You5Q==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   }

nodes/barnard.kosmos.org.json

@@ -15,8 +15,7 @@
     "hostname": "barnard",
     "ipaddress": "104.248.95.16",
     "roles": [
-      "base",
-      "kredits_github"
+      "base"
     ],
     "recipes": [
       "kosmos-base",
@@ -29,8 +28,6 @@
       "sockethub",
       "sockethub::default",
       "sockethub::proxy",
-      "kosmos-akkounts",
-      "kosmos-akkounts::default",
       "kosmos-dirsrv",
       "kosmos-dirsrv::default",
       "apt::default",
@@ -47,9 +44,21 @@
       "postfix::_attributes",
       "postfix::sasl_auth",
       "hostname::default",
+      "ipfs::default",
+      "ipfs::_user",
+      "kosmos-ipfs::kredits_pinner",
       "kosmos-nodejs::default",
       "nodejs::nodejs_from_package",
       "nodejs::repo",
+      "kosmos-ipfs::firewall_swarm",
+      "firewall::default",
+      "chef-sugar::default",
+      "kosmos-redis::default",
+      "redis::server",
+      "redis::default",
+      "backup::default",
+      "logrotate::default",
+      "kosmos-base::letsencrypt",
       "kosmos-nginx::default",
       "nginx::default",
       "nginx::package",
@@ -59,22 +68,10 @@
       "nginx::commons_dir",
       "nginx::commons_script",
       "nginx::commons_conf",
-      "ipfs::default",
-      "ipfs::_user",
-      "kosmos-ipfs::kredits_pinner",
-      "firewall::default",
-      "chef-sugar::default",
-      "kosmos-redis::default",
-      "redis::server",
-      "redis::default",
-      "backup::default",
-      "logrotate::default",
-      "kosmos-base::letsencrypt",
+      "kosmos-nginx::firewall",
       "kosmos-hubot::_user",
       "sockethub::_firewall",
-      "kosmos-akkounts::nginx",
-      "git::default",
-      "git::package",
+      "kosmos-dirsrv::firewall",
       "ulimit::default"
     ],
     "platform": "ubuntu",
@@ -107,4 +104,4 @@
     "recipe[sockethub::proxy]",
     "recipe[kosmos-dirsrv]"
   ]
-}
+}

site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb

@@ -87,39 +87,41 @@ application app_path do
       app_dir: app_path,
       entry: "#{app_path}/bin/hubot -a xmpp --name hal8000",
       environment: {
-        "HUBOT_LOG_LEVEL"               => node.chef_environment == "development" ? "debug" : "info",
-        "HUBOT_XMPP_USERNAME"           => "hal8000@kosmos.org/hubot",
-        "HUBOT_XMPP_PASSWORD"           => data_bag['xmpp_password'],
-        "HUBOT_XMPP_HOST"               => "xmpp.kosmos.org",
-        "HUBOT_XMPP_ROOMS"              => node[app_name]['rooms'].join(','),
-        "HUBOT_AUTH_ADMIN"              => node[app_name]['auth_admins'].join(','),
-        "HUBOT_RSS_PRINTSUMMARY"        => "false",
-        "HUBOT_RSS_PRINTERROR"          => "false",
-        "HUBOT_RSS_IRCCOLORS"           => "true",
-        "HUBOT_PLUSPLUS_POINTS_TERM"    => "karma,karma",
-        "HUBOT_RSS_HEADER"              => "Update:",
-        "HUBOT_HELP_REPLY_IN_PRIVATE"   => "true",
-        "REDIS_URL"                     => "redis://localhost:6379/#{app_name}",
-        "EXPRESS_PORT"                  => node[app_name]['http_port'],
-        "WEBHOOK_TOKEN"                 => data_bag['webhook_token'],
-        "IPFS_API_HOST"                 => node[app_name]['kredits']['ipfs_host'],
-        "IPFS_API_PORT"                 => node[app_name]['kredits']['ipfs_port'],
-        "IPFS_API_PROTOCOL"             => node[app_name]['kredits']['ipfs_protocol'],
-        "KREDITS_WEB_URL"               => node[app_name]['kredits']['web_url'],
-        "KREDITS_ROOM"                  => node[app_name]['kredits']['room'],
-        "KREDITS_WEBHOOK_TOKEN"         => data_bag['kredits_webhook_token'],
-        "KREDITS_PROVIDER_URL"          => node[app_name]['kredits']['provider_url'],
-        "KREDITS_NETWORK_ID"            => node[app_name]['kredits']['network_id'],
-        "KREDITS_WALLET_PATH"           => node[app_name]['kredits']['wallet_path'],
-        "KREDITS_WALLET_PASSWORD"       => data_bag['kredits_wallet_password'],
-        "KREDITS_MEDIAWIKI_URL"         => node[app_name]['kredits']['mediawiki_url'],
-        "KREDITS_GITHUB_REPO_BLACKLIST" => node[app_name]['kredits']['github_repo_blacklist'],
-        "KREDITS_GITEA_REPO_BLACKLIST"  => node[app_name]['kredits']['gitea_repo_blacklist'],
-        "KREDITS_GRANT_HOST"            => node[app_name]['domain'],
-        "KREDITS_GRANT_PROTOCOL"        => "https",
-        "KREDITS_SESSION_SECRET"        => data_bag['kredits_session_secret'],
-        "KREDITS_GITHUB_KEY"            => data_bag['kredits_github_key'],
-        "KREDITS_GITHUB_SECRET"         => data_bag['kredits_github_secret'],
+        "HUBOT_LOG_LEVEL"                => node.chef_environment == "development" ? "debug" : "info",
+        "HUBOT_XMPP_USERNAME"            => "hal8000@kosmos.org/hubot",
+        "HUBOT_XMPP_PASSWORD"            => data_bag['xmpp_password'],
+        "HUBOT_XMPP_HOST"                => "xmpp.kosmos.org",
+        "HUBOT_XMPP_ROOMS"               => node[app_name]['rooms'].join(','),
+        "HUBOT_AUTH_ADMIN"               => node[app_name]['auth_admins'].join(','),
+        "HUBOT_RSS_PRINTSUMMARY"         => "false",
+        "HUBOT_RSS_PRINTERROR"           => "false",
+        "HUBOT_RSS_IRCCOLORS"            => "true",
+        "HUBOT_PLUSPLUS_POINTS_TERM"     => "karma,karma",
+        "HUBOT_RSS_HEADER"               => "Update:",
+        "HUBOT_HELP_REPLY_IN_PRIVATE"    => "true",
+        "REDIS_URL"                      => "redis://localhost:6379/#{app_name}",
+        "EXPRESS_PORT"                   => node[app_name]['http_port'],
+        "WEBHOOK_TOKEN"                  => data_bag['webhook_token'],
+        "GITEA_TOKEN"                    => data_bag['gitea_token'],
+        "GITHUB_TOKEN"                   => data_bag['github_token'],
+        "IPFS_API_HOST"                  => node[app_name]['kredits']['ipfs_host'],
+        "IPFS_API_PORT"                  => node[app_name]['kredits']['ipfs_port'],
+        "IPFS_API_PROTOCOL"              => node[app_name]['kredits']['ipfs_protocol'],
+        "KREDITS_WEB_URL"                => node[app_name]['kredits']['web_url'],
+        "KREDITS_ROOM"                   => node[app_name]['kredits']['room'],
+        "KREDITS_WEBHOOK_TOKEN"          => data_bag['kredits_webhook_token'],
+        "KREDITS_PROVIDER_URL"           => node[app_name]['kredits']['provider_url'],
+        "KREDITS_NETWORK_ID"             => node[app_name]['kredits']['network_id'],
+        "KREDITS_WALLET_PATH"            => node[app_name]['kredits']['wallet_path'],
+        "KREDITS_WALLET_PASSWORD"        => data_bag['kredits_wallet_password'],
+        "KREDITS_MEDIAWIKI_URL"          => node[app_name]['kredits']['mediawiki_url'],
+        "KREDITS_GITHUB_REPO_BLACKLIST"  => node[app_name]['kredits']['github_repo_blacklist'],
+        "KREDITS_GITEA_REPO_BLACKLIST"   => node[app_name]['kredits']['gitea_repo_blacklist'],
+        "KREDITS_GRANT_HOST"             => node[app_name]['domain'],
+        "KREDITS_GRANT_PROTOCOL"         => "https",
+        "KREDITS_SESSION_SECRET"         => data_bag['kredits_session_secret'],
+        "KREDITS_GITHUB_KEY"             => data_bag['kredits_github_key'],
+        "KREDITS_GITHUB_SECRET"          => data_bag['kredits_github_secret'],
         "KREDITS_ZOOM_JWT"               => data_bag['kredits_zoom_jwt'],
         "KREDITS_ZOOM_MEETING_WHITELIST" => "414901303,82557072771"
       }