szmedia
/
my-runtipi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add SUDO support to rtpctl.d + _load

This commit is contained in:
Lockszmith (@wolfpack) 2025-02-26 23:55:11 -05:00
parent a45d393b8e
commit 9c01302f6e
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
_bin/rtpctl.d
View File

@ -2,6 +2,8 @@
RPH_UID=${RPH_UID:-${UID}} RPH_UID=${RPH_UID:-${UID}}
[ "${SUDO}" == "sudo" ] || SUDO=
# Identify source path (even if symlinked) # Identify source path (even if symlinked)
SOURCE=${BASH_SOURCE[0]} SOURCE=${BASH_SOURCE[0]}
while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink while [ -L "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
@ -50,7 +52,7 @@ dls() {
local base='{{.Status}}\t{{.ID}}\t{{.Names}}\t{{.Image}}' #'\t{{.Networks}}\t{{.Ports}}\t{{.Mounts}}' 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 compose='{{.Label "com.docker.compose.project"}}\t{{.Label "com.docker.compose.service"}}'
local format="table $compose\t$base" local format="table $compose\t$base"
docker container ls --all --format "$format" | (sed -u '1s/.*/\U&/; q'; sort-tipi) ${SUDO} docker container ls --all --format "$format" | (sed -u '1s/.*/\U&/; q'; sort-tipi)
} }
get-docker-list() { get-docker-list() {
@ -59,7 +61,7 @@ get-docker-list() {
local PP2='s/ ix-/\nix-/g; s/(^|\n)ix-/\1/g;' local PP2='s/ ix-/\nix-/g; s/(^|\n)ix-/\1/g;'
local PP3='' local PP3=''
local PP_SORT='| sort-tipi' local PP_SORT='| sort-tipi'
local SRC="" SRC_DOCKER="docker ps -a --format '{{.Label \"com.docker.compose.project\"}}@{{.Names}}' | sed -Ee 's/^@/<_no-compose-project_>:/;'" local SRC="" SRC_DOCKER="${SUDO} docker ps -a --format '{{.Label \"com.docker.compose.project\"}}@{{.Names}}' | sed -Ee 's/^@/<_no-compose-project_>:/;'"
local FILTER="" local FILTER=""
local LIST='' local LIST=''
local MK_SEARCH_LIST="| xargs -r | sed 's/@//g; s/^/^(/; s/ *$/)@/; s/ /|/g;'" local MK_SEARCH_LIST="| xargs -r | sed 's/@//g; s/^/^(/; s/ *$/)@/; s/ /|/g;'"
@ -98,10 +100,10 @@ get-docker-list() {
PP2='' PP2=''
;; ;;
ix|truenas) ix|truenas)
LIST="find /mnt/.ix-apps/app_configs/* -maxdepth 0 -printf 'ix-%f@ '" LIST="${SUDO} find /mnt/.ix-apps/app_configs/* -maxdepth 0 -printf 'ix-%f@ '"
;; ;;
tp|runtipi) tp|runtipi)
LIST="find apps/* -maxdepth 0 -printf '%f@ ' ; echo runtipi" LIST="${SUDO} find apps/* -maxdepth 0 -printf '%f@ ' ; echo runtipi"
;; ;;
other) other)
FILTER="grep -vE \""$(get-docker-list ix -G)"\" | grep -vE \""$(get-docker-list tp -G)"\"" FILTER="grep -vE \""$(get-docker-list ix -G)"\" | grep -vE \""$(get-docker-list tp -G)"\""
@ -169,7 +171,7 @@ runtipi-app-docker-compose() {
fi fi
local APP="${1:-Must supply app name}" local APP="${1:-Must supply app name}"
docker compose \ ${SUDO} docker compose \
$(append_file_param --env-file user-config/.env.local) \ $(append_file_param --env-file user-config/.env.local) \
$(append_file_param --env-file app-data/${APP}/app.env) \ $(append_file_param --env-file app-data/${APP}/app.env) \
$(append_file_param --env-file user-config/${APP}/app.env) \ $(append_file_param --env-file user-config/${APP}/app.env) \
@ -194,18 +196,18 @@ ix-app-docker-compose() {
local APP="${1:-Must supply app name}" local APP="${1:-Must supply app name}"
DCSRC="$( DCSRC="$(
find /mnt/.ix-apps/app_configs/ -type f \ ${SUDO} find /mnt/.ix-apps/app_configs/ -type f \
-path "*/${APP}/*/rendered/docker-compose.yaml" -printf '%T@ %p\n' \ -path "*/${APP}/*/rendered/docker-compose.yaml" -printf '%T@ %p\n' \
| sort -n | cut -d' ' -f2- | head -1 | sort -n | cut -d' ' -f2- | head -1
)" )"
set -x set -x
docker compose "--file=${DCSRC}" "--project-name=ix-${APP}" ${2:-ps -a} ${3:+"${@:3}"} ${SUDO} docker compose "--file=${DCSRC}" "--project-name=ix-${APP}" ${2:-ps -a} ${3:+"${@:3}"}
} }
link-exists() { link-exists() {
local EXIT_CODE=0 local EXIT_CODE=0
printf 'Current status:\n link: ' printf 'Current status:\n link: '
ip -br -c link show "${1:?Must supply device name}" 2>&1 || return 1 ${SUDO} ip -br -c link show "${1:?Must supply device name}" 2>&1 || return 1
} }
manage-ipvlan() { manage-ipvlan() {
@ -219,19 +221,19 @@ manage-ipvlan() {
case "${1}" in case "${1}" in
rm) rm)
manage-ipvlan status "${IPVLAN_IF}" && ( \ manage-ipvlan status "${IPVLAN_IF}" && ( \
ip link delete "${IPVLAN_IF}" \ ${SUDO} ip link delete "${IPVLAN_IF}" \
&& printf '%s\n' "${IPVLAN_IF} removed" && printf '%s\n' "${IPVLAN_IF} removed"
) || return 1 ) || return 1
;; ;;
add) add)
link-exists "${IPVLAN_IF}" > /dev/null 2>&1 \ link-exists "${IPVLAN_IF}" > /dev/null 2>&1 \
&& link-exists "${IPVLAN_IF}" || ( \ && link-exists "${IPVLAN_IF}" || ( \
ip link add "${IPVLAN_IF}" link "${NET_IF}" type ipvlan mode l2 \ ${SUDO} ip link add "${IPVLAN_IF}" link "${NET_IF}" type ipvlan mode l2 \
&& ip addr add ${NET_IP} dev "${IPVLAN_IF}" \ && ${SUDO} ip addr add ${NET_IP} dev "${IPVLAN_IF}" \
&& ip link set "${IPVLAN_IF}" up \ && ${SUDO} ip link set "${IPVLAN_IF}" up \
&& printf '%s\n' "${IPVLAN_IF} created"\ && printf '%s\n' "${IPVLAN_IF} created"\
&& link-exists "${IPVLAN_IF}" \ && link-exists "${IPVLAN_IF}" \
|| ip link delete "${IPVLAN_IF}" || ${SUDO} ip link delete "${IPVLAN_IF}"
) )
;; ;;
route) route)
@ -241,9 +243,9 @@ manage-ipvlan() {
&& for IP in "${@:3}"; do && for IP in "${@:3}"; do
# Only add route if it does not already exists # Only add route if it does not already exists
printf 'Adding route for %-15s ' "$IP" printf 'Adding route for %-15s ' "$IP"
ip route get "$IP" 2> /dev/null | grep -q "dev ${IPVLAN_IF} src ${NET_IP//\./\\.}" \ ${SUDO} ip route get "$IP" 2> /dev/null | grep -q "dev ${IPVLAN_IF} src ${NET_IP//\./\\.}" \
&& printf 'Skipping, already exists.' \ && printf 'Skipping, already exists.' \
|| ip route add "$IP" dev "${IPVLAN_IF}" \ || ${SUDO} ip route add "$IP" dev "${IPVLAN_IF}" \
&& printf '\n' \ && printf '\n' \
|| (printf 'Could NOT add %s\n' "$IP" >&2; return 1) || (printf 'Could NOT add %s\n' "$IP" >&2; return 1)
done done
@ -258,7 +260,7 @@ manage-ipvlan() {
"$(manage-ipvlan status)" "" ""\ "$(manage-ipvlan status)" "" ""\
"" "" ""\ "" "" ""\
"Usage:" "" ""\ "Usage:" "" ""\
" ${BASE_NAME} ipvlan <command>" "" ""\ " [SUDO=sudo] ${BASE_NAME} ipvlan <command>" "" ""\
"" "" "" \ "" "" "" \
"Available commands:" "" ""\ "Available commands:" "" ""\
"" "" "" \ "" "" "" \
@ -271,7 +273,7 @@ manage-ipvlan() {
( printf 'addr: ' && ip -4 -br -c addr show "${IPVLAN_IF}" \ ( printf 'addr: ' && ip -4 -br -c addr show "${IPVLAN_IF}" \
&& printf 'Routes:\n' \ && printf 'Routes:\n' \
&& ip -c route show dev "${IPVLAN_IF}" \ && ${SUDO} ip -c route show dev "${IPVLAN_IF}" \
| awk '{print} END{if (NR==0) print "<none found>"}' | awk '{print} END{if (NR==0) print "<none found>"}'
) 2>&1 | sed -e '/[^:]$/s/^/ /' \ ) 2>&1 | sed -e '/[^:]$/s/^/ /' \
|| return 1 || return 1
@ -320,11 +322,14 @@ case "${1}" in
edit) edit)
${VISUAL:-${EDITOR:-vi}} $0 ${VISUAL:-${EDITOR:-vi}} $0
;; ;;
_load)
echo "alias ${BASE_NAME}cd='cd \"$SCRIPT_DIR/..\"'"
;;
*) *)
printf '%s %-12s %s\n' \ printf '%s %-12s %s\n' \
"" "" ""\ "" "" ""\
"Usage:" "" ""\ "Usage:" "" ""\
" ${BASE_NAME} <command> [args...]" "" ""\ " [SUDO=sudo] ${BASE_NAME} <command> [args...]" "" ""\
"" "" "" \ "" "" "" \
"Available commands:" "" ""\ "Available commands:" "" ""\
"" "" "" \ "" "" "" \