Update matomo

diff --git a/matomo/container-matomo-mariadb.service b/matomo/container-matomo-mariadb.service
index 06696a041e43c98d813cb93054b6d2e28c806961..f156fba58f0df352139b419721adae3cedbe5eed 100644 (file)
--- a/matomo/container-matomo-mariadb.service
+++ b/matomo/container-matomo-mariadb.service
@@ -1,39 +1,41 @@
-# container-2334b190834d2954b2853f7cc1b669487c4d825a11b437b9370033b41fe98d5b.service
-# autogenerated by Podman 4.4.1
-# Sat Jul  1 11:36:06 EDT 2023
+# container-2368709a8cf1d0153c01eb08f5a949d063cea619893ec9192a28105ef87820dc.service
+# autogenerated by Podman 4.6.1
+# Sun Nov 19 11:05:51 CST 2023
 
 [Unit]
-Description=Podman matomo-mariadb
+Description=Podman Matomo Mariadb
 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
 RequiresMountsFor=%t/containers
+BindsTo=pod-matomo.service
+After=pod-matomo.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=always
+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 \
-       -e MARIADB_DATABASE=matomo \
-       -e MARIADB_ROOT_PASSWORD=MajorMalfunciton507 \
-       --pod matomo \
-       --name matomo-mariadb docker.io/mariadb:latest
+        --cidfile=%t/%n.ctr-id \
+        --cgroups=no-conmon \
+        --rm \
+        --pod-id-file %t/pod-d2ce44fc9ebea045c1cb10040cf47ee7043d2b9034d0a285faf63101dc0d057e.pod-id \
+        --sdnotify=conmon \
+        --replace \
+        --label io.containers.autoupdate=registry \
+        -d \
+        -e MARIADB_DATABASE=matomo \
+        -e MARIADB_ROOT_PASSWORD=MajorMalfunciton507 \
+        --name matomo-mariadb docker.io/mariadb:latest
 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 \
-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+        -f \
+        --ignore -t 10 \
+        --cidfile=%t/%n.ctr-id
 Type=notify
 NotifyAccess=all
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target
\ No newline at end of file

diff --git a/matomo/container-matomo-server.service b/matomo/container-matomo-server.service
index 0a631a5ee7ce13ad7cb6466dbe1b2150faf4a5e9..1d5ace7bd964cdf0895fa67dcd79a6e6c7992586 100644 (file)
--- a/matomo/container-matomo-server.service
+++ b/matomo/container-matomo-server.service
@@ -1,38 +1,40 @@
-# container-9de10099b45d693f1f5f41d2f2fcaa806100e34b77fe5eaa9a486a027d3016cb.service
-# autogenerated by Podman 4.4.1
-# Sat Jul  1 11:34:00 EDT 2023
+# container-c6650a2abb9435a93bdabea4b0550c844aa22ee8ec916e55ec7704414ffd1ca7.service
+# autogenerated by Podman 4.6.1
+# Sun Nov 19 11:05:51 CST 2023
 
 [Unit]
-Description=Podman matomo-server container
+Description=Podman Matomo Server
 Documentation=man:podman-generate-systemd(1)
 Wants=network-online.target
 After=network-online.target
 RequiresMountsFor=%t/containers
+BindsTo=pod-matomo.service
+After=pod-matomo.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=always
+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 matomo \
-       -v matomo:/var/www/html \
-       --name matomo-server docker.io/matomo:latest
+        --cidfile=%t/%n.ctr-id \
+        --cgroups=no-conmon \
+        --rm \
+        --pod-id-file %t/pod-d2ce44fc9ebea045c1cb10040cf47ee7043d2b9034d0a285faf63101dc0d057e.pod-id \
+        --sdnotify=conmon \
+        --replace \
+        --label io.containers.autoupdate=registry \
+        -d \
+        -v matomo:/var/www/html \
+        --name matomo-server docker.io/matomo:latest
 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 \
-       -f \
-       --ignore -t 10 \
-       --cidfile=%t/%n.ctr-id
+        -f \
+        --ignore -t 10 \
+        --cidfile=%t/%n.ctr-id
 Type=notify
 NotifyAccess=all
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target
\ No newline at end of file

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