From 5bb44a69264864ac8c539ba799acc7c8f90f8945 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@Kateryna)" Date: Wed, 19 Mar 2025 22:52:17 -0400 Subject: [PATCH 1/3] Added tab-completion to checkver --- _bin/checkver.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/_bin/checkver.sh b/_bin/checkver.sh index c67458b..f41589f 100755 --- a/_bin/checkver.sh +++ b/_bin/checkver.sh @@ -2,6 +2,8 @@ SCRIPT_DIR=${SCRIPT_DIR:-"$( cd -- "$( dirname -- "$0" )" &> /dev/null && pwd )"} set -e +BASE_NAME="${0##*/}" +SCRIPT_NAME="${SCRIPT_DIR}/${BASE_NAME}" # Function to compare semantic versions compare_major_version() { @@ -20,7 +22,7 @@ if [[ "${1}" =~ ^(-h|--help$) ]]; then "Query runtipi's current version and compares with what is available online" \ "" \ "Usage:" \ - " ${0##*/} -h | --help | [next] [] " \ + " ${BASE_NAME} -h | --help | [next] [] " \ "" \ "Arguments:" \ " -h | --help Display usage" \ @@ -36,7 +38,51 @@ if [[ "${1}" =~ ^(-h|--help$) ]]; then " major versions do not match" exit 1 fi - + +# --- tab completion --- +completion_bash() { +cat < /dev/null && pwd )"} current_version="$1" @@ -97,3 +143,4 @@ elif [ "$next_tag" != "$current_version" ]; then compare_major_version "$next_tag" "$current_version" fi +# vim: set ft=sh expandtab tabstop=4 shiftwidth=4: \ No newline at end of file From 26471c1cfec640fe0b75c2927e194f033c57535c Mon Sep 17 00:00:00 2001 From: "Lockszmith (@Kateryna)" Date: Wed, 19 Mar 2025 22:53:00 -0400 Subject: [PATCH 2/3] Add UMASK (with default) to compose template --- _template/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_template/docker-compose.yml b/_template/docker-compose.yml index 225fca1..27a198f 100644 --- a/_template/docker-compose.yml +++ b/_template/docker-compose.yml @@ -4,6 +4,7 @@ services: environment: PUID: "${HOST_UID}" PGID: "${HOST_GID}" + UMASK: "${HOST_UMASK:-022}" # RUNTIPI Environment RUNTIPI_APP_PORT: "${APP_PORT}" RUNTIPI_APP_ID: "${APP_ID}" From 4f8e3da48cef6a0c611772187e1176eaa8e56532 Mon Sep 17 00:00:00 2001 From: "Lockszmith (@Kateryna)" Date: Mon, 24 Mar 2025 23:58:34 -0400 Subject: [PATCH 3/3] =dynamic traefik configuration updated --- .../_templates/rt.kateryna-app.yml.tmpl | 19 ++++++++++ .../dynamic/_templates/rt.kateryna-jd.yml.sz | 19 ++++++++++ .../dynamic/_templates/runtipi-apps.yml.sz | 37 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 _traefik/dynamic/_templates/rt.kateryna-app.yml.tmpl create mode 100644 _traefik/dynamic/_templates/rt.kateryna-jd.yml.sz create mode 100644 _traefik/dynamic/_templates/runtipi-apps.yml.sz diff --git a/_traefik/dynamic/_templates/rt.kateryna-app.yml.tmpl b/_traefik/dynamic/_templates/rt.kateryna-app.yml.tmpl new file mode 100644 index 0000000..48122dd --- /dev/null +++ b/_traefik/dynamic/_templates/rt.kateryna-app.yml.tmpl @@ -0,0 +1,19 @@ +# http routing section +http: + routers: + -on-kateryna: + service: kateryna- + rule: Host(`.szk.li`) && PathPrefix(`/`) + entrypoints: + - websecure + tls: + certresolver: myresolver + middlewares: + - authentik_sysmgr + + services: + # Define how to reach an existing service on our infrastructure + kateryna-: + loadBalancer: + servers: + - url: http://192.168.222.43:80 \ No newline at end of file diff --git a/_traefik/dynamic/_templates/rt.kateryna-jd.yml.sz b/_traefik/dynamic/_templates/rt.kateryna-jd.yml.sz new file mode 100644 index 0000000..8b00cde --- /dev/null +++ b/_traefik/dynamic/_templates/rt.kateryna-jd.yml.sz @@ -0,0 +1,19 @@ +# http routing section +http: + routers: + jd-on-kateryna: + service: kateryna-jd + rule: Host(`jd.szk.li`) && PathPrefix(`/`) + entrypoints: + - websecure + tls: + certresolver: myresolver + middlewares: + - authentik_sysmgr + + services: + # Define how to reach an existing service on our infrastructure + kateryna-jd: + loadBalancer: + servers: + - url: http://192.168.222.83:80 diff --git a/_traefik/dynamic/_templates/runtipi-apps.yml.sz b/_traefik/dynamic/_templates/runtipi-apps.yml.sz new file mode 100644 index 0000000..13c7649 --- /dev/null +++ b/_traefik/dynamic/_templates/runtipi-apps.yml.sz @@ -0,0 +1,37 @@ +http: + routers: + # code-server: + # middlewares: + # - authentik_sysmgr@file + # sonarr: + # middlewares: + # - authentik_sysmgr@file + + forgejo-more: + service: forgejo@docker + rule: Host(`code.lksz.me`) + entrypoints: + - websecure + tls: + certresolver: myresolver + + traefik-dashboard: + service: dashboard@internal + rule: Host(`tfk.szk.li`) && PathPrefix(`/`) + entrypoints: + - websecure + tls: + certresolver: myresolver + middlewares: + - authentik_sysmgr@file + - dashboard_redirect@internal + + traefik-api: + service: api@internal + rule: Host(`tfk.szk.li`) && PathPrefix(`/api`) + entrypoints: + - websecure + tls: + certresolver: myresolver + middlewares: + - authentik_sysmgr@file \ No newline at end of file