From 0a8b8cc75aaad732837fe68bc02013883e9a6894 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Tue, 23 Aug 2022 16:36:41 +0200 Subject: [PATCH 1/6] Hide subtitle if not widget --- .../nodes-networks-chart/nodes-networks-chart.component.ts | 2 +- .../statistics-chart/lightning-statistics-chart.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts b/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts index ecbf92f39..22f46e8e7 100644 --- a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts +++ b/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -121,7 +121,7 @@ export class NodesNetworksChartComponent implements OnInit { left: 'center', top: 'center', }; - } else if (data.tor_nodes.length > 0) { + } else if (this.widget && data.tor_nodes.length > 0) { title = { textStyle: { color: 'grey', diff --git a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts index bd210b09a..6fb8fd1e2 100644 --- a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts +++ b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts @@ -113,7 +113,7 @@ export class LightningStatisticsChartComponent implements OnInit { left: 'center', top: 'center' }; - } else if (data.channel_count.length > 0) { + } else if (this.widget && data.channel_count.length > 0) { title = { textStyle: { color: 'grey', From 4cceb008ea3d88fdc5b5572d7746d2ff3c7953d5 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Tue, 23 Aug 2022 17:03:04 +0200 Subject: [PATCH 2/6] Open/closed channel title updating based on selected mode --- frontend/src/app/lightning/node/node.component.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/lightning/node/node.component.html b/frontend/src/app/lightning/node/node.component.html index a97707930..61c8b3e10 100644 --- a/frontend/src/app/lightning/node/node.component.html +++ b/frontend/src/app/lightning/node/node.component.html @@ -128,7 +128,14 @@
-

Channels ({{ channelsListStatus === 'open' ? node.opened_channel_count : node.closed_channel_count }})

+

+ Open channels + ({{ node.opened_channel_count }}) +

+

+ Closed channels + ({{ node.closed_channel_count }}) +

Date: Tue, 23 Aug 2022 17:31:44 +0200 Subject: [PATCH 3/6] Add missing closing div --- .../nodes-channels-map.component.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html index 0b3e4198b..8053589d7 100644 --- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html +++ b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -8,14 +8,15 @@ (Tor nodes excluded) -
+
+
+ +
-
+ - - - + \ No newline at end of file From 71002ee11972d98f09ce2a432da07072dc987e75 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 24 Aug 2022 21:59:05 +0900 Subject: [PATCH 4/6] [ops] Change keybase notifications to ERR or higher priority --- production/syslog.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/syslog.conf b/production/syslog.conf index 1a36100dd..7a55c57c7 100644 --- a/production/syslog.conf +++ b/production/syslog.conf @@ -1,4 +1,4 @@ -local7.>=notice |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops alerts +local7.>=err |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops alerts local7.>=info |/usr/local/bin/sudo -u mempool /usr/local/bin/mempool-logger mempool.ops node100 local7.>=info /var/log/mempool local7.* /var/log/mempool.debug From 8dd8c01aabf97ae0b0e89b036bf0ddebc17f2ff0 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 23 Aug 2022 15:50:52 +0000 Subject: [PATCH 5/6] Fix lightning graph heights on preview pages --- .../nodes-channels-map.component.html | 6 +++--- .../nodes-channels-map.component.scss | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html index 8053589d7..1da3a4baf 100644 --- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html +++ b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -1,5 +1,5 @@ -
-
+
+
@@ -18,5 +18,5 @@ -
+
\ No newline at end of file diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss index 254bf4d64..d8838a093 100644 --- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss +++ b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss @@ -1,3 +1,15 @@ +.map-wrapper { + height: 100%; + + &.widget { + height: 250px; + } + + &.graph { + height: auto; + } +} + .card-header { border-bottom: 0; font-size: 18px; From fd8ed4bbdf71d581a2c75901e0c5a017a8283c82 Mon Sep 17 00:00:00 2001 From: Stephan Oeste Date: Wed, 24 Aug 2022 16:21:36 +0200 Subject: [PATCH 6/6] Add .local/bin to cln's path and install git-lfs in prod install --- production/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/install b/production/install index 1187ee813..0302f0c60 100755 --- a/production/install +++ b/production/install @@ -385,7 +385,7 @@ DEBIAN_UNFURL_PKG+=(libxdamage-dev libxrandr-dev libgbm-dev libpango1.0-dev liba # packages needed for mempool ecosystem FREEBSD_PKG=() -FREEBSD_PKG+=(zsh sudo git screen curl wget calc neovim) +FREEBSD_PKG+=(zsh sudo git git-lfs screen curl wget calc neovim) FREEBSD_PKG+=(openssh-portable py39-pip rust llvm90 jq base64 libzmq4) FREEBSD_PKG+=(boost-libs autoconf automake gmake gcc libevent libtool pkgconf) FREEBSD_PKG+=(nginx rsync py39-certbot-nginx mariadb105-server keybase) @@ -1267,7 +1267,7 @@ case $OS in osGroupCreate "${CLN_GROUP}" osUserCreate "${CLN_USER}" "${CLN_HOME}" "${CLN_GROUP}" osSudo "${ROOT_USER}" chsh -s `which zsh` "${CLN_USER}" - osSudo "${CLN_USER}" touch "${CLN_HOME}/.zshrc" + echo "export PATH=$PATH:$HOME/.local/bin" >> "${CLN_HOME}/.zshrc" osSudo "${ROOT_USER}" chown -R "${CLN_USER}:${CLN_GROUP}" "${CLN_HOME}" echo "[*] Installing Core Lightning package"