From d98050129aab6fbddf98fa83c25ee8a6cb7e45f3 Mon Sep 17 00:00:00 2001 From: Paul Wako Date: Mon, 28 Dec 2020 19:38:09 -0500 Subject: [PATCH] use proper HOME/USER vars --- fogcutter/podman/airsonic.sh | 4 ++-- fogcutter/podman/gitea.sh | 4 ++-- fogcutter/podman/jellyfin.sh | 4 ++-- fogcutter/podman/minecraft.sh | 4 ++-- fogcutter/podman/nextcloud/nextcloud.sh | 10 +++++----- fogcutter/podman/nginx.sh | 4 ++-- fogcutter/podman/plex.sh | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fogcutter/podman/airsonic.sh b/fogcutter/podman/airsonic.sh index 0601bca..40d9d7b 100755 --- a/fogcutter/podman/airsonic.sh +++ b/fogcutter/podman/airsonic.sh @@ -3,7 +3,7 @@ set -e up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman network create pew-net || true # Exposed on port 4040 in pew-net @@ -19,7 +19,7 @@ up () { --network pew-net \ linuxserver/airsonic:v10.6.2-ls83 - podman generate systemd airsonic --restart-policy=always --name > ~/.config/systemd/user/airsonic.service + podman generate systemd airsonic --restart-policy=always --name > $HOME/.config/systemd/user/airsonic.service systemctl --user daemon-reload systemctl start --user airsonic || systemctl restart --user airsonic systemctl enable --user airsonic diff --git a/fogcutter/podman/gitea.sh b/fogcutter/podman/gitea.sh index bc04211..dd8d2ed 100755 --- a/fogcutter/podman/gitea.sh +++ b/fogcutter/podman/gitea.sh @@ -3,7 +3,7 @@ set -e up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman network create pew-net || true # Exposed on port 3000 in pew-net @@ -25,7 +25,7 @@ up () { --network pew-net \ gitea/gitea:1.12.5 - podman generate systemd gitea --restart-policy=always --name > ~/.config/systemd/user/gitea.service + podman generate systemd gitea --restart-policy=always --name > $HOME/.config/systemd/user/gitea.service systemctl --user daemon-reload systemctl start --user gitea || systemctl restart --user gitea systemctl enable --user gitea diff --git a/fogcutter/podman/jellyfin.sh b/fogcutter/podman/jellyfin.sh index 44a7eab..706576a 100755 --- a/fogcutter/podman/jellyfin.sh +++ b/fogcutter/podman/jellyfin.sh @@ -3,7 +3,7 @@ set -e up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman network create pew-net || true # Exposed on port 8096 in pew-net @@ -19,7 +19,7 @@ up () { --network pew-net \ ghcr.io/linuxserver/jellyfin:10.6.4-1-ls89 - podman generate systemd jellyfin --restart-policy=always --name > ~/.config/systemd/user/jellyfin.service + podman generate systemd jellyfin --restart-policy=always --name > $HOME/.config/systemd/user/jellyfin.service systemctl --user daemon-reload systemctl start --user jellyfin || systemctl restart --user jellyfin systemctl enable --user jellyfin diff --git a/fogcutter/podman/minecraft.sh b/fogcutter/podman/minecraft.sh index db3163a..97352d3 100755 --- a/fogcutter/podman/minecraft.sh +++ b/fogcutter/podman/minecraft.sh @@ -3,7 +3,7 @@ set -e up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman create \ --name minecraft \ @@ -14,7 +14,7 @@ up () { --publish 127.0.0.1:25565:25565 \ itzg/minecraft-server:latest - podman generate systemd minecraft --restart-policy=always --name > ~/.config/systemd/user/minecraft.service + podman generate systemd minecraft --restart-policy=always --name > $HOME/.config/systemd/user/minecraft.service systemctl --user daemon-reload systemctl start --user minecraft || systemctl restart --user minecraft systemctl enable --user minecraft diff --git a/fogcutter/podman/nextcloud/nextcloud.sh b/fogcutter/podman/nextcloud/nextcloud.sh index 913082a..ffa3ff6 100755 --- a/fogcutter/podman/nextcloud/nextcloud.sh +++ b/fogcutter/podman/nextcloud/nextcloud.sh @@ -5,7 +5,7 @@ set -e # to scan new files: k exec --stdin --tty nextcloud-POD -npew -- /bin/bash -c "/var/www/html/occ files:scan --path='/USER/files'" up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman network create pew-net || true # Exposed on port 80 in pew-net @@ -24,7 +24,7 @@ up () { --network pew-net \ nextcloud:20.0.1-apache - podman generate systemd nextcloud --restart-policy=always --name > ~/.config/systemd/user/nextcloud.service + podman generate systemd nextcloud --restart-policy=always --name > $HOME/.config/systemd/user/nextcloud.service systemctl --user daemon-reload systemctl start --user nextcloud || systemctl restart --user nextcloud systemctl enable --user nextcloud @@ -40,7 +40,7 @@ up () { --network pew-net \ mariadb:10.5.6 - podman generate systemd nextcloud-mariadb --restart-policy=always --name > ~/.config/systemd/user/nextcloud-mariadb.service + podman generate systemd nextcloud-mariadb --restart-policy=always --name > $HOME/.config/systemd/user/nextcloud-mariadb.service systemctl --user daemon-reload systemctl start --user nextcloud-mariadb || systemctl restart --user nextcloud-mariadb systemctl enable --user nextcloud-mariadb @@ -51,12 +51,12 @@ up () { --network pew-net \ redis:6.0.9 --requirepass nextcloud - podman generate systemd nextcloud-redis --restart-policy=always --name > ~/.config/systemd/user/nextcloud-redis.service + podman generate systemd nextcloud-redis --restart-policy=always --name > $HOME/.config/systemd/user/nextcloud-redis.service systemctl --user daemon-reload systemctl start --user nextcloud-redis || systemctl restart --user nextcloud-redis systemctl enable --user nextcloud-redis - cp nextcloud-cron.service nextcloud-cron.timer ~/.config/systemd/user/ + cp nextcloud-cron.service nextcloud-cron.timer $HOME/.config/systemd/user/ systemctl start --user nextcloud-cron.timer || systemctl restart --user nextcloud-cron.timer systemctl enable --user nextcloud-cron.timer } diff --git a/fogcutter/podman/nginx.sh b/fogcutter/podman/nginx.sh index 537048f..88bd9a2 100755 --- a/fogcutter/podman/nginx.sh +++ b/fogcutter/podman/nginx.sh @@ -3,7 +3,7 @@ set -e up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman network create pew-net || true # main nginx container @@ -25,7 +25,7 @@ up () { --network pew-net \ linuxserver/swag:1.10.1-ls29 - podman generate systemd nginx --restart-policy=always --name > ~/.config/systemd/user/nginx.service + podman generate systemd nginx --restart-policy=always --name > $HOME/.config/systemd/user/nginx.service systemctl --user daemon-reload systemctl start --user nginx || systemctl restart --user nginx systemctl enable --user nginx diff --git a/fogcutter/podman/plex.sh b/fogcutter/podman/plex.sh index a09f944..db4f6b8 100755 --- a/fogcutter/podman/plex.sh +++ b/fogcutter/podman/plex.sh @@ -3,7 +3,7 @@ set -e up () { - loginctl enable-linger paul + loginctl enable-linger $USER podman network create pew-net || true # Exposed on port 32400 in pew-net @@ -19,7 +19,7 @@ up () { --network pew-net \ linuxserver/plex:1.20.3.3483-211702a9f-ls122 - podman generate systemd plex --restart-policy=always --name > ~/.config/systemd/user/plex.service + podman generate systemd plex --restart-policy=always --name > $HOME/.config/systemd/user/plex.service systemctl --user daemon-reload systemctl start --user plex || systemctl restart --user plex systemctl enable --user plex