Update shlink pod

diff --git a/shlink/container-shlink-mariadb.service b/shlink/container-shlink-mariadb.service
index fb1ea6dedae0ce63525ead8bbaf819dbd3a0bb57..f651d786342fe1c1677ebf33cb5fc55349768e41 100644 (file)
--- a/shlink/container-shlink-mariadb.service
+++ b/shlink/container-shlink-mariadb.service
@@ -1,39 +1,41 @@
-# container-3847701a67b03c162b5918c568a9e44c4bc924f1a8eaf8399a009f169ba8b599.service
-# autogenerated by Podman 4.4.1
-# Mon Jul  3 02:12:41 EDT 2023
+# container-08a97b5def7a7bc4a28423817f2ac6341aabc6f690de30ffc94eb0b02d098cbb.service
+# autogenerated by Podman 4.6.1
+# Sun Nov 19 14:47:59 CST 2023

 
 [Unit]
 
 [Unit]

-Description=Podman shlink-mariadb
+Description=Podman shlink mariadb

 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
 RequiresMountsFor=%t/containers
 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
 RequiresMountsFor=%t/containers

+BindsTo=pod-shlink.service
+After=pod-shlink.service

 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

-Restart=always
+Restart=on-failure

 TimeoutStopSec=70
 ExecStart=/usr/bin/podman run \
 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 \
-       -e MARIADB_DATABASE=shlink \
-       -e MARIADB_ROOT_PASSWORD=MajorMalfunciton507 \
-       --pod Shlink \
-       --name shlink-mariadb docker.io/mariadb:latest
+        --cidfile=%t/%n.ctr-id \
+        --cgroups=no-conmon \
+        --rm \
+        --pod-id-file %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pod-id \
+        --sdnotify=conmon \
+        --replace \
+        --label io.containers.autoupdate=registry \
+        -d \
+        -e MARIADB_DATABASE=shlink \
+        -e MARIADB_ROOT_PASSWORD=MajorMalfunciton507 \
+        --name shlink-mariadb docker.io/mariadb:latest

 ExecStop=/usr/bin/podman stop \
 ExecStop=/usr/bin/podman stop \

-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+        --ignore -t 10 \
+        --cidfile=%t/%n.ctr-id

 ExecStopPost=/usr/bin/podman rm \
 ExecStopPost=/usr/bin/podman rm \

-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+        -f \
+        --ignore -t 10 \
+        --cidfile=%t/%n.ctr-id

 Type=notify
 NotifyAccess=all
 
 [Install]
 Type=notify
 NotifyAccess=all
 
 [Install]

-WantedBy=default.target
+WantedBy=default.target
\ No newline at end of file

diff --git a/shlink/container-shlink.service b/shlink/container-shlink.service
index c987b10954072fdff0a73dec9484f78f81c31b9c..d2b441bbb95420a2503fda1f50b3c21d9413d443 100644 (file)
--- a/shlink/container-shlink.service
+++ b/shlink/container-shlink.service
@@ -1,45 +1,46 @@
-# container-9cdeb424db89d24bb502d0147819bf23c0ad46f29d193e57d8f7dfa1c905f2b9.service
-# autogenerated by Podman 4.4.1
-# Mon Jul  3 02:12:46 EDT 2023
+# container-3a39f734698e3c87a0e5beccc7b39373e9302334b686d160bdd1a4dab9849aaa.service
+# autogenerated by Podman 4.6.1
+# Sun Nov 19 14:47:59 CST 2023

 
 [Unit]
 
 [Unit]

-Description=Podman shlink h.orny.cc
+Description=Podman shlink

 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target

-After=container-shlink-mariadb.service

 RequiresMountsFor=%t/containers
 RequiresMountsFor=%t/containers

+BindsTo=pod-shlink.service
+After=pod-shlink.service

 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n

-Restart=always
+Restart=on-failure

 TimeoutStopSec=70
 ExecStart=/usr/bin/podman run \
 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 \
-       -e DEFAULT_DOMAIN=h.orny.cc \
-       -e IS_HTTPS_ENABLED=true \
-       -e GEOLITE_LICENSE_KEY=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 \
-       -e DB_DRIVER=maria \
-       -e DB_USER=root \
-       -e DB_PASSWORD=MajorMalfunciton507 \
-       -e DB_HOST=shlink \
-       --pod Shlink \
-       --name shlink-api docker.io/shlinkio/shlink:stable
+        --cidfile=%t/%n.ctr-id \
+        --cgroups=no-conmon \
+        --rm \
+        --pod-id-file %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pod-id \
+        --sdnotify=conmon \
+        --replace \
+        --label io.containers.autoupdate=registry \
+        -d \
+        -e DEFAULT_DOMAIN=h.orny.cc \
+        -e IS_HTTPS_ENABLED=true \
+        -e GEOLITE_LICENSE_KEY=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 \
+        -e DB_DRIVER=maria \
+        -e DB_USER=root \
+        -e DB_PASSWORD=MajorMalfunciton507 \
+        -e DB_HOST=127.0.0.1 \
+        --name shlink-api docker.io/shlinkio/shlink:stable

 ExecStop=/usr/bin/podman stop \
 ExecStop=/usr/bin/podman stop \

-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+        --ignore -t 10 \
+        --cidfile=%t/%n.ctr-id

 ExecStopPost=/usr/bin/podman rm \
 ExecStopPost=/usr/bin/podman rm \

-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+        -f \
+        --ignore -t 10 \
+        --cidfile=%t/%n.ctr-id

 Type=notify
 NotifyAccess=all
 
 [Install]
 Type=notify
 NotifyAccess=all
 
 [Install]

-WantedBy=default.target
+WantedBy=default.target
\ No newline at end of file

diff --git a/shlink/pod-shlink.service b/shlink/pod-shlink.service
new file mode 100644 (file)
index 0000000..16d06b7
--- /dev/null
+++ b/shlink/pod-shlink.service
@@ -0,0 +1,40 @@
+# pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.service
+# autogenerated by Podman 4.6.1
+# Sun Nov 19 14:47:59 CST 2023
+
+[Unit]
+Description=Podman Shlink pod
+Documentation=man:podman-generate-systemd(1)
+Wants=network-online.target
+After=network-online.target
+RequiresMountsFor=/run/containers/storage
+Wants=container-shlink.service container-shlink-mariadb.service
+Before=container-shlink.service container-shlink-mariadb.service
+
+[Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
+Restart=on-failure
+TimeoutStopSec=70
+ExecStartPre=/usr/bin/podman pod create \
+        --infra-conmon-pidfile %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pid \
+        --pod-id-file %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pod-id \
+        --exit-policy=stop \
+        --replace \
+        -p 8004:8080 \
+        -v shlink-mariadb-data:/var/lib/mysql \
+        --name Shlink
+ExecStart=/usr/bin/podman pod start \
+        --pod-id-file %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pod-id
+ExecStop=/usr/bin/podman pod stop \
+        --ignore \
+        --pod-id-file %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pod-id  \
+        -t 10
+ExecStopPost=/usr/bin/podman pod rm \
+        --ignore \
+        -f \
+        --pod-id-file %t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pod-id
+PIDFile=%t/pod-9d598f9f459e2c2e334e4c7cdcb3661f68c8f4671c4f42d9190edcaee03ab450.pid
+Type=forking
+
+[Install]
+WantedBy=default.target
\ No newline at end of file