catch up to master

.githooks/pre-commit

@@ -1,2 +1,3 @@
 #!/bin/sh
+echo "Running pre-commit hook yamllint..."
 yamllint -c .yamllint .

Dockerfile.autokuma

@@ -0,0 +1,10 @@
+FROM rust:1.75 as builder
+WORKDIR /usr/src/autokuma
+RUN cargo install --git https://github.com/BigBoot/AutoKuma.git kuma-cli
+RUN cargo install --git https://github.com/BigBoot/AutoKuma.git autokuma
+
+
+FROM debian:bookworm-slim
+RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /usr/local/cargo/bin/* /usr/local/bin
+CMD ["autokuma"]

SERVICES.md

@@ -95,6 +95,8 @@
 - [ollama-nvidia](https://hub.docker.com/r/ollama/ollama): Eeasy way to run large language models locally - Nvidia GPU
 - [ollama-webui](https://github.com/open-webui/open-webui): Web-based user interface for ollama, a media indexer
 - [omada](https://hub.docker.com/r/mbentley/omada-controller): Container for running tp-link omada controller
+- [onboard](https://github.com/traefikturkey/onboard): An RSS and Bookmarks Dashboard 
+- [ongoing](https://github.com/traefikturkey/ongoing): A self hosted url expander (opposite of url shortener)
 - [openspeedtest](https://github.com/openspeedtest/Docker-Image): Network Performance Estimation Tool
 - [overseerr](https://hub.docker.com/r/linuxserver/overseerr): Request management and notification system for media content
 - [owncast](https://github.com/owncast/owncast): Self-hosted live video streaming server

make.d/install.mk

@@ -3,26 +3,12 @@
 ## install commands
 ##
 #########################################################
-distro := $(shell lsb_release -is)
-
-
-check-distro: ## check distro
-	@echo $(distro)
-
-
-ifeq ($(distro),Ubuntu)
-    ANSIBLE_APT_ADD_REPO := sudo apt-add-repository ppa:ansible/ansible -y
-    YQ_APT_ADD_REPO 	 := sudo apt-add-repository ppa:rmescandon/yq -y
-else
-    YQ_APT_ADD_REPO      :=
-    ANSIBLE_APT_ADD_REPO :=
-endif
-
 ACME_JSON_FILE := ./etc/traefik/letsencrypt/acme.json
 ACME_JSON_PERMS := 600
+export DEBIAN_FRONTEND = noninteractive
 
 ifneq ("$(wildcard $(ACME_JSON_FILE))","")
-    BUILD_DEPENDENCIES += fix-acme-json-permissions
+  BUILD_DEPENDENCIES += fix-acme-json-permissions
 endif
 
 fix-acme-json-permissions:
@@ -62,27 +48,28 @@ environments-enabled/onramp.env:
 	@echo ""
 	@python3 scripts/env-subst.py environments-available/onramp.template "ONRAMP"
 
-EXECUTABLES = git nano jq yq pip yamllint python3-pathspec
-MISSING_PACKAGES := $(foreach exec,$(EXECUTABLES),$(if $(shell which $(exec)),,addpackage-$(exec)))
+REPOS = rmescandon/yq ansible/ansible
+MISSING_REPOS := $(foreach repo,$(REPOS),$(if $(shell apt-cache policy | grep $(repo)),,addrepo/$(repo)))
 
-addrepositories:
-	$(YQ_APT_ADD_REPO)
-	sudo apt update
+EXECUTABLES = git nano jq yq python3-pip yamllint python3-pathspec ansible 
+MISSING_PACKAGES := $(foreach exec,$(EXECUTABLES),$(if $(shell dpkg -s "$(exec)" &> /dev/null),,addpackage-$(exec)))
+
+# duck you debian
+addrepo/%:
+	@if [ "$(shell lsb_release -si | tail -n 1)" = "Ubuntu" ]; then \
+		sudo apt-add-repository ppa:$* -y; \
+	fi
 
-addpackage-%: addrepositories
-	DEBIAN_FRONTEND=noninteractive sudo apt install $* -y
+addpackage-%: 
+	sudo apt install $* -y
 
-install-dependencies: .gitconfig $(MISSING_PACKAGES)
+install-dependencies: .gitconfig $(MISSING_REPOS) $(MISSING_PACKAGES) 
 
 .gitconfig:
 	git config -f .gitconfig core.hooksPath .githooks
 	git config --local include.path $(shell pwd)/.gitconfig
 
-install-ansible:
-	#sudo apt-add-repository ppa:ansible/ansible -y
-	$(APT_ADD_REPO)	
-	sudo apt update
-	sudo apt install ansible -y
+install-ansible: install-dependencies
 	@echo "Installing ansible roles requirements..."
 	ansible-playbook ansible/ansible-requirements.yml
 

services-available/onboard.yml

@@ -0,0 +1,33 @@
+version: '3'
+
+networks:
+  traefik:
+    external: true
+
+# description: An RSS and Bookmarks Dashboard 
+# https://github.com/traefikturkey/onboard
+
+services:
+  onboard:
+    image: ghcr.io/traefikturkey/onboard:${ONBOARD_DOCKER_TAG:-latest}
+    container_name: ${ONBOARD_CONTAINER_NAME:-onboard}
+    restart: ${ONBOARD_RESTART:-unless-stopped}
+    networks:
+      - traefik
+    volumes:
+      - ./etc/onboard:/app/configs
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+      - TZ=${TZ}
+    labels:
+      - joyride.host.name=${ONBOARD_CONTAINER_NAME:-onboard}.${HOST_DOMAIN}
+      - traefik.enable=true
+      - traefik.http.routers.onboard.entrypoints=websecure
+      - traefik.http.routers.onboard.rule=Host(`${ONBOARD_CONTAINER_NAME:-onboard}.${HOST_DOMAIN}`)
+      - traefik.http.services.onboard.loadbalancer.server.port=9830
+      - com.centurylinklabs.watchtower.enable=true
+      - autoheal=true

services-available/ongoing.yml

@@ -0,0 +1,33 @@
+version: '3'
+
+networks:
+  traefik:
+    external: true
+
+# description: A self hosted url expander (opposite of url shortener)
+# https://github.com/traefikturkey/ongoing
+
+services:
+  ongoing:
+    image: ghcr.io/traefikturkey/ongoing:${ONGOING_DOCKER_TAG:-latest}
+    container_name: ${ONGOING_CONTAINER_NAME:-ongoing}
+    restart: ${ONGOING_RESTART:-unless-stopped}
+    networks:
+      - traefik
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+      - TZ=${TZ}
+    dns:
+      - ${ONGOING_DNS_SERVER:-1.1.1.1}
+    labels:
+      - joyride.host.name=${ONGOING_CONTAINER_NAME:-ongoing}.${HOST_DOMAIN}
+      - traefik.enable=true
+      - traefik.http.routers.ongoing.entrypoints=websecure
+      - traefik.http.routers.ongoing.rule=Host(`${ONGOING_CONTAINER_NAME:-ongoing}.${HOST_DOMAIN}`)
+      - traefik.http.services.ongoing.loadbalancer.server.port=9380
+      - com.centurylinklabs.watchtower.enable=true
+      - autoheal=true