From 45da3eeee0f3db4933aef36799bad1ac0f05b16c Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Thu, 21 Dec 2023 17:22:39 -0600 Subject: [PATCH 01/14] new post: salt-state-netdata-tailscale --- .../salt-state-netdata-tailscale/index.md | 259 ++++++++++++++++++ 1 file changed, 259 insertions(+) create mode 100644 content/posts/salt-state-netdata-tailscale/index.md diff --git a/content/posts/salt-state-netdata-tailscale/index.md b/content/posts/salt-state-netdata-tailscale/index.md new file mode 100644 index 0000000..b2f7806 --- /dev/null +++ b/content/posts/salt-state-netdata-tailscale/index.md @@ -0,0 +1,259 @@ +--- +title: "Quick Salt State to Deploy Netdata" +date: 2023-12-21 +# lastmod: 2023-12-21 +description: "A hasty Salt state to deploy netdata monitoring and publish it internally on my tailnet with Tailscale Serve" +featured: false +toc: true +comment: true +series: Scripts +tags: + - homelab + - iac + - linux + - salt + - tailscale +--- +As a follow-up to my [recent explorations](/tailscale-ssh-serve-funnel) with using Tailscale Serve to make [netdata](https://github.com/netdata/netdata) monitoring readily available on my [tailnet](https://tailscale.com/kb/1136/tailnet), I wanted a quick way to reproduce that configuration across my handful of systems. These systems already have [Tailscale installed](https://tailscale.com/download/linux) and configured, and they're all [managed with Salt](https://docs.saltproject.io/en/getstarted/). + +So here's a hasty Salt state that I used to make it happen. + +It simply installs netdata using the [handy-dandy kickstart script](https://learn.netdata.cloud/docs/installing/one-line-installer-for-all-linux-systems), and then configures Tailscale to Serve the netdata instance (with a trusted cert!) inside my tailnet over `https://[hostname].[tailnet-name].ts.net:8443/netdata`. + + +```yaml +# torchlight! {"lineNumbers": true} +# -*- coding: utf-8 -*- +# vim: ft=sls +# Hasty Salt config to install Netdata and make it available within a Tailscale tailnet +# at https://[hostname].[tailnet-name].ts.net:8443/netdata + +curl: + pkg.installed + +tailscale: + pkg.installed: + - version: latest + +netdata-kickstart: + cmd.run: + - name: curl -Ss https://my-netdata.io/kickstart.sh | sh -s -- --dont-wait + - require: + - pkg: curl + # don't run this block if netdata is already running + - unless: pgrep netdata + +tailscale-serve: + cmd.run: + - name: tailscale serve --bg --https 8443 --set-path /netdata 19999 + - require: + - pkg: tailscale + - cmd: netdata-kickstart + # don't run this if netdata is already tailscale-served + - unless: tailscale serve status | grep -q '/netdata proxy http://127.0.0.1:19999' +``` + +It's not super elegant... but it got the job done, and that's all I needed it to do. + +```shell +sudo salt 'minion-name' state.apply netdata # [tl! .cmd focus] +minion-name: # [tl! .nocopy:start collapse:start] +---------- + ID: curl + Function: pkg.installed + Result: True + Comment: All specified packages are already installed + Started: 22:59:00.821329 + Duration: 28.639 ms + Changes: +---------- + ID: tailscale + Function: pkg.installed + Result: True + Comment: All specified packages are already installed and are at the desired version + Started: 22:59:00.850083 + Duration: 4589.765 ms + Changes: +---------- + ID: netdata-kickstart + Function: cmd.run + Name: curl -Ss https://my-netdata.io/kickstart.sh | sh -s -- --dont-wait + Result: True + Comment: Command "curl -Ss https://my-netdata.io/kickstart.sh | sh -s -- --dont-wait" run + Started: 22:59:05.441217 + Duration: 10617.082 ms + Changes: + ---------- + pid: + 169287 + retcode: + 0 + stderr: + sh: 19: cd: can't cd to sh + --- Using /tmp/netdata-kickstart-ZtqZcfWuqk as a temporary directory. --- + --- Checking for existing installations of Netdata... --- + --- No existing installations of netdata found, assuming this is a fresh install. --- + --- Attempting to install using native packages... --- + --- Repository configuration is already present, attempting to install netdata. --- + [/tmp/netdata-kickstart-ZtqZcfWuqk]# env DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold install -y netdata + OK + + [/tmp/netdata-kickstart-ZtqZcfWuqk]# test -x //usr/libexec/netdata/netdata-updater.sh + OK + + [/tmp/netdata-kickstart-ZtqZcfWuqk]# grep -q \-\-enable-auto-updates //usr/libexec/netdata/netdata-updater.sh + OK + + [/tmp/netdata-kickstart-ZtqZcfWuqk]# //usr/libexec/netdata/netdata-updater.sh --enable-auto-updates + Thu Dec 21 22:59:15 UTC 2023 : INFO: netdata-updater.sh: Auto-updating has been ENABLED through cron, updater script linked to /etc/cron.daily/netdata-updater + + Thu Dec 21 22:59:15 UTC 2023 : INFO: netdata-updater.sh: If the update process fails and you have email notifications set up correctly for cron on this system, you should receive an email notification of the failure. + Thu Dec 21 22:59:15 UTC 2023 : INFO: netdata-updater.sh: Successful updates will not send an email. + OK + + Successfully installed the Netdata Agent. + + Official documentation can be found online at https://learn.netdata.cloud/docs/. + + Looking to monitor all of your infrastructure with Netdata? Check out Netdata Cloud at https://app.netdata.cloud. + + Join our community and connect with us on: + - GitHub: https://github.com/netdata/netdata/discussions + - Discord: https://discord.gg/5ygS846fR6 + - Our community forums: https://community.netdata.cloud/ + [/tmp/netdata-kickstart-ZtqZcfWuqk]# rm -rf /tmp/netdata-kickstart-ZtqZcfWuqk + OK + stdout: + Reading package lists... + Building dependency tree... + Reading state information... + The following packages were automatically installed and are no longer required: + libnorm1 libpgm-5.2-0 libxmlb1 libzmq5 python3-contextvars python3-croniter + python3-dateutil python3-gnupg python3-immutables python3-jmespath + python3-msgpack python3-psutil python3-pycryptodome python3-tz python3-zmq + Use 'apt autoremove' to remove them. + The following additional packages will be installed: + netdata-ebpf-code-legacy netdata-plugin-apps netdata-plugin-chartsd + netdata-plugin-debugfs netdata-plugin-ebpf netdata-plugin-go + netdata-plugin-logs-management netdata-plugin-nfacct netdata-plugin-perf + netdata-plugin-pythond netdata-plugin-slabinfo + netdata-plugin-systemd-journal + Suggested packages: + netdata-plugin-cups netdata-plugin-freeipmi apcupsd nut nvme-cli + The following NEW packages will be installed: + netdata netdata-ebpf-code-legacy netdata-plugin-apps netdata-plugin-chartsd + netdata-plugin-debugfs netdata-plugin-ebpf netdata-plugin-go + netdata-plugin-logs-management netdata-plugin-nfacct netdata-plugin-perf + netdata-plugin-pythond netdata-plugin-slabinfo + netdata-plugin-systemd-journal + 0 upgraded, 13 newly installed, 0 to remove and 11 not upgraded. + Need to get 0 B/30.7 MB of archives. + After this operation, 154 MB of additional disk space will be used. + Selecting previously unselected package netdata-ebpf-code-legacy. + (Reading database ... + (Reading database ... 5% + (Reading database ... 10% + (Reading database ... 15% + (Reading database ... 20% + (Reading database ... 25% + (Reading database ... 30% + (Reading database ... 35% + (Reading database ... 40% + (Reading database ... 45% + (Reading database ... 50% + (Reading database ... 55% + (Reading database ... 60% + (Reading database ... 65% + (Reading database ... 70% + (Reading database ... 75% + (Reading database ... 80% + (Reading database ... 85% + (Reading database ... 90% + (Reading database ... 95% + (Reading database ... 100% + (Reading database ... 118906 files and directories currently installed.) + Preparing to unpack .../00-netdata-ebpf-code-legacy_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-ebpf-code-legacy (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-ebpf. + Preparing to unpack .../01-netdata-plugin-ebpf_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-ebpf (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-apps. + Preparing to unpack .../02-netdata-plugin-apps_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-apps (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-pythond. + Preparing to unpack .../03-netdata-plugin-pythond_1.44.0-77-nightly_all.deb ... + Unpacking netdata-plugin-pythond (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-go. + Preparing to unpack .../04-netdata-plugin-go_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-go (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-debugfs. + Preparing to unpack .../05-netdata-plugin-debugfs_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-debugfs (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-nfacct. + Preparing to unpack .../06-netdata-plugin-nfacct_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-nfacct (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-chartsd. + Preparing to unpack .../07-netdata-plugin-chartsd_1.44.0-77-nightly_all.deb ... + Unpacking netdata-plugin-chartsd (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-slabinfo. + Preparing to unpack .../08-netdata-plugin-slabinfo_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-slabinfo (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-perf. + Preparing to unpack .../09-netdata-plugin-perf_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-perf (1.44.0-77-nightly) ... + Selecting previously unselected package netdata. + Preparing to unpack .../10-netdata_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-logs-management. + Preparing to unpack .../11-netdata-plugin-logs-management_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-logs-management (1.44.0-77-nightly) ... + Selecting previously unselected package netdata-plugin-systemd-journal. + Preparing to unpack .../12-netdata-plugin-systemd-journal_1.44.0-77-nightly_amd64.deb ... + Unpacking netdata-plugin-systemd-journal (1.44.0-77-nightly) ... + Setting up netdata-plugin-nfacct (1.44.0-77-nightly) ... + Setting up netdata (1.44.0-77-nightly) ... + Setting up netdata-plugin-pythond (1.44.0-77-nightly) ... + Setting up netdata-plugin-systemd-journal (1.44.0-77-nightly) ... + Setting up netdata-plugin-debugfs (1.44.0-77-nightly) ... + Setting up netdata-ebpf-code-legacy (1.44.0-77-nightly) ... + Setting up netdata-plugin-perf (1.44.0-77-nightly) ... + Setting up netdata-plugin-chartsd (1.44.0-77-nightly) ... + Setting up netdata-plugin-ebpf (1.44.0-77-nightly) ... + Setting up netdata-plugin-apps (1.44.0-77-nightly) ... + Setting up netdata-plugin-logs-management (1.44.0-77-nightly) ... + Setting up netdata-plugin-go (1.44.0-77-nightly) ... + Setting up netdata-plugin-slabinfo (1.44.0-77-nightly) ... + Processing triggers for systemd (245.4-4ubuntu3.22) ... +---------- + ID: tailscale-serve + Function: cmd.run + Name: tailscale serve --bg --https 8443 --set-path /netdata 19999 + Result: True + Comment: Command "tailscale serve --bg --https 8443 --set-path /netdata 19999" run + Started: 22:59:16.060397 + Duration: 62.624 ms + Changes: ' # [tl! collapse:end] + ---------- + pid: + 170328 + retcode: + 0 + stderr: + stdout: + Available within your tailnet: # [tl! focus:start] + + https://minion-name.tailnet-name.ts.net:8443/netdata + |-- proxy http://127.0.0.1:19999 + + Serve started and running in the background. + To disable the proxy, run: tailscale serve --https=8443 off + +Summary for minion-name +------------ +Succeeded: 4 (changed=2) # [tl! highlight] +Failed: 0 +------------ +Total states run: 4 +Total run time: 15.298 s +# [tl! .nocopy:end focus:end] +``` From 9703b65ac60593cd5186ffbde4e73cea3ca57419 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 08:02:29 -0600 Subject: [PATCH 02/14] rename category: scripts -> code --- archetypes/default.md | 2 +- config/_default/menu.toml | 6 +++--- .../index.md | 2 +- .../index.md | 2 +- content/posts/cat-file-without-comments/index.md | 2 +- content/posts/ditching-vsphere-for-proxmox/index.md | 2 +- content/posts/getting-started-vra-rest-api/index.md | 2 +- .../index.md | 2 +- .../index.md | 2 +- .../index.md | 2 +- .../powershell-download-web-folder-contents/index.md | 2 +- .../index.md | 2 +- .../index.md | 4 ++-- content/posts/removing-recreating-vcls-vms/index.md | 10 +++++----- content/posts/salt-state-netdata-tailscale/index.md | 2 +- .../index.md | 2 +- .../index.md | 2 +- content/posts/spotlight-on-torchlight/index.md | 2 +- .../systemctl-edit-delay-service-startup/index.md | 2 +- .../index.md | 2 +- content/posts/tailscale-on-vmware-photon/index.md | 2 +- content/posts/tailscale-ssh-serve-funnel/index.md | 2 +- .../index.md | 2 +- .../index.md | 2 +- .../posts/using-vsphere-diagnostic-tool-fling/index.md | 2 +- 25 files changed, 32 insertions(+), 32 deletions(-) diff --git a/archetypes/default.md b/archetypes/default.md index 810f43b..6d2cec7 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -7,7 +7,7 @@ description: "This is a new post about..." featured: false toc: true comment: true -series: Tips # Projects, Scripts +series: Tips # Projects, Code tags: - 3dprinting - activedirectory diff --git a/config/_default/menu.toml b/config/_default/menu.toml index 2ae1a5a..a4b6fee 100644 --- a/config/_default/menu.toml +++ b/config/_default/menu.toml @@ -17,9 +17,9 @@ weight = 1 [[main]] - identifier = "scripts" - name = "scripts" - url = "/series/scripts/" + identifier = "code" + name = "code" + url = "/series/code/" weight = 1 [[main]] diff --git a/content/posts/automatic-unattended-expansion-of-linux-root-lvm-volume-to-fill-disk/index.md b/content/posts/automatic-unattended-expansion-of-linux-root-lvm-volume-to-fill-disk/index.md index 389657f..6e5a1bf 100644 --- a/content/posts/automatic-unattended-expansion-of-linux-root-lvm-volume-to-fill-disk/index.md +++ b/content/posts/automatic-unattended-expansion-of-linux-root-lvm-volume-to-fill-disk/index.md @@ -1,5 +1,5 @@ --- -series: Scripts +series: Code date: "2021-04-29T08:34:30Z" usePageBundles: true thumbnail: 20210723-script.png diff --git a/content/posts/bulk-import-vsphere-dvportgroups-to-phpipam/index.md b/content/posts/bulk-import-vsphere-dvportgroups-to-phpipam/index.md index 5144565..2bffb0f 100644 --- a/content/posts/bulk-import-vsphere-dvportgroups-to-phpipam/index.md +++ b/content/posts/bulk-import-vsphere-dvportgroups-to-phpipam/index.md @@ -14,7 +14,7 @@ usePageBundles: true thumbnail: "code.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Scripts +series: Code tags: - vmware - powercli diff --git a/content/posts/cat-file-without-comments/index.md b/content/posts/cat-file-without-comments/index.md index 9acc018..d52ff77 100644 --- a/content/posts/cat-file-without-comments/index.md +++ b/content/posts/cat-file-without-comments/index.md @@ -14,7 +14,7 @@ usePageBundles: true # thumbnail: "thumbnail.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8, K8s on vSphere +series: Tips # Projects, Code, vRA8, K8s on vSphere tags: - linux - shell diff --git a/content/posts/ditching-vsphere-for-proxmox/index.md b/content/posts/ditching-vsphere-for-proxmox/index.md index 6dd1319..0ba9c91 100644 --- a/content/posts/ditching-vsphere-for-proxmox/index.md +++ b/content/posts/ditching-vsphere-for-proxmox/index.md @@ -5,7 +5,7 @@ description: "I moved my homelab from VMware vSphere to Proxmox VE, and my only featured: false toc: true comment: true -series: Tips # Projects, Scripts +series: Tips # Projects, Code tags: - homelab - linux diff --git a/content/posts/getting-started-vra-rest-api/index.md b/content/posts/getting-started-vra-rest-api/index.md index 4250d77..a988983 100644 --- a/content/posts/getting-started-vra-rest-api/index.md +++ b/content/posts/getting-started-vra-rest-api/index.md @@ -14,7 +14,7 @@ usePageBundles: true thumbnail: "thumbnail.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: vRA8 # Projects, Scripts, vRA8 +series: vRA8 # Projects, Code, vRA8 tags: - vmware - vra diff --git a/content/posts/logging-in-to-multiple-vcenter-servers-at-once-with-powercli/index.md b/content/posts/logging-in-to-multiple-vcenter-servers-at-once-with-powercli/index.md index d0d9aba..c6a246f 100644 --- a/content/posts/logging-in-to-multiple-vcenter-servers-at-once-with-powercli/index.md +++ b/content/posts/logging-in-to-multiple-vcenter-servers-at-once-with-powercli/index.md @@ -1,5 +1,5 @@ --- -series: Scripts +series: Code date: "2020-09-16T08:34:30Z" thumbnail: LJOcy2oqc.png usePageBundles: true diff --git a/content/posts/nessus-essentials-on-tanzu-community-edition/index.md b/content/posts/nessus-essentials-on-tanzu-community-edition/index.md index 7d3a837..ac59199 100644 --- a/content/posts/nessus-essentials-on-tanzu-community-edition/index.md +++ b/content/posts/nessus-essentials-on-tanzu-community-edition/index.md @@ -14,7 +14,7 @@ usePageBundles: true thumbnail: "nessus_login.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8 +series: Tips # Projects, Code, vRA8 tags: - vmware - kubernetes diff --git a/content/posts/powercli-list-linux-vms-and-datacenter-locations/index.md b/content/posts/powercli-list-linux-vms-and-datacenter-locations/index.md index 5abfa3a..70efbcc 100644 --- a/content/posts/powercli-list-linux-vms-and-datacenter-locations/index.md +++ b/content/posts/powercli-list-linux-vms-and-datacenter-locations/index.md @@ -14,7 +14,7 @@ usePageBundles: true thumbnail: "PowerCLI.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Scripts +series: Code tags: - vmware - powercli diff --git a/content/posts/powershell-download-web-folder-contents/index.md b/content/posts/powershell-download-web-folder-contents/index.md index 93b4848..a972b26 100644 --- a/content/posts/powershell-download-web-folder-contents/index.md +++ b/content/posts/powershell-download-web-folder-contents/index.md @@ -14,7 +14,7 @@ usePageBundles: true # thumbnail: "thumbnail.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Scripts +series: Code tags: - powershell - windows diff --git a/content/posts/psa-microsoft-kb5022842-breaks-ws2022-secure-boot/index.md b/content/posts/psa-microsoft-kb5022842-breaks-ws2022-secure-boot/index.md index 5397059..1c5b6cf 100644 --- a/content/posts/psa-microsoft-kb5022842-breaks-ws2022-secure-boot/index.md +++ b/content/posts/psa-microsoft-kb5022842-breaks-ws2022-secure-boot/index.md @@ -14,7 +14,7 @@ usePageBundles: true # thumbnail: "thumbnail.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8, K8s on vSphere +series: Tips # Projects, Code, vRA8, K8s on vSphere tags: - vmware - powershell diff --git a/content/posts/recreating-hashnode-series-categories-in-jekyll-on-github-pages/index.md b/content/posts/recreating-hashnode-series-categories-in-jekyll-on-github-pages/index.md index 9efc07a..7c9b792 100644 --- a/content/posts/recreating-hashnode-series-categories-in-jekyll-on-github-pages/index.md +++ b/content/posts/recreating-hashnode-series-categories-in-jekyll-on-github-pages/index.md @@ -286,8 +286,8 @@ main: url: /series/vra8 - title: "Projects" url: /series/projects - - title: "Scripts" - url: /series/scripts + - title: "Code" + url: /series/code - title: "Tips & Tricks" url: /series/tips - title: "Tags" diff --git a/content/posts/removing-recreating-vcls-vms/index.md b/content/posts/removing-recreating-vcls-vms/index.md index 856689a..948fdd8 100644 --- a/content/posts/removing-recreating-vcls-vms/index.md +++ b/content/posts/removing-recreating-vcls-vms/index.md @@ -14,15 +14,15 @@ featureImage: "basic-architecture.png" # Sets featured image on blog post. thumbnail: "basic-architecture.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8 +series: Tips # Projects, Code, vRA8 tags: - vmware - - vsphere + - vsphere - homelab comment: true # Disable comment if false. --- -Way back in 2020, VMware released vSphere 7 Update 1 and introduced the new [vSphere Clustering Services (vCLS)](https://core.vmware.com/resource/introduction-vsphere-clustering-service-vcls) to improve how cluster services like the Distributed Resource Scheduler (DRS) operate. vCLS deploys lightweight agent VMs directly on the cluster being managed, and those VMs provide a decoupled and distributed control plane to offload some of the management responsibilities from the vCenter server. +Way back in 2020, VMware released vSphere 7 Update 1 and introduced the new [vSphere Clustering Services (vCLS)](https://core.vmware.com/resource/introduction-vsphere-clustering-service-vcls) to improve how cluster services like the Distributed Resource Scheduler (DRS) operate. vCLS deploys lightweight agent VMs directly on the cluster being managed, and those VMs provide a decoupled and distributed control plane to offload some of the management responsibilities from the vCenter server. ![vCLS VM](vcls-vm.png) @@ -42,10 +42,10 @@ Disabling vCLS will break DRS, and could have other unintended side effects. Don It starts with determining the affected cluster's domain ID, which is very easy to do once you know where to look. Simply browse to the cluster object in the vSphere inventory, and look at the URL: ![Cluster domain ID](cluster-domain-id.png) -That `ClusterComputeResource:domain-c13` portion tells me exactly what I need to know: the ID for the `NUC Cluster` is `domain-c13`. +That `ClusterComputeResource:domain-c13` portion tells me exactly what I need to know: the ID for the `NUC Cluster` is `domain-c13`. ### Disable vCLS for a cluster -With that information gathered, you're ready to do the deed. Select the vCenter object in your vSphere inventory, head to the **Configure** tab, and open the **Advanced Settings** item. +With that information gathered, you're ready to do the deed. Select the vCenter object in your vSphere inventory, head to the **Configure** tab, and open the **Advanced Settings** item. ![vCenter Advanced Settings](vcenter-advanced-settings.png) diff --git a/content/posts/salt-state-netdata-tailscale/index.md b/content/posts/salt-state-netdata-tailscale/index.md index b2f7806..26391a4 100644 --- a/content/posts/salt-state-netdata-tailscale/index.md +++ b/content/posts/salt-state-netdata-tailscale/index.md @@ -6,7 +6,7 @@ description: "A hasty Salt state to deploy netdata monitoring and publish it int featured: false toc: true comment: true -series: Scripts +series: Code tags: - homelab - iac diff --git a/content/posts/script-to-convert-posts-to-hugo-page-bundles/index.md b/content/posts/script-to-convert-posts-to-hugo-page-bundles/index.md index 04ff16e..33f93de 100644 --- a/content/posts/script-to-convert-posts-to-hugo-page-bundles/index.md +++ b/content/posts/script-to-convert-posts-to-hugo-page-bundles/index.md @@ -15,7 +15,7 @@ thumbnail: "thumbnail.png" # Sets thumbnail image appearing inside card on homep # shareImage: "/images/path/share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. codeMaxLines: 30 -series: Scripts +series: Code tags: - hugo - meta diff --git a/content/posts/script-to-update-image-embed-links-in-markdown-files/index.md b/content/posts/script-to-update-image-embed-links-in-markdown-files/index.md index fa01dac..2c759cc 100644 --- a/content/posts/script-to-update-image-embed-links-in-markdown-files/index.md +++ b/content/posts/script-to-update-image-embed-links-in-markdown-files/index.md @@ -1,5 +1,5 @@ --- -series: Scripts +series: Code date: "2021-07-19T16:03:30Z" usePageBundles: true tags: diff --git a/content/posts/spotlight-on-torchlight/index.md b/content/posts/spotlight-on-torchlight/index.md index dfd69b2..0613df1 100644 --- a/content/posts/spotlight-on-torchlight/index.md +++ b/content/posts/spotlight-on-torchlight/index.md @@ -6,7 +6,7 @@ description: "Syntax highlighting powered by the Torchlight.dev API makes it eas featured: false toc: true comment: true -series: Projects # Projects, Scripts +series: Projects # Projects, Code tags: - javascript - hugo diff --git a/content/posts/systemctl-edit-delay-service-startup/index.md b/content/posts/systemctl-edit-delay-service-startup/index.md index ba3f025..a3e38ff 100644 --- a/content/posts/systemctl-edit-delay-service-startup/index.md +++ b/content/posts/systemctl-edit-delay-service-startup/index.md @@ -6,7 +6,7 @@ description: "Quick notes on using `systemctl edit` to override a systemd servic featured: false toc: false comment: true -series: Tips # Projects, Scripts +series: Tips # Projects, Code tags: - crostini - linux diff --git a/content/posts/tailscale-golink-private-shortlinks-tailnet/index.md b/content/posts/tailscale-golink-private-shortlinks-tailnet/index.md index bcbcf3c..f70d418 100644 --- a/content/posts/tailscale-golink-private-shortlinks-tailnet/index.md +++ b/content/posts/tailscale-golink-private-shortlinks-tailnet/index.md @@ -14,7 +14,7 @@ usePageBundles: true thumbnail: "golinks.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Projects # Projects, Scripts, vRA8, K8s on vSphere +series: Projects # Projects, Code, vRA8, K8s on vSphere tags: - docker - vpn diff --git a/content/posts/tailscale-on-vmware-photon/index.md b/content/posts/tailscale-on-vmware-photon/index.md index d9fc3f7..263c3c0 100644 --- a/content/posts/tailscale-on-vmware-photon/index.md +++ b/content/posts/tailscale-on-vmware-photon/index.md @@ -14,7 +14,7 @@ usePageBundles: true thumbnail: "Tailscale-AppIcon.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8, K8s on vSphere +series: Tips # Projects, Code, vRA8, K8s on vSphere tags: - vmware - linux diff --git a/content/posts/tailscale-ssh-serve-funnel/index.md b/content/posts/tailscale-ssh-serve-funnel/index.md index 0ba7aa9..2169d56 100644 --- a/content/posts/tailscale-ssh-serve-funnel/index.md +++ b/content/posts/tailscale-ssh-serve-funnel/index.md @@ -6,7 +6,7 @@ description: "Exploring some of my favorite Tailscale addon features: SSH, Serve featured: false toc: true comment: true -series: Tips # Projects, Scripts +series: Tips # Projects, Code tags: - homelab - networking diff --git a/content/posts/upgrading-standalone-vsphere-host-with-esxcli/index.md b/content/posts/upgrading-standalone-vsphere-host-with-esxcli/index.md index 9e9957f..32f78d1 100644 --- a/content/posts/upgrading-standalone-vsphere-host-with-esxcli/index.md +++ b/content/posts/upgrading-standalone-vsphere-host-with-esxcli/index.md @@ -14,7 +14,7 @@ featureImage: "esxi8.png" # Sets featured image on blog post. # thumbnail: "thumbnail.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8 +series: Tips # Projects, Code, vRA8 tags: - vmware - homelab diff --git a/content/posts/using-powershell-and-a-scheduled-task-to-apply-windows-updates/index.md b/content/posts/using-powershell-and-a-scheduled-task-to-apply-windows-updates/index.md index cdcc144..b2e5244 100644 --- a/content/posts/using-powershell-and-a-scheduled-task-to-apply-windows-updates/index.md +++ b/content/posts/using-powershell-and-a-scheduled-task-to-apply-windows-updates/index.md @@ -1,5 +1,5 @@ --- -series: Scripts +series: Code date: "2021-04-29T08:34:30Z" usePageBundles: true tags: diff --git a/content/posts/using-vsphere-diagnostic-tool-fling/index.md b/content/posts/using-vsphere-diagnostic-tool-fling/index.md index 34d0c62..0f636fa 100644 --- a/content/posts/using-vsphere-diagnostic-tool-fling/index.md +++ b/content/posts/using-vsphere-diagnostic-tool-fling/index.md @@ -14,7 +14,7 @@ featureImage: "vdt.png" # Sets featured image on blog post. thumbnail: "pulse2.png" # Sets thumbnail image appearing inside card on homepage. # shareImage: "share.png" # Designate a separate image for social media sharing. codeLineNumbers: false # Override global value for showing of line numbers within code block. -series: Tips # Projects, Scripts, vRA8 +series: Tips # Projects, Code, vRA8 tags: - vmware - vsphere From 20b3ce4635c25f2be4c56eae4ae03043bed0380b Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 08:04:32 -0600 Subject: [PATCH 03/14] update post to fix code block formatting --- content/posts/salt-state-netdata-tailscale/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/posts/salt-state-netdata-tailscale/index.md b/content/posts/salt-state-netdata-tailscale/index.md index 26391a4..27d3d6d 100644 --- a/content/posts/salt-state-netdata-tailscale/index.md +++ b/content/posts/salt-state-netdata-tailscale/index.md @@ -1,7 +1,7 @@ --- title: "Quick Salt State to Deploy Netdata" date: 2023-12-21 -# lastmod: 2023-12-21 +lastmod: 2023-12-22 description: "A hasty Salt state to deploy netdata monitoring and publish it internally on my tailnet with Tailscale Serve" featured: false toc: true @@ -25,7 +25,7 @@ It simply installs netdata using the [handy-dandy kickstart script](https://lear # torchlight! {"lineNumbers": true} # -*- coding: utf-8 -*- # vim: ft=sls -# Hasty Salt config to install Netdata and make it available within a Tailscale tailnet +# Hasty Salt config to install Netdata and make it available within a tailnet # at https://[hostname].[tailnet-name].ts.net:8443/netdata curl: From be65101f0f7a78a825e69ccfa87f99df04132afa Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 09:33:03 -0600 Subject: [PATCH 04/14] more aggressive wrapping for urls in status.lol --- static/css/custom.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static/css/custom.css b/static/css/custom.css index bf8ea8a..c8619ed 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -169,3 +169,8 @@ ul.pagination li { display:flex; justify-content: center; } + +/* statuslol overrides */ +.statuslol_content a { + overflow-wrap: break-word; +} \ No newline at end of file From dbd744b16ed328a3d680c40f423565b339be6516 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 10:08:23 -0600 Subject: [PATCH 05/14] fix ntfy docker healthcheck --- content/posts/easy-push-notifications-with-ntfy/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/posts/easy-push-notifications-with-ntfy/index.md b/content/posts/easy-push-notifications-with-ntfy/index.md index a5d3355..7779017 100644 --- a/content/posts/easy-push-notifications-with-ntfy/index.md +++ b/content/posts/easy-push-notifications-with-ntfy/index.md @@ -1,7 +1,7 @@ --- title: "Easy Push Notifications With ntfy.sh" date: 2023-09-17 -lastmod: 2023-10-21 +lastmod: 2023-12-22 description: "Deploying and configuring a self-hosted pub-sub notification handler, getting another server to send a notifcation when it boots, and integrating the notification handler into Home Assistant." featured: false toc: true @@ -66,10 +66,10 @@ services: - ./lib/ntf:/var/lib/ntfy ports: - 2586:80 - healthcheck: # optional, remember to adapt the host and port to your environment + healthcheck: # this should be the port inside the container, not the host port test: [ "CMD-SHELL", - "wget -q --tries=1 http://localhost:8080/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1" + "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1" ] interval: 60s timeout: 10s From e7763e09321e33a3592f1b2bfc817e3daf435680 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 13:38:59 -0600 Subject: [PATCH 06/14] add status badges to simplex page --- content/simplex.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/content/simplex.md b/content/simplex.md index d5848c8..f392e5e 100644 --- a/content/simplex.md +++ b/content/simplex.md @@ -19,18 +19,31 @@ Incoming messages are routed through a pool of servers so that your conversation The app is also packed with other features like disappearing messages, encrypted file transfers, encrypted voice messages, encrypted audio and video calls, decentralized private groups, and a cool incognito mode which connects new conversations to a randomly-generated profile instead of your primary one. There's even a [CLI client](https://github.com/simplex-chat/simplex-chat/blob/stable/docs/CLI.md)! ## Servers +[![](https://status.vpota.to/api/badge/11/status)](https://status.vpota.to/status/simplex) + You can easily host your own [simplexmq server](https://github.com/simplex-chat/simplexmq) for handling your inbound message queue, and I've done just that; in fact, I've deployed three! And, as one of my closest internet friends, *you're welcome to use them as well.* Just add these in the SimpleX app at **Settings > Network & servers > SMP servers > + Add server...**. Enable the option to use them for new connections, and they'll be added to the pool used for incoming messages in new conversations. If you want to use them immediately for existing conversations, go into each conversation's options menu and use the **Switch receiving address** option. You can also *disable* the option to use the default servers for new conversations if you only want messages to be routed through specific servers, but that does increase the likelikhood of concurrent conversations being routed the same way. More servers, more path options, less metadata in any one place. +--- ![](/images/smp-vpota-to.png) `smp://kYx5LmVD9FMM8hJN4BQqL4WmeUNZn8ipXsX2UkBoiHE=@smp.vpota.to` +[![](https://status.vpota.to/api/badge/6/status)](https://status.vpota.to/status/simplex) + +--- + ![](/images/smp1-vpota-to.png) `smp://TbUrGydawdVKID0Lvix14UkaN-WarFgqXx4kaEG8Trw=@smp1.vpota.to` +[![](https://status.vpota.to/api/badge/4/status)](https://status.vpota.to/status/simplex) + +--- + ![](/images/smp2-vpota-to.png) `smp://tNfQisxTQ9MhKpFDTbx9RnjgWigtxF1a26jroy5-rR4=@smp2.vpota.to` + +[![](https://status.vpota.to/api/badge/5/status)](https://status.vpota.to/status/simplex) From f42fb4d2231ec66e7109d64051a209480e6819c5 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 16:04:21 -0600 Subject: [PATCH 07/14] configure rss --- config/_default/hugo.toml | 8 +++++++- content/archives.md | 5 ----- layouts/partials/about.html | 2 +- layouts/partials/archive.html | 2 +- layouts/partials/head.html | 4 ++++ 5 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 content/archives.md diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 164e5cc..7dddba8 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -11,7 +11,10 @@ enableInlineShortcodes = true # sectionPagesMenu = "main" [outputs] - home = ["HTML", "RSS", "JSON"] + home = ['html', 'rss', 'json'] + section = ['html'] + taxonomy = ['html',] + term = ['html', 'rss'] [permalinks] posts = ":filename" @@ -41,6 +44,9 @@ enableInlineShortcodes = true [services.instagram] disableInlineCSS = true + [services.rss] + limit = 20 + [services.twitter] disableInlineCSS = true diff --git a/content/archives.md b/content/archives.md deleted file mode 100644 index db16eed..0000000 --- a/content/archives.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -date: 2019-05-28 -type: section -layout: "archives" ---- diff --git a/layouts/partials/about.html b/layouts/partials/about.html index 5e69943..21d87bb 100644 --- a/layouts/partials/about.html +++ b/layouts/partials/about.html @@ -1,7 +1,7 @@ {{ with .Site.Params.about }}
{{ with .logo }}{{ end }} -

{{ .title }}

+

{{ .title }}  

{{ partial "tagline.html" . }}
 {{ site.Params.Author }} diff --git a/layouts/partials/archive.html b/layouts/partials/archive.html index fc7d6bd..71f3b34 100644 --- a/layouts/partials/archive.html +++ b/layouts/partials/archive.html @@ -6,7 +6,7 @@ {{ if .IsHome }}

{{ site.Params.indexTitle | markdownify }}

{{ else }} -

{{ .Title | markdownify }}

+

{{ .Title | markdownify }}{{ if eq .Kind "term" }}  

{{ end }} {{ end }} {{ .Content }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 96d783c..d14922a 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -5,6 +5,10 @@ {{ if or (.Site.Params.noindex) (.Params.noindex) }} {{ end }} +{{ with .OutputFormats.Get "rss" -}} + {{ printf `` .Rel .MediaType.Type .Permalink site.Title | safeHTML }} +{{ end }} + {{ partialCached "favicon" . }} {{ partial "opengraph" . }} From 3536f61fc9e22b63d43f26b557d3c967440c185b Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 16:19:48 -0600 Subject: [PATCH 08/14] add verification links to head on home page --- config/_default/params.toml | 18 +++++++++++++++++- layouts/partials/head.html | 8 ++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/config/_default/params.toml b/config/_default/params.toml index fa8f5ba..9366d12 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -170,4 +170,20 @@ url = "https://torchlight.dev" [[powerLinks]] title = "cabin" -url = "https://withcabin.com/privacy/runtimeterror.dev" \ No newline at end of file +url = "https://withcabin.com/privacy/runtimeterror.dev" + +[[verifyLinks]] +title = "omg.lol" +url = "https://proven.lol/cd10d3" + +[[verifyLinks]] +title = "CounterSocial" +url = "https://counter.social/@john_b" + +[[verifyLinks]] +title = "Mastodon" +url = "https://social.lol/@jbowdre" + +[[verifyLinks]] +title = "GitHub" +url = "https://github.com/jbowdre" diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d14922a..bcfc68b 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -5,10 +5,18 @@ {{ if or (.Site.Params.noindex) (.Params.noindex) }} {{ end }} + {{ with .OutputFormats.Get "rss" -}} {{ printf `` .Rel .MediaType.Type .Permalink site.Title | safeHTML }} {{ end }} + +{{ if .IsHome }} +{{ range $item := .Site.Params.verifyLinks }} + +{{ end }} +{{ end }} + {{ partialCached "favicon" . }} {{ partial "opengraph" . }} From 0a2795e74d49e30f639560096c157c55d33da390 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 16:30:08 -0600 Subject: [PATCH 09/14] rename index.xml to feed.xml --- config/_default/hugo.toml | 6 ++++++ layouts/partials/about.html | 2 +- layouts/partials/archive.html | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 7dddba8..a58ec42 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -16,6 +16,12 @@ enableInlineShortcodes = true taxonomy = ['html',] term = ['html', 'rss'] +# rename rss output from index.xml to feed.xml +[outputFormats] + [outputFormats.rss] + mediatype = "application/rss" + baseName = "feed" + [permalinks] posts = ":filename" diff --git a/layouts/partials/about.html b/layouts/partials/about.html index 21d87bb..4260bb1 100644 --- a/layouts/partials/about.html +++ b/layouts/partials/about.html @@ -1,7 +1,7 @@ {{ with .Site.Params.about }}
{{ with .logo }}{{ end }} -

{{ .title }}  

+

{{ .title }}  

{{ partial "tagline.html" . }}
 {{ site.Params.Author }} diff --git a/layouts/partials/archive.html b/layouts/partials/archive.html index 71f3b34..c5e3690 100644 --- a/layouts/partials/archive.html +++ b/layouts/partials/archive.html @@ -6,7 +6,7 @@ {{ if .IsHome }}

{{ site.Params.indexTitle | markdownify }}

{{ else }} -

{{ .Title | markdownify }}{{ if eq .Kind "term" }}  

{{ end }} +

{{ .Title | markdownify }}{{ if eq .Kind "term" }}  

{{ end }} {{ end }} {{ .Content }} From f9a7c938976ae76be332bd60153aa9b15f3aae49 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 22 Dec 2023 17:12:18 -0600 Subject: [PATCH 10/14] clean up all tags page --- content/posts/_index.md | 1 - layouts/partials/archive.html | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/content/posts/_index.md b/content/posts/_index.md index db5627a..02eb363 100644 --- a/content/posts/_index.md +++ b/content/posts/_index.md @@ -1,5 +1,4 @@ +++ aliases = ["all_posts", "articles"] title = "Index of Posts" -tags = ["index"] +++ diff --git a/layouts/partials/archive.html b/layouts/partials/archive.html index c5e3690..3cbf057 100644 --- a/layouts/partials/archive.html +++ b/layouts/partials/archive.html @@ -11,6 +11,7 @@ {{ .Content }} +{{- if ne .Title "Tags"}} {{- range (.Paginate $pages).Pages }} {{- $postDate := .Date.Format "2006-01-02" }} {{- $updateDate := .Lastmod.Format "2006-01-02" }} @@ -28,4 +29,9 @@
{{ end }} -{{- template "_internal/pagination.html" . }} \ No newline at end of file +{{- template "_internal/pagination.html" . }} +{{- else }} +{{- range .Pages.ByTitle }} + [{{ .Title | markdownify }}] +{{- end }} +{{- end }} \ No newline at end of file From 62dd04f7e8fe54d376f3016c1e9d25cc1120b278 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Sat, 23 Dec 2023 09:27:31 -0600 Subject: [PATCH 11/14] use png for og fallback image --- config/_default/params.toml | 2 +- static/images/broken-computer.png | Bin 0 -> 7526 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 static/images/broken-computer.png diff --git a/config/_default/params.toml b/config/_default/params.toml index 9366d12..4da4537 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -2,7 +2,7 @@ noindex = false usePageBundles = true description = "while (true) { bugs++; }" mainSections = ["posts"] -fallBackOgImage = "images/broken-computer.svg" +fallBackOgImage = "images/broken-computer.png" numberOfFeaturedPosts = 5 numberOfRelatedPosts = 5 author = "jbowdre" diff --git a/static/images/broken-computer.png b/static/images/broken-computer.png new file mode 100644 index 0000000000000000000000000000000000000000..2fc2346c2ebe612c5414239c2ed1c1c440d39b92 GIT binary patch literal 7526 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 LN2BN;n Date: Sat, 23 Dec 2023 15:42:01 -0600 Subject: [PATCH 12/14] use relative link for simplex --- config/_default/params.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/_default/params.toml b/config/_default/params.toml index 4da4537..4060a19 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -140,7 +140,7 @@ url = "https://jbowdre.omg.lol" [[socialLinks]] icon = "fa-solid fa-comments" title = "SimpleX Chat" -url = "https://runtimeterror.dev/simplex" +url = "/simplex" [[socialLinks]] icon = "fa fa-matrix-org" From d00045e3a726699cab66406ffbb5f2591368a7a5 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Sat, 23 Dec 2023 15:42:14 -0600 Subject: [PATCH 13/14] add netdata to server status --- content/simplex.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/content/simplex.md b/content/simplex.md index f392e5e..79fd849 100644 --- a/content/simplex.md +++ b/content/simplex.md @@ -30,7 +30,9 @@ Just add these in the SimpleX app at **Settings > Network & servers > SMP server `smp://kYx5LmVD9FMM8hJN4BQqL4WmeUNZn8ipXsX2UkBoiHE=@smp.vpota.to` -[![](https://status.vpota.to/api/badge/6/status)](https://status.vpota.to/status/simplex) +| | | +| --- | --- | +| [![](https://status.vpota.to/api/badge/6/uptime)](https://status.vpota.to/status/simplex) | [[details](https://smp-vpota-to.tetra-gamma.ts.net/netdata/)] | --- @@ -38,7 +40,9 @@ Just add these in the SimpleX app at **Settings > Network & servers > SMP server `smp://TbUrGydawdVKID0Lvix14UkaN-WarFgqXx4kaEG8Trw=@smp1.vpota.to` -[![](https://status.vpota.to/api/badge/4/status)](https://status.vpota.to/status/simplex) +| | | +| --- | --- | +| [![](https://status.vpota.to/api/badge/4/uptime)](https://status.vpota.to/status/simplex) | [[details](https://smp1-vpota-to.tetra-gamma.ts.net/netdata/)] | --- @@ -46,4 +50,6 @@ Just add these in the SimpleX app at **Settings > Network & servers > SMP server `smp://tNfQisxTQ9MhKpFDTbx9RnjgWigtxF1a26jroy5-rR4=@smp2.vpota.to` -[![](https://status.vpota.to/api/badge/5/status)](https://status.vpota.to/status/simplex) +| | | +| --- | --- | +| [![](https://status.vpota.to/api/badge/5/uptime)](https://status.vpota.to/status/simplex) | [[details](https://smp2-vpota-to.tetra-gamma.ts.net/netdata/)] | From 502a1cba447300de65b5c8ac623f742dec5ea4fc Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Sat, 23 Dec 2023 17:00:24 -0600 Subject: [PATCH 14/14] tweaks for rendering status.lol block --- layouts/partials/aside.html | 2 +- static/css/custom.css | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/layouts/partials/aside.html b/layouts/partials/aside.html index 38e32bf..0326171 100644 --- a/layouts/partials/aside.html +++ b/layouts/partials/aside.html @@ -61,4 +61,4 @@ {{- end }}

status.lol

- + diff --git a/static/css/custom.css b/static/css/custom.css index c8619ed..2cff8a2 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -171,6 +171,28 @@ ul.pagination li { } /* statuslol overrides */ -.statuslol_content a { +.statuslol { + background: var(--inner-bg) !important; +} + +.statuslol_content p, +.statuslol_content li, +.statuslol_content em, +.statuslol_content strong { overflow-wrap: break-word; + font-size: 0.8em; + line-height:normal; + margin: 0.2em auto; + color: var(--fg); +} + +.statuslol_time a:link, +.statuslol_time a:visited { + color: var(--link) !important; +} + +.statuslol_time a:hover, +.statuslol_time a:active, +.statuslol_time a.active { + color: var(--hover) !important; } \ No newline at end of file