From 0286a84f23bfb4ff8ec8a54cb3f53a0a9f0b8b2e Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Tue, 20 Feb 2024 00:51:01 +0800 Subject: [PATCH] fix: homepage --- hosts/idols_kana/caddy.nix | 4 ++ hosts/idols_kana/homepage/config/docker.yaml | 6 +- .../{ => config}/images/rolling-girls.png | Bin .../homepage/config/kubernetes.yaml | 3 +- .../idols_kana/homepage/config/services.yaml | 58 ++++++++---------- .../idols_kana/homepage/config/settings.yaml | 12 ++++ hosts/idols_kana/homepage/config/widgets.yaml | 38 ++++++------ hosts/idols_kana/homepage/default.nix | 7 ++- 8 files changed, 71 insertions(+), 57 deletions(-) rename hosts/idols_kana/homepage/{ => config}/images/rolling-girls.png (100%) diff --git a/hosts/idols_kana/caddy.nix b/hosts/idols_kana/caddy.nix index 24db2d57..bfcc6768 100644 --- a/hosts/idols_kana/caddy.nix +++ b/hosts/idols_kana/caddy.nix @@ -39,6 +39,10 @@ encode zstd gzip reverse_proxy http://localhost:5005 ''; + virtualHosts."http://home.writefor.fun".extraConfig = '' + encode zstd gzip + reverse_proxy http://localhost:8082 + ''; }; networking.firewall.allowedTCPPorts = [80 443]; } diff --git a/hosts/idols_kana/homepage/config/docker.yaml b/hosts/idols_kana/homepage/config/docker.yaml index bec469aa..6c9dbfac 100644 --- a/hosts/idols_kana/homepage/config/docker.yaml +++ b/hosts/idols_kana/homepage/config/docker.yaml @@ -1,3 +1,3 @@ -kana-docker: - socket: /var/run/docker.sock - +# kana-docker: +# socket: /var/run/docker.sock +# diff --git a/hosts/idols_kana/homepage/images/rolling-girls.png b/hosts/idols_kana/homepage/config/images/rolling-girls.png similarity index 100% rename from hosts/idols_kana/homepage/images/rolling-girls.png rename to hosts/idols_kana/homepage/config/images/rolling-girls.png diff --git a/hosts/idols_kana/homepage/config/kubernetes.yaml b/hosts/idols_kana/homepage/config/kubernetes.yaml index 8769d869..28fcd816 100644 --- a/hosts/idols_kana/homepage/config/kubernetes.yaml +++ b/hosts/idols_kana/homepage/config/kubernetes.yaml @@ -2,6 +2,7 @@ # uses the default kubeconfig to access the cluster # read kubbecofig from $KUBECONFIG or $HOME/.kube/config -mode: default +# mode: default +mode: disabled diff --git a/hosts/idols_kana/homepage/config/services.yaml b/hosts/idols_kana/homepage/config/services.yaml index cc2b74d5..d1d8aebc 100644 --- a/hosts/idols_kana/homepage/config/services.yaml +++ b/hosts/idols_kana/homepage/config/services.yaml @@ -1,3 +1,7 @@ +--- +# For configuration options and examples, please see: +# https://gethomepage.dev/latest/configs/services + - Proxmox VE 虚拟化集群: - PVE-UM560: icon: si-proxmox @@ -35,39 +39,31 @@ siteMonitor: http://uptime-kuma.writefor.fun - Homelab Applications: - - Home Assistant: - icon: home-assistant.png - href: "http://homeassistant.home/" - description: Home Automation - server: kana-docker - container: home-assistant - - SFTPGO: icon: sftpgo.png href: "http://sftpgo.writefor.fun/web/admin/folders" description: WebDAV & SFTP server - server: kana-docker - container: sftpgo + siteMonitor: http://sftpgo.writefor.fun/ -- Kubernetes Monitoring: - # TODO: Update this - - Emby: - icon: emby.png - href: "http://emby.home/" - description: Media server - namespace: media # The kubernetes namespace the app resides in - app: emby # The name of the deployed app - - - Element Chat: - icon: matrix-light.png - href: https://chat.example.com - description: Matrix Synapse Powered Chat - app: matrix-element - namespace: comms - pod-selector: >- - app.kubernetes.io/instance in ( - matrix-element, - matrix-media-repo, - matrix-media-repo-postgresql, - matrix-synapse - ) +# - Kubernetes Monitoring: +# # TODO: Update this +# - Emby: +# icon: emby.png +# href: "http://emby.home/" +# description: Media server +# namespace: media # The kubernetes namespace the app resides in +# app: emby # The name of the deployed app +# +# - Element Chat: +# icon: matrix-light.png +# href: https://chat.example.com +# description: Matrix Synapse Powered Chat +# app: matrix-element +# namespace: comms +# pod-selector: >- +# app.kubernetes.io/instance in ( +# matrix-element, +# matrix-media-repo, +# matrix-media-repo-postgresql, +# matrix-synapse +# ) diff --git a/hosts/idols_kana/homepage/config/settings.yaml b/hosts/idols_kana/homepage/config/settings.yaml index 9f3c0951..d0804fc0 100644 --- a/hosts/idols_kana/homepage/config/settings.yaml +++ b/hosts/idols_kana/homepage/config/settings.yaml @@ -1,3 +1,7 @@ +--- +# For configuration options and examples, please see: +# https://gethomepage.dev/latest/configs/settings + title: Ryan Yin's Homelab base: http://home.writefor.fun/ favicon: https://thiscute.world/favicon.ico @@ -8,6 +12,14 @@ startUrl: http://home.writefor.fun/ language: zh +# Define shared API provider options and secrets here, +# You can then pass provider instead of apiKey in your widget configuration. +providers: + # read api keys from environment variables + openweathermap: {{HOMEPAGE_VAR_WEATHERAPI_APIKEY}} + weatherapi: {{HOMEPAGE_VAR_WEATHERAPI_APIKEY}} + + background: image: /images/rolling-girls.png blur: sm # sm, "", md, xl... see https://tailwindcss.com/docs/backdrop-blur diff --git a/hosts/idols_kana/homepage/config/widgets.yaml b/hosts/idols_kana/homepage/config/widgets.yaml index e9dfc6e5..6f77dab1 100644 --- a/hosts/idols_kana/homepage/config/widgets.yaml +++ b/hosts/idols_kana/homepage/config/widgets.yaml @@ -1,21 +1,21 @@ -- kubernetes: - cluster: - show: true - cpu: true - memory: true - showLabel: true - label: "cluster" - nodes: - show: true - cpu: true - memory: true - showLabel: true -- resources: - backend: resources - expanded: true - cpu: true - memory: true +# TODO: add access to kubernetes cluster +# - kubernetes: +# cluster: +# show: true +# cpu: true +# memory: true +# showLabel: true +# label: "cluster" +# nodes: +# show: true +# cpu: true +# memory: true +# showLabel: true +# - resources: +# backend: resources +# expanded: true +# cpu: true +# memory: true - search: - provider: duckduckgo + provider: google target: _blank - diff --git a/hosts/idols_kana/homepage/default.nix b/hosts/idols_kana/homepage/default.nix index d0080490..3fb308af 100644 --- a/hosts/idols_kana/homepage/default.nix +++ b/hosts/idols_kana/homepage/default.nix @@ -17,8 +17,9 @@ in { }; # Install the homepage-dashboard configuration files system.activationScripts.installHomepageDashboardConfig = '' - mkdir -p ${configDir}/config ${configDir}/images - ${pkgs.rsync}/bin/rsync -avz --chmod=D2755,F600 ${./config}/ ${configDir}/config/ - ${pkgs.rsync}/bin/rsync -avz --chmod=D2755,F600 ${./images}/ ${configDir}/images/ + mkdir -p configDir + ${pkgs.rsync}/bin/rsync -avz --chmod=D2755,F600 ${./config}/ ${configDir}/ + + ${pkgs.systemdMinimal}/bin/systemctl restart homepage-dashboard ''; }