Merge branch 'feature/kredits_github_signup' of kosmos/chef into master
This commit is contained in:
		
						commit
						23df44bb61
					
				@ -1,30 +1,51 @@
 | 
			
		||||
{
 | 
			
		||||
  "id": "hal8000_xmpp",
 | 
			
		||||
  "xmpp_password": {
 | 
			
		||||
    "encrypted_data": "7pE9C6Tdjeg7ZFjtwzgPzC4ekSgPzN18A5ia5awJnKA=\n",
 | 
			
		||||
    "iv": "p3RqfadD1sPKEof3\n",
 | 
			
		||||
    "auth_tag": "4zYf0anagoLn5bF3Rt95BQ==\n",
 | 
			
		||||
    "encrypted_data": "A1veV6RnPqIqy+DidWeJ7ACwBRmt94AoS2m81iBHtJk=\n",
 | 
			
		||||
    "iv": "JWHnQjv0br6fOb0u\n",
 | 
			
		||||
    "auth_tag": "TcFfG8HX+QkwPIQ0lHzswg==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  },
 | 
			
		||||
  "webhook_token": {
 | 
			
		||||
    "encrypted_data": "T6zu7cd5/PXZP56PwjIo5XIjUOJQQSvobvgIekCIB3SgyWQr\n",
 | 
			
		||||
    "iv": "LwCkuGJP2eZC8S4Y\n",
 | 
			
		||||
    "auth_tag": "qH5ckddELQR32z3oYxELMg==\n",
 | 
			
		||||
    "encrypted_data": "GVnCrv7Dgg3YGwJO7unDv2aHkHBpbfoAs+7lljTBx5HdOqKX\n",
 | 
			
		||||
    "iv": "/PzTocEqCTwq8lBD\n",
 | 
			
		||||
    "auth_tag": "HLqh9CPZYVaJxI0jWbtLpg==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  },
 | 
			
		||||
  "kredits_webhook_token": {
 | 
			
		||||
    "encrypted_data": "W6xJKRCsoX6qY3QJW/kR5I7Y9LNS1L5zB6X1oLzE71soQ/Y=\n",
 | 
			
		||||
    "iv": "Piw00LKQysN3AVJN\n",
 | 
			
		||||
    "auth_tag": "BwH/mJoBtqhA5wNXwFUM6w==\n",
 | 
			
		||||
    "encrypted_data": "xxEyjeTa8AOZnqr2LUZtogbEPnN3ycviJpjlqruK+pPPlJs=\n",
 | 
			
		||||
    "iv": "yeqxtkW8P7o4qI7T\n",
 | 
			
		||||
    "auth_tag": "Ok0P86MLLw11c9slr43mvA==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  },
 | 
			
		||||
  "kredits_wallet_password": {
 | 
			
		||||
    "encrypted_data": "dFKch6Gjt9oN21w15EeHvho1/f7+mZlKe/aOtoHJtmCgbw==\n",
 | 
			
		||||
    "iv": "GCueL9BRmLFqlmDw\n",
 | 
			
		||||
    "auth_tag": "Yq3nOeQenXz+c6VoLhZbQw==\n",
 | 
			
		||||
    "encrypted_data": "dgU5YpNgP0FcceWOnFm9NC5DU+3XZuP9Tq3LeKZwBMulfA==\n",
 | 
			
		||||
    "iv": "428A3tDCpZrX6tE7\n",
 | 
			
		||||
    "auth_tag": "ler/y0GNHXHpox4xRMdDmg==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  },
 | 
			
		||||
  "kredits_session_secret": {
 | 
			
		||||
    "encrypted_data": "D7nhOxG0mBQBdiLCAjEiVJgGphjow3NnOe3IBD7BZWky8rj8d/sEUzz1a322\nrLJEwCOeHdtf\n",
 | 
			
		||||
    "iv": "ObIHcJ6nylGkvtuU\n",
 | 
			
		||||
    "auth_tag": "+RMiUPzvg7Didu2gRtJxhA==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  },
 | 
			
		||||
  "kredits_github_key": {
 | 
			
		||||
    "encrypted_data": "UF3FUnMMGXXMWWJQ7mrywFWKzJL7VP6iWBkZ8K5Z6VN2bpjxaZrQ\n",
 | 
			
		||||
    "iv": "heAtzJMhnssXKoXo\n",
 | 
			
		||||
    "auth_tag": "88k/WwYKqq8ii29MmMq0hA==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  },
 | 
			
		||||
  "kredits_github_secret": {
 | 
			
		||||
    "encrypted_data": "QSyFIBpRP2+98Bfvr0uDdWsmuOun3Kqqbq6M0a4ZSm3pbfowiDnIOFc/4Yvn\nxmRh089MwaGjW02QgOU=\n",
 | 
			
		||||
    "iv": "3eyJzACgqtLCilKq\n",
 | 
			
		||||
    "auth_tag": "HsD08zQpCtTRwR2IhkSWIw==\n",
 | 
			
		||||
    "version": 3,
 | 
			
		||||
    "cipher": "aes-256-gcm"
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@ -22,13 +22,14 @@ node.default['hal8000_xmpp']['rooms'] = [
 | 
			
		||||
 | 
			
		||||
node.default['hal8000_xmpp']['auth_admins'] = []
 | 
			
		||||
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['ipfs_host']     = 'localhost'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['ipfs_port']     = '5001'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['ipfs_protocol'] = 'http'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['room']          = 'kredits@chat.kosmos.org'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['provider_url']  = 'https://rinkeby.infura.io/v3/c5e74367261d475ab935e2f0e726482f'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['network_id']    = '4'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['wallet_path']   = 'wallet.json'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['mediawiki_url'] = 'https://wiki.kosmos.org/'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['ipfs_host']             = 'localhost'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['ipfs_port']             = '5001'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['ipfs_protocol']         = 'http'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['room']                  = 'kredits@chat.kosmos.org'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['provider_url']          = 'https://rinkeby.infura.io/v3/c5e74367261d475ab935e2f0e726482f'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['network_id']            = '4'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['wallet_path']           = 'wallet.json'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['mediawiki_url']         = 'https://wiki.kosmos.org/'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['github_repo_blacklist'] = '67P/test-one-two'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['gitea_repo_blacklist']  = 'kosmos/test-one-two'
 | 
			
		||||
node.default['hal8000_xmpp']['kredits']['web_url']               = 'https://kredits.kosmos.org'
 | 
			
		||||
 | 
			
		||||
@ -105,6 +105,7 @@ application app_path do
 | 
			
		||||
        "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'],
 | 
			
		||||
@ -113,7 +114,12 @@ application app_path do
 | 
			
		||||
        "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_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']
 | 
			
		||||
      }
 | 
			
		||||
    )
 | 
			
		||||
    notifies :run, "execute[systemctl daemon-reload]", :delayed
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user