Merge branch 'lnd_tor_changes' into feature/qemu_snapshots

This commit is contained in:
Râu Cao 2022-10-19 15:23:39 +02:00
commit 34a57fa298
Signed by: raucao
GPG Key ID: 15E65F399D084BA9
10 changed files with 32 additions and 10 deletions

View File

@ -12,12 +12,14 @@
"hostname": "akkounts-1",
"ipaddress": "192.168.122.160",
"roles": [
"kvm_guest",
"akkounts",
"postgresql_client"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_kvm::guest",
"kosmos_postgresql::hostsfile",
"kosmos-akkounts",
"kosmos-akkounts::default",
@ -77,6 +79,7 @@
},
"run_list": [
"recipe[kosmos-base]",
"role[kvm_guest]",
"role[akkounts]"
]
}

View File

@ -20,6 +20,7 @@
"kosmos_encfs",
"kosmos_encfs::default",
"kosmos_kvm::host",
"kosmos_kvm::backup",
"kosmos-ejabberd::firewall",
"kosmos-ipfs::firewall_swarm",
"kosmos-ipfs::firewall_public_gateway",
@ -62,6 +63,7 @@
"recipe[kosmos-base]",
"recipe[kosmos_encfs]",
"recipe[kosmos_kvm::host]",
"recipe[kosmos_kvm::backup]",
"recipe[kosmos-ejabberd::firewall]",
"recipe[kosmos-ipfs::firewall_swarm]",
"recipe[kosmos-ipfs::firewall_public_gateway]",

View File

@ -8,15 +8,16 @@
"automatic": {
"fqdn": "ipfs-1",
"os": "linux",
"os_version": "5.4.0-54-generic",
"os_version": "5.4.0-110-generic",
"hostname": "ipfs-1",
"ipaddress": "192.168.122.195",
"roles": [
"kvm_guest"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_kvm::guest",
"kosmos-ipfs",
"kosmos-ipfs::default",
"kosmos-ipfs::public_gateway",
@ -72,6 +73,7 @@
},
"run_list": [
"recipe[kosmos-base]",
"role[kvm_guest]",
"recipe[kosmos-ipfs]",
"recipe[kosmos-ipfs::public_gateway]"
]

View File

@ -12,11 +12,13 @@
"hostname": "postgres-2",
"ipaddress": "192.168.122.244",
"roles": [
"kvm_guest",
"postgresql_primary"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_kvm::guest",
"kosmos_postgresql::primary",
"kosmos_postgresql::firewall",
"kosmos_gitea::pg_db",
@ -52,6 +54,7 @@
},
"run_list": [
"recipe[kosmos-base]",
"role[kvm_guest]",
"role[postgresql_primary]"
]
}

View File

@ -8,15 +8,16 @@
"automatic": {
"fqdn": "uploads-1",
"os": "linux",
"os_version": "5.4.0-54-generic",
"os_version": "5.4.0-128-generic",
"hostname": "uploads-1",
"ipaddress": "192.168.122.230",
"roles": [
"kvm_guest"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_kvm::guest",
"kosmos-ejabberd::upload_service",
"apt::default",
"timezone_iii::default",
@ -60,6 +61,7 @@
},
"run_list": [
"recipe[kosmos-base]",
"role[kvm_guest]",
"recipe[kosmos-ejabberd::upload_service]"
]
}

View File

@ -12,11 +12,12 @@
"hostname": "wiki-1",
"ipaddress": "192.168.122.26",
"roles": [
"kvm_guest"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_kvm::guest",
"kosmos-mediawiki",
"kosmos-mediawiki::default",
"apt::default",
@ -74,6 +75,7 @@
},
"run_list": [
"recipe[kosmos-base]",
"role[kvm_guest]",
"recipe[kosmos-mediawiki]"
]
}

View File

@ -48,9 +48,13 @@ node.default['lnd']['public_ip'] = '148.251.237.111'
node.default['lnd']['public_port'] = '9735'
node.default['lnd']['port'] = '9736'
node.default['lnd']['minchansize'] = '1000000'
node.default['lnd']['basefee'] = '1000'
node.default['lnd']['feerate'] = '50'
node.default['lnd']['basefee'] = '100'
node.default['lnd']['feerate'] = '10'
node.default['lnd']['auto_unlock'] = true # requires credentials/lnd data bag item
node.default['lnd']['tor'] = {
'streamisolation' => 'false',
'skip-proxy-for-clearnet-targets' => 'true'
}
node.default['boltz']['repo'] = 'https://github.com/BoltzExchange/boltz-lnd.git'
node.default['boltz']['revision'] = 'v1.2.6'

View File

@ -61,6 +61,7 @@ template "#{lnd_dir}/lnd.conf" do
lnd_basefee: node['lnd']['basefee'],
lnd_feerate: node['lnd']['feerate'],
lnd_dir: lnd_dir,
lnd_tor: node['lnd']['tor'],
auto_unlock: node['lnd']['auto_unlock'],
tor_enabled: node['bitcoin']['tor_enabled'],
bitcoin_datadir: node['bitcoin']['datadir'],

View File

@ -30,6 +30,6 @@ bitcoind.zmqpubrawtx=<%= @bitcoin_zmqpubrawtx %>
[tor]
tor.active=true
tor.v3=true
tor.streamisolation=false
tor.skip-proxy-for-clearnet-targets=true
tor.streamisolation=<%= @lnd_tor['streamisolation'] %>
tor.skip-proxy-for-clearnet-targets=<%= @lnd_tor['skip-proxy-for-clearnet-targets'] %>
<% end %>

View File

@ -1,3 +1,6 @@
node.normal['ipfs']['version'] = "0.16.0"
node.normal['ipfs']['checksum'] = "40f7fc4f987fb548ccac0f27cdb2b8a9beacd67dfff9367e315dc0a7ced7115c"
node.default['kosmos-ipfs']['ipfs']['config'] = {
# The default gateway is already used by kosmos' hubot (8080)
"Addresses.Gateway" => "/ip4/127.0.0.1/tcp/9090",
@ -6,7 +9,7 @@ node.default['kosmos-ipfs']['ipfs']['config'] = {
# usage.
'Swarm.DisableBandwidthMetrics' => true,
# Disable the p2p-circuit relay transport
'Swarm.DisableRelay' => true,
'Swarm.Transports.Network.Relay' => false,
# Number of connections that, when exceeded, will trigger a connection GC
# operation
'Swarm.ConnMgr.HighWater' => 40,