From 3433aabb828251429413630d56307d6a00b6a715 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sun, 13 Feb 2022 18:02:46 +0000 Subject: [PATCH 1/5] Reorg and add Deluge PUB --- homelab/server/config/homer/assets/config.yml | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/homelab/server/config/homer/assets/config.yml b/homelab/server/config/homer/assets/config.yml index b1d18394..9f3d787b 100644 --- a/homelab/server/config/homer/assets/config.yml +++ b/homelab/server/config/homer/assets/config.yml @@ -43,26 +43,6 @@ colors: # First level array represent a group. # Leave only a "items" key if not using group (group name, icon & tagstyle are optional, section separation will not be displayed). services: - - name: "Jafner.tools" - icon: "fas fa-cloud" - items: - - name: "5eTools" - logo: assets/icons/5et-192.png - subtitle: "D&D 5e Complete Reference" - url: "https://5e.jafner.tools" - - name: "Joplin" - logo: assets/icons/joplin-512.png - subtitle: "Sync server for the Joplin notes app" - url: "https://joplin.jafner.tools" - - name: "Bitwarden" - logo: assets/icons/bitwarden-512.png - subtitle: "Sync server for the Bitwarden password manager" - url: "https://bitwarden.jafner.tools" - - name: "Uptime Kuma" - logo: assets/icons/uptimekuma-512.png - subtitle: "Web monitoring dashboard" - url: "https://uptime.jafner.tools/dashboard" - - name: "Public Cloud" icon: "fas fa-cloud" items: @@ -110,6 +90,25 @@ services: subtitle: "Account management dashboard for the SendGrid email messaging platform" logo: assets/icons/sendgrid.png url: "https://app.sendgrid.com/" + - name: "Jafner.tools" + icon: "fas fa-cloud" + items: + - name: "5eTools" + logo: assets/icons/5et-192.png + subtitle: "D&D 5e Complete Reference" + url: "https://5e.jafner.tools" + - name: "Joplin" + logo: assets/icons/joplin-512.png + subtitle: "Sync server for the Joplin notes app" + url: "https://joplin.jafner.tools" + - name: "Bitwarden" + logo: assets/icons/bitwarden-512.png + subtitle: "Sync server for the Bitwarden password manager" + url: "https://bitwarden.jafner.tools" + - name: "Uptime Kuma" + logo: assets/icons/uptimekuma-512.png + subtitle: "Web monitoring dashboard" + url: "https://uptime.jafner.tools/dashboard" - name: "Jafner.chat" icon: "fas fa-cloud" @@ -153,6 +152,10 @@ services: logo: assets/icons/deluge-1200.png subtitle: "Deluge Torrent Web UI for EMP" url: "http://jafner.seedbox:52200/" + - name: "PUB" + logo: assets/icons/deluge-1200.png + subtitle: "Deluge Torrent Web UI for public torrents" + url: "http://jafner.seedbox:53200/" - name: "Jafner.net" icon: "fas fa-server" From 52c2e76617d52b2c2192fccebaeb258245a815b2 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sun, 13 Feb 2022 18:07:29 +0000 Subject: [PATCH 2/5] Update .gitlab-ci.yml file --- homelab/.gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/homelab/.gitlab-ci.yml b/homelab/.gitlab-ci.yml index 2482bde4..1ddb0018 100644 --- a/homelab/.gitlab-ci.yml +++ b/homelab/.gitlab-ci.yml @@ -15,11 +15,10 @@ before_script: server-deploy: stage: deploy - when: manual rules: - changes: - server/ - + when: manual script: - ssh joey@joey-server "cd /home/joey && git archive --remote=ssh://git@gitlab.jafner.net:2229/Jafner/homelab.git main server/ | tar xvf -" - ssh joey@joey-server "cp -r server/config/* ./docker_config/" From 6cf62d5442fc3c2f47886e74525e84673330352c Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sun, 13 Feb 2022 18:10:13 +0000 Subject: [PATCH 3/5] Remove jafner.chat --- homelab/server/config/homer/assets/config.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/homelab/server/config/homer/assets/config.yml b/homelab/server/config/homer/assets/config.yml index 9f3d787b..5c5ede83 100644 --- a/homelab/server/config/homer/assets/config.yml +++ b/homelab/server/config/homer/assets/config.yml @@ -90,6 +90,7 @@ services: subtitle: "Account management dashboard for the SendGrid email messaging platform" logo: assets/icons/sendgrid.png url: "https://app.sendgrid.com/" + - name: "Jafner.tools" icon: "fas fa-cloud" items: @@ -110,17 +111,6 @@ services: subtitle: "Web monitoring dashboard" url: "https://uptime.jafner.tools/dashboard" - - name: "Jafner.chat" - icon: "fas fa-cloud" - items: - - name: "Element" - logo: assets/icons/element-512.webp - subtitle: "Web-based Matrix client for the jafner.chat homeserver" - url: "https://element.jafner.chat" - - name: "Synapse Admin" - subtitle: "Web admin portal for the Synapse homeserver" - url: "https://matrix.jafner.chat/synapse-admin" - - name: "Jafner.pi1" icon: "fas fa-server" items: From 1de9c6419121574e940cc26828e0bc5a824cab66 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sun, 13 Feb 2022 18:14:41 +0000 Subject: [PATCH 4/5] Fix Deluge PUB port --- homelab/server/config/homer/assets/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homelab/server/config/homer/assets/config.yml b/homelab/server/config/homer/assets/config.yml index 5c5ede83..54061870 100644 --- a/homelab/server/config/homer/assets/config.yml +++ b/homelab/server/config/homer/assets/config.yml @@ -145,7 +145,7 @@ services: - name: "PUB" logo: assets/icons/deluge-1200.png subtitle: "Deluge Torrent Web UI for public torrents" - url: "http://jafner.seedbox:53200/" + url: "http://jafner.seedbox:52300/" - name: "Jafner.net" icon: "fas fa-server" From 60967f05641e847f76b1a88d7293a6c19b7e423e Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sun, 13 Feb 2022 18:15:29 +0000 Subject: [PATCH 5/5] Update .gitlab-ci.yml --- homelab/.gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/homelab/.gitlab-ci.yml b/homelab/.gitlab-ci.yml index 1ddb0018..9e845f2b 100644 --- a/homelab/.gitlab-ci.yml +++ b/homelab/.gitlab-ci.yml @@ -15,6 +15,7 @@ before_script: server-deploy: stage: deploy + when: always rules: - changes: - server/