diff --git a/_bin/rtpctl.d b/_bin/rtpctl.d index fd3bcd1..55d6b68 100755 --- a/_bin/rtpctl.d +++ b/_bin/rtpctl.d @@ -2,8 +2,6 @@ RPH_UID=${RPH_UID:-${UID}} -[ "${SUDO}" == "sudo" ] || SUDO= - # Identify source path (even if symlinked) SOURCE=${BASH_SOURCE[0]} while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink @@ -52,7 +50,7 @@ dls() { local base='{{.Status}}\t{{.ID}}\t{{.Names}}\t{{.Image}}' #'\t{{.Networks}}\t{{.Ports}}\t{{.Mounts}}' local compose='{{.Label "com.docker.compose.project"}}\t{{.Label "com.docker.compose.service"}}' local format="table $compose\t$base" - ${SUDO} docker container ls --all --format "$format" | (sed -u '1s/.*/\U&/; q'; sort-tipi) + docker container ls --all --format "$format" | (sed -u '1s/.*/\U&/; q'; sort-tipi) } get-docker-list() { @@ -61,7 +59,7 @@ get-docker-list() { local PP2='s/ ix-/\nix-/g; s/(^|\n)ix-/\1/g;' local PP3='' local PP_SORT='| sort-tipi' - local SRC="" SRC_DOCKER="${SUDO} docker ps -a --format '{{.Label \"com.docker.compose.project\"}}@{{.Names}}' | sed -Ee 's/^@/<_no-compose-project_>:/;'" + local SRC="" SRC_DOCKER="docker ps -a --format '{{.Label \"com.docker.compose.project\"}}@{{.Names}}' | sed -Ee 's/^@/<_no-compose-project_>:/;'" local FILTER="" local LIST='' local MK_SEARCH_LIST="| xargs -r | sed 's/@//g; s/^/^(/; s/ *$/)@/; s/ /|/g;'" @@ -100,10 +98,10 @@ get-docker-list() { PP2='' ;; ix|truenas) - LIST="${SUDO} find /mnt/.ix-apps/app_configs/* -maxdepth 0 -printf 'ix-%f@ '" + LIST="find /mnt/.ix-apps/app_configs/* -maxdepth 0 -printf 'ix-%f@ '" ;; tp|runtipi) - LIST="${SUDO} find apps/* -maxdepth 0 -printf '%f@ ' ; echo runtipi" + LIST="find apps/* -maxdepth 0 -printf '%f@ ' ; echo runtipi" ;; other) FILTER="grep -vE \""$(get-docker-list ix -G)"\" | grep -vE \""$(get-docker-list tp -G)"\"" @@ -171,7 +169,7 @@ runtipi-app-docker-compose() { fi local APP="${1:-Must supply app name}" - ${SUDO} docker compose \ + docker compose \ $(append_file_param --env-file user-config/.env.local) \ $(append_file_param --env-file app-data/${APP}/app.env) \ $(append_file_param --env-file user-config/${APP}/app.env) \ @@ -196,18 +194,18 @@ ix-app-docker-compose() { local APP="${1:-Must supply app name}" DCSRC="$( - ${SUDO} find /mnt/.ix-apps/app_configs/ -type f \ + find /mnt/.ix-apps/app_configs/ -type f \ -path "*/${APP}/*/rendered/docker-compose.yaml" -printf '%T@ %p\n' \ | sort -n | cut -d' ' -f2- | head -1 )" set -x - ${SUDO} docker compose "--file=${DCSRC}" "--project-name=ix-${APP}" ${2:-ps -a} ${3:+"${@:3}"} + docker compose "--file=${DCSRC}" "--project-name=ix-${APP}" ${2:-ps -a} ${3:+"${@:3}"} } link-exists() { local EXIT_CODE=0 printf 'Current status:\n link: ' - ${SUDO} ip -br -c link show "${1:?Must supply device name}" 2>&1 || return 1 + ip -br -c link show "${1:?Must supply device name}" 2>&1 || return 1 } manage-ipvlan() { @@ -221,19 +219,19 @@ manage-ipvlan() { case "${1}" in rm) manage-ipvlan status "${IPVLAN_IF}" && ( \ - ${SUDO} ip link delete "${IPVLAN_IF}" \ + ip link delete "${IPVLAN_IF}" \ && printf '%s\n' "${IPVLAN_IF} removed" ) || return 1 ;; add) link-exists "${IPVLAN_IF}" > /dev/null 2>&1 \ && link-exists "${IPVLAN_IF}" || ( \ - ${SUDO} ip link add "${IPVLAN_IF}" link "${NET_IF}" type ipvlan mode l2 \ - && ${SUDO} ip addr add ${NET_IP} dev "${IPVLAN_IF}" \ - && ${SUDO} ip link set "${IPVLAN_IF}" up \ + ip link add "${IPVLAN_IF}" link "${NET_IF}" type ipvlan mode l2 \ + && ip addr add ${NET_IP} dev "${IPVLAN_IF}" \ + && ip link set "${IPVLAN_IF}" up \ && printf '%s\n' "${IPVLAN_IF} created"\ && link-exists "${IPVLAN_IF}" \ - || ${SUDO} ip link delete "${IPVLAN_IF}" + || ip link delete "${IPVLAN_IF}" ) ;; route) @@ -243,9 +241,9 @@ manage-ipvlan() { && for IP in "${@:3}"; do # Only add route if it does not already exists printf 'Adding route for %-15s ' "$IP" - ${SUDO} ip route get "$IP" 2> /dev/null | grep -q "dev ${IPVLAN_IF} src ${NET_IP//\./\\.}" \ + ip route get "$IP" 2> /dev/null | grep -q "dev ${IPVLAN_IF} src ${NET_IP//\./\\.}" \ && printf 'Skipping, already exists.' \ - || ${SUDO} ip route add "$IP" dev "${IPVLAN_IF}" \ + || ip route add "$IP" dev "${IPVLAN_IF}" \ && printf '\n' \ || (printf 'Could NOT add %s\n' "$IP" >&2; return 1) done @@ -260,7 +258,7 @@ manage-ipvlan() { "$(manage-ipvlan status)" "" ""\ "" "" ""\ "Usage:" "" ""\ - " [SUDO=sudo] ${BASE_NAME} ipvlan " "" ""\ + " ${BASE_NAME} ipvlan " "" ""\ "" "" "" \ "Available commands:" "" ""\ "" "" "" \ @@ -273,7 +271,7 @@ manage-ipvlan() { ( printf 'addr: ' && ip -4 -br -c addr show "${IPVLAN_IF}" \ && printf 'Routes:\n' \ - && ${SUDO} ip -c route show dev "${IPVLAN_IF}" \ + && ip -c route show dev "${IPVLAN_IF}" \ | awk '{print} END{if (NR==0) print ""}' ) 2>&1 | sed -e '/[^:]$/s/^/ /' \ || return 1 @@ -322,14 +320,11 @@ case "${1}" in edit) ${VISUAL:-${EDITOR:-vi}} $0 ;; - _load) - echo "alias ${BASE_NAME}cd='cd \"$SCRIPT_DIR/..\"'" - ;; *) printf '%s %-12s %s\n' \ "" "" ""\ "Usage:" "" ""\ - " [SUDO=sudo] ${BASE_NAME} [args...]" "" ""\ + " ${BASE_NAME} [args...]" "" ""\ "" "" "" \ "Available commands:" "" ""\ "" "" "" \ diff --git a/_traefik/dynamic/_templates/mw.fwd-auth-sysmgr.yml.wolfpack b/_traefik/dynamic/_templates/mw.fwd-auth-sysmgr.yml.shefet similarity index 100% rename from _traefik/dynamic/_templates/mw.fwd-auth-sysmgr.yml.wolfpack rename to _traefik/dynamic/_templates/mw.fwd-auth-sysmgr.yml.shefet diff --git a/_traefik/dynamic/_templates/rt.ha.yml.wolfpack b/_traefik/dynamic/_templates/rt.ha.yml.shefet similarity index 92% rename from _traefik/dynamic/_templates/rt.ha.yml.wolfpack rename to _traefik/dynamic/_templates/rt.ha.yml.shefet index 715c961..774b6ea 100644 --- a/_traefik/dynamic/_templates/rt.ha.yml.wolfpack +++ b/_traefik/dynamic/_templates/rt.ha.yml.shefet @@ -7,8 +7,8 @@ http: entrypoints: - websecure # # If the rule matches, applies the middleware - # middlewares: - # - trustedHeaders + # middlewares: + # - test-user # If the rule matches, forward to the whoami service (declared below) service: home-assistant tls: @@ -21,4 +21,3 @@ http: servers: - url: "http://ha.lan:8123" #- address: "ha.lan:8123" - diff --git a/_traefik/dynamic/mw.lan-only.yml b/_traefik/dynamic/mw.lan-only.yml index 2117f6d..0cab8f0 100644 --- a/_traefik/dynamic/mw.lan-only.yml +++ b/_traefik/dynamic/mw.lan-only.yml @@ -5,5 +5,4 @@ http: ipWhiteList: sourceRange: - "127.0.0.1/32" - - "192.168.0.0/16" - + - "192.168.0.0/16" \ No newline at end of file