From 1eb5ce8a1f709c7ff76962e6e6e38d0d1007e5ec Mon Sep 17 00:00:00 2001
From: Lexie Malina <alex@t-ch.net>
Date: Sat, 18 Nov 2023 10:01:10 -0600
Subject: [PATCH] Organized and labeled added nextcloud mariadb as seperate
 container

---
 ...e1af2539e3c84415178c8e9c2950a620c5.service | 38 -------------------
 ...c7f76a2c5ab9940953452188ce74e3bce1.service | 33 ----------------
 .../container-jellyfin.service                |  0
 .../container-matomo-mariadb.service          |  0
 .../container-matomo-server.service           |  0
 .../container-nextcloud-mariadb.service       | 14 ++++---
 .../container-nextcloud.service               |  4 +-
 .../container-shlink-mariadb.service          |  0
 .../container-shlink.service                  |  0
 9 files changed, 10 insertions(+), 79 deletions(-)
 delete mode 100644 container-0a945a13b7f890dc75c797c8bca734e1af2539e3c84415178c8e9c2950a620c5.service
 delete mode 100644 container-47f7cfe0695c9d0f5062a2215a58f9c7f76a2c5ab9940953452188ce74e3bce1.service
 rename container-cf53a61f24ddcf92f5a9ea5d8d5923148ed3b12ddd114cbd9157cd33c5af8bac.service => jellyfin/container-jellyfin.service (100%)
 rename container-2334b190834d2954b2853f7cc1b669487c4d825a11b437b9370033b41fe98d5b.service => matomo/container-matomo-mariadb.service (100%)
 rename container-9de10099b45d693f1f5f41d2f2fcaa806100e34b77fe5eaa9a486a027d3016cb.service => matomo/container-matomo-server.service (100%)
 rename container-08f507142e8ea1493420c7b5a156d9ea9adfdaad1bbcb9521a349fbe259e9988.service => nextcloud/container-nextcloud-mariadb.service (66%)
 rename container-b0a5a44a70b7479075434443fbb42b228c6526c3ebfdf59a3435a9c0011d2ccd.service => nextcloud/container-nextcloud.service (89%)
 rename container-3847701a67b03c162b5918c568a9e44c4bc924f1a8eaf8399a009f169ba8b599.service => shlink/container-shlink-mariadb.service (100%)
 rename container-9cdeb424db89d24bb502d0147819bf23c0ad46f29d193e57d8f7dfa1c905f2b9.service => shlink/container-shlink.service (100%)

diff --git a/container-0a945a13b7f890dc75c797c8bca734e1af2539e3c84415178c8e9c2950a620c5.service b/container-0a945a13b7f890dc75c797c8bca734e1af2539e3c84415178c8e9c2950a620c5.service
deleted file mode 100644
index 9567bc1..0000000
--- a/container-0a945a13b7f890dc75c797c8bca734e1af2539e3c84415178c8e9c2950a620c5.service
+++ /dev/null
@@ -1,38 +0,0 @@
-# container-0a945a13b7f890dc75c797c8bca734e1af2539e3c84415178c8e9c2950a620c5.service
-# autogenerated by Podman 4.4.1
-# Fri Jul 21 13:39:30 EDT 2023
-
-[Unit]
-Description=Podman flaresolverr
-Documentation=man:podman-generate-systemd(1)
-Wants=network-online.target
-After=network-online.target
-RequiresMountsFor=%t/containers
-
-[Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=on-failure
-TimeoutStopSec=70
-ExecStart=/usr/bin/podman run \
-	--cidfile=%t/%n.ctr-id \
-	--cgroups=no-conmon \
-	--rm \
-	--sdnotify=conmon \
-	--replace \
-	--label io.containers.autoupdate=registry \
-	-d \
-	--pod jellyfin \
-	--name flaresolverr \
-	-e LOG_LEVEL=info ghcr.io/flaresolverr/flaresolverr:latest
-ExecStop=/usr/bin/podman stop \
-	--ignore -t 10 \
-	--cidfile=%t/%n.ctr-id
-ExecStopPost=/usr/bin/podman rm \
-	-f \
-	--ignore -t 10 \
-	--cidfile=%t/%n.ctr-id
-Type=notify
-NotifyAccess=all
-
-[Install]
-WantedBy=default.target
diff --git a/container-47f7cfe0695c9d0f5062a2215a58f9c7f76a2c5ab9940953452188ce74e3bce1.service b/container-47f7cfe0695c9d0f5062a2215a58f9c7f76a2c5ab9940953452188ce74e3bce1.service
deleted file mode 100644
index 6cde285..0000000
--- a/container-47f7cfe0695c9d0f5062a2215a58f9c7f76a2c5ab9940953452188ce74e3bce1.service
+++ /dev/null
@@ -1,33 +0,0 @@
-# container-47f7cfe0695c9d0f5062a2215a58f9c7f76a2c5ab9940953452188ce74e3bce1.service
-# autogenerated by Podman 4.2.0
-# Wed Apr  5 11:48:27 EDT 2023
-
-[Unit]
-Description=Podman ombi container
-Documentation=man:podman-generate-systemd(1)
-Wants=network-online.target
-After=network-online.target
-RequiresMountsFor=%t/containers
-
-[Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=on-failure
-TimeoutStopSec=70
-ExecStartPre=/bin/rm -f %t/%n.ctr-id
-ExecStart=/usr/bin/podman run \
-	--cidfile=%t/%n.ctr-id \
-	--cgroups=no-conmon \
-	--rm \
-	--sdnotify=conmon \
-	--replace \
-	--label io.containers.autoupdate=registry \
-	-d \
-	-p 3579:3579 \
-	--name=ombi docker.io/linuxserver/ombi:latest
-ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
-ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
-Type=notify
-NotifyAccess=all
-
-[Install]
-WantedBy=default.target
diff --git a/container-cf53a61f24ddcf92f5a9ea5d8d5923148ed3b12ddd114cbd9157cd33c5af8bac.service b/jellyfin/container-jellyfin.service
similarity index 100%
rename from container-cf53a61f24ddcf92f5a9ea5d8d5923148ed3b12ddd114cbd9157cd33c5af8bac.service
rename to jellyfin/container-jellyfin.service
diff --git a/container-2334b190834d2954b2853f7cc1b669487c4d825a11b437b9370033b41fe98d5b.service b/matomo/container-matomo-mariadb.service
similarity index 100%
rename from container-2334b190834d2954b2853f7cc1b669487c4d825a11b437b9370033b41fe98d5b.service
rename to matomo/container-matomo-mariadb.service
diff --git a/container-9de10099b45d693f1f5f41d2f2fcaa806100e34b77fe5eaa9a486a027d3016cb.service b/matomo/container-matomo-server.service
similarity index 100%
rename from container-9de10099b45d693f1f5f41d2f2fcaa806100e34b77fe5eaa9a486a027d3016cb.service
rename to matomo/container-matomo-server.service
diff --git a/container-08f507142e8ea1493420c7b5a156d9ea9adfdaad1bbcb9521a349fbe259e9988.service b/nextcloud/container-nextcloud-mariadb.service
similarity index 66%
rename from container-08f507142e8ea1493420c7b5a156d9ea9adfdaad1bbcb9521a349fbe259e9988.service
rename to nextcloud/container-nextcloud-mariadb.service
index 1f0c388..21ab79c 100644
--- a/container-08f507142e8ea1493420c7b5a156d9ea9adfdaad1bbcb9521a349fbe259e9988.service
+++ b/nextcloud/container-nextcloud-mariadb.service
@@ -1,9 +1,9 @@
-# container-08f507142e8ea1493420c7b5a156d9ea9adfdaad1bbcb9521a349fbe259e9988.service
+# container-2334b190834d2954b2853f7cc1b669487c4d825a11b437b9370033b41fe98d5b.service
 # autogenerated by Podman 4.4.1
-# Sat Jul  1 13:33:06 EDT 2023
+# Sat Jul  1 11:36:06 EDT 2023
 
 [Unit]
-Description=Podman jellyseer
+Description=Podman nextcloud-mariadb
 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
@@ -11,7 +11,7 @@ RequiresMountsFor=%t/containers
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=on-failure
+Restart=always
 TimeoutStopSec=70
 ExecStart=/usr/bin/podman run \
 	--cidfile=%t/%n.ctr-id \
@@ -21,8 +21,10 @@ ExecStart=/usr/bin/podman run \
 	--replace \
 	--label io.containers.autoupdate=registry \
 	-d \
-	--pod jellyfin \
-	--name jellyseer docker.io/fallenbagel/jellyseerr
+	-e MARIADB_DATABASE=nextcloud \
+	-e MARIADB_ROOT_PASSWORD=MajorMalfunciton507 \
+	--pod matomo \
+	--name matomo-mariadb docker.io/mariadb:latest
 ExecStop=/usr/bin/podman stop \
 	--ignore -t 10 \
 	--cidfile=%t/%n.ctr-id
diff --git a/container-b0a5a44a70b7479075434443fbb42b228c6526c3ebfdf59a3435a9c0011d2ccd.service b/nextcloud/container-nextcloud.service
similarity index 89%
rename from container-b0a5a44a70b7479075434443fbb42b228c6526c3ebfdf59a3435a9c0011d2ccd.service
rename to nextcloud/container-nextcloud.service
index 919496e..643a522 100644
--- a/container-b0a5a44a70b7479075434443fbb42b228c6526c3ebfdf59a3435a9c0011d2ccd.service
+++ b/nextcloud/container-nextcloud.service
@@ -3,7 +3,7 @@
 # Tue Jun  6 09:40:46 EDT 2023
 
 [Unit]
-Description=Podman Container nextcloud_26
+Description=Podman Container nextcloud
 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
@@ -23,7 +23,7 @@ ExecStart=/usr/bin/podman run \
 	-d \
 	-p 8001:80 \
 	--mount type=bind,source=/data/nextcloud/,target=/var/www/html \
-	--name nextcloud_26 docker.io/library/nextcloud:apache
+	--name Nextcloud docker.io/library/nextcloud:apache
 ExecStop=/usr/bin/podman stop \
 	--ignore -t 10 \
 	--cidfile=%t/%n.ctr-id
diff --git a/container-3847701a67b03c162b5918c568a9e44c4bc924f1a8eaf8399a009f169ba8b599.service b/shlink/container-shlink-mariadb.service
similarity index 100%
rename from container-3847701a67b03c162b5918c568a9e44c4bc924f1a8eaf8399a009f169ba8b599.service
rename to shlink/container-shlink-mariadb.service
diff --git a/container-9cdeb424db89d24bb502d0147819bf23c0ad46f29d193e57d8f7dfa1c905f2b9.service b/shlink/container-shlink.service
similarity index 100%
rename from container-9cdeb424db89d24bb502d0147819bf23c0ad46f29d193e57d8f7dfa1c905f2b9.service
rename to shlink/container-shlink.service
-- 
2.42.0