From e8c9875d9f3725989b05baa73cf9a9bd6da1812c Mon Sep 17 00:00:00 2001
From: Paul Walko <paul@walko.org>
Date: Sun, 27 Dec 2020 03:14:45 -0500
Subject: [PATCH] use more efficient ordering

---
 fogcutter/podman/airsonic.sh            | 2 +-
 fogcutter/podman/gitea.sh               | 2 +-
 fogcutter/podman/minecraft.sh           | 2 +-
 fogcutter/podman/nextcloud/nextcloud.sh | 8 ++++----
 fogcutter/podman/nginx.sh               | 4 ++--
 fogcutter/podman/plex.sh                | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fogcutter/podman/airsonic.sh b/fogcutter/podman/airsonic.sh
index b94b761..0601bca 100755
--- a/fogcutter/podman/airsonic.sh
+++ b/fogcutter/podman/airsonic.sh
@@ -21,7 +21,7 @@ up () {
 
   podman generate systemd airsonic --restart-policy=always --name > ~/.config/systemd/user/airsonic.service
   systemctl --user daemon-reload
-  systemctl restart --user airsonic || systemctl start --user airsonic
+  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 0b4d589..bc04211 100755
--- a/fogcutter/podman/gitea.sh
+++ b/fogcutter/podman/gitea.sh
@@ -27,7 +27,7 @@ up () {
 
   podman generate systemd gitea --restart-policy=always --name > ~/.config/systemd/user/gitea.service
   systemctl --user daemon-reload
-  systemctl restart --user gitea || systemctl start --user gitea
+  systemctl start --user gitea || systemctl restart --user gitea
   systemctl enable --user gitea
 }
 
diff --git a/fogcutter/podman/minecraft.sh b/fogcutter/podman/minecraft.sh
index b0e39f3..db3163a 100755
--- a/fogcutter/podman/minecraft.sh
+++ b/fogcutter/podman/minecraft.sh
@@ -16,7 +16,7 @@ up () {
 
   podman generate systemd minecraft --restart-policy=always --name > ~/.config/systemd/user/minecraft.service
   systemctl --user daemon-reload
-  systemctl restart --user minecraft || systemctl start --user minecraft
+  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 66324c7..6df1dfd 100755
--- a/fogcutter/podman/nextcloud/nextcloud.sh
+++ b/fogcutter/podman/nextcloud/nextcloud.sh
@@ -26,7 +26,7 @@ up () {
 
   podman generate systemd nextcloud --restart-policy=always --name > ~/.config/systemd/user/nextcloud.service
   systemctl --user daemon-reload
-  systemctl restart --user nextcloud || systemctl start --user nextcloud
+  systemctl start --user nextcloud || systemctl restart --user nextcloud
   systemctl enable --user nextcloud
 
   # Exposed on port 3306 in pew-net
@@ -42,7 +42,7 @@ up () {
 
   podman generate systemd nextcloud-mariadb --restart-policy=always --name > ~/.config/systemd/user/nextcloud-mariadb.service
   systemctl --user daemon-reload
-  systemctl restart --user nextcloud-mariadb || systemctl start --user nextcloud-mariadb
+  systemctl start --user nextcloud-mariadb || systemctl restart --user nextcloud-mariadb
   systemctl enable --user nextcloud-mariadb
 
   # Exposed on port 6379 in pew-net
@@ -53,11 +53,11 @@ up () {
 
   podman generate systemd nextcloud-redis --restart-policy=always --name > ~/.config/systemd/user/nextcloud-redis.service
   systemctl --user daemon-reload
-  systemctl restart --user nextcloud-redis || systemctl start --user nextcloud-redis
+  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/
-  systemctl restart --user nextcloud-cron.timer || systemctl start --user nextcloud-cron.timer
+  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 bb69eae..537048f 100755
--- a/fogcutter/podman/nginx.sh
+++ b/fogcutter/podman/nginx.sh
@@ -13,7 +13,7 @@ up () {
     --env GUID=1000 \
     --env TZ=US/Eastern \
     --env URL=seaturtle.pw \
-    --env SUBDOMAINS=airsonic,git,nc,plex \
+    --env SUBDOMAINS=airsonic,git,jf,nc,plex \
     --env VALIDATION=http \
     --env EMAIL=paulsw.pw@gmail.com \
     --volume /bigdata/k8s-config/nginx/config:/config:rw \
@@ -27,7 +27,7 @@ up () {
 
   podman generate systemd nginx --restart-policy=always --name > ~/.config/systemd/user/nginx.service
   systemctl --user daemon-reload
-  systemctl restart --user nginx || systemctl start --user nginx
+  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 e9158f9..a09f944 100755
--- a/fogcutter/podman/plex.sh
+++ b/fogcutter/podman/plex.sh
@@ -21,7 +21,7 @@ up () {
 
   podman generate systemd plex --restart-policy=always --name > ~/.config/systemd/user/plex.service
   systemctl --user daemon-reload
-  systemctl restart --user plex || systemctl start --user plex
+  systemctl start --user plex || systemctl restart --user plex
   systemctl enable --user plex
 }