enhancing sample environments

9 files changed, 30 insertions, 46 deletions

diff --git a/docs/sample-environment/pihole/pihole.yml b/docs/sample-environment/pihole/pihole.yml
new file mode 100644
index 0000000..18c36d5
--- /dev/null
+++ b/docs/sample-environment/pihole/pihole.yml
@@ -0,0 +1,7 @@
+all:
+  vars:
+    containers_quadlet_path: "docs/sample-environment/pihole/quadlet"
+
+    containers_quadlets:
+      - name: "pihole-app"
+        file: "pihole-app.container"
diff --git a/docs/sample-environment/pihole/quadlet/pihole-app.container b/docs/sample-environment/pihole/quadlet/pihole-app.container
new file mode 100644
index 0000000..7892498
--- /dev/null
+++ b/docs/sample-environment/pihole/quadlet/pihole-app.container
@@ -0,0 +1,15 @@
+[Unit]
+Wants=check-network-online.service podman-auto-update.timer
+After=check-network-online.service
+
+[Container]
+ContainerName=pihole-app
+Environment=WEBPASSWORD=
+Image=docker.io/pihole/pihole:latest
+#PublishPort=53:53/tcp
+#PublishPort=53:53/udp
+PublishPort=8081:80
+AutoUpdate=registry
+
+[Install]
+WantedBy=default.target
diff --git a/docs/sample-environment/wordpress/quadlet/wordpress-app.container b/docs/sample-environment/wordpress/quadlet/wordpress-app.container
index 20f9b69..f9bfa6a 100644
--- a/docs/sample-environment/wordpress/quadlet/wordpress-app.container
+++ b/docs/sample-environment/wordpress/quadlet/wordpress-app.container
@@ -1,13 +1,14 @@
 [Unit]
-Wants=wordpress-pod.service
-After=wordpress-pod.service
+Wants=wordpress-pod.service wordpress-db.service
+After=wordpress-pod.service wordpress-db.service
 PartOf=wordpress-pod.service
 
 [Container]
 ContainerName=wordpress-app
-Environment=WORDPRESS_DB_HOST=127.0.0.1 WORDPRESS_DB_USER=root WORDPRESS_DB_PASSWORD=TESTTESTTEST WORDPRESS_DB_NAME=wordpress WORDPRESS_TABLE_PREFIX=wp_
+Environment=WORDPRESS_DB_HOST=127.0.0.1 WORDPRESS_DB_USER=root WORDPRESS_DB_PASSWORD=wordpress WORDPRESS_DB_NAME=wordpress WORDPRESS_TABLE_PREFIX=wp_
 Image=docker.io/library/wordpress:latest
 PodmanArgs=--pod wordpress
+AutoUpdate=registry
 
 [Install]
 WantedBy=default.target
diff --git a/docs/sample-environment/wordpress/quadlet/wordpress-db.container b/docs/sample-environment/wordpress/quadlet/wordpress-db.container
index 8e6e0d6..9059a8e 100644
--- a/docs/sample-environment/wordpress/quadlet/wordpress-db.container
+++ b/docs/sample-environment/wordpress/quadlet/wordpress-db.container
@@ -5,9 +5,10 @@ PartOf=wordpress-pod.service
 
 [Container]
 ContainerName=wordpress-db
-Environment=MARIADB_DATABASE=wordpress MARIADB_ROOT_PASSWORD=TESTTESTTEST
-Image=docker.io/mariadb:latest
+Environment=MARIADB_DATABASE=wordpress MARIADB_ROOT_PASSWORD=wordpress
+Image=docker.io/library/mariadb:latest
 PodmanArgs=--pod wordpress
+AutoUpdate=registry
 
 [Install]
 WantedBy=default.target
diff --git a/docs/sample-environment/wordpress/quadlet/wordpress.pod b/docs/sample-environment/wordpress/quadlet/wordpress.pod
index eea748a..d674a29 100644
--- a/docs/sample-environment/wordpress/quadlet/wordpress.pod
+++ b/docs/sample-environment/wordpress/quadlet/wordpress.pod
@@ -1,5 +1,5 @@
 [Unit]
-Wants=check-network-online.service wordpress-app.service wordpress-db.service
+Wants=check-network-online.service podman-auto-update.timer wordpress-app.service wordpress-db.service
 Before=wordpress-app.service wordpress-db.service
 After=check-network-online.service
 
diff --git a/docs/sample-environment/wordpress/wordpress-app.containerfile b/docs/sample-environment/wordpress/wordpress-app.containerfile
deleted file mode 100644
index f85fc07..0000000
--- a/docs/sample-environment/wordpress/wordpress-app.containerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM docker.io/library/wordpress:latest
-
-LABEL start="podman run -d --rm=true --name wordpress-app --pod wordpress \
--e WORDPRESS_DB_HOST=127.0.0.1 \
--e WORDPRESS_DB_USER=root \
--e WORDPRESS_DB_PASSWORD=TESTTESTTEST \
--e WORDPRESS_DB_NAME=wordpress \
--e WORDPRESS_TABLE_PREFIX=wp_ \
-wordpress-app:latest"
-
-#Build
-#podman build -t wordpress-app -f wordpress-app.containerfile
-
-#Manual start
-#podman container runlabel start wordpress-app
-
-#Pod Start
-#podman pod create --name wordpress -p 8080:80
diff --git a/docs/sample-environment/wordpress/wordpress-db.containerfile b/docs/sample-environment/wordpress/wordpress-db.containerfile
deleted file mode 100644
index 3225616..0000000
--- a/docs/sample-environment/wordpress/wordpress-db.containerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM docker.io/mariadb:latest
-
-LABEL start="podman run -d --rm=true --name wordpress-db --pod wordpress \
--e MARIADB_DATABASE=wordpress \
--e MARIADB_ROOT_PASSWORD=TESTTESTTEST \
-wordpress-db:latest"
-
-#Build
-#podman build -t wordpress-db -f wordpress-db.containerfile
-
-#Manual start
-#podman container runlabel start wordpress-db
-
-#Pod Start
-#podman pod create --name wordpress -p 8080:80
diff --git a/roles/host/tasks/main.yml b/roles/host/tasks/main.yml
index 56451c1..3b92a94 100644
--- a/roles/host/tasks/main.yml
+++ b/roles/host/tasks/main.yml
@@ -8,8 +8,6 @@
 
 - ansible.builtin.import_tasks: systemd-user-network-check.yml
 
-- ansible.builtin.import_tasks: systemd-podman-auto-update.yml
-
 - ansible.builtin.import_tasks: unprivileged-port.yml
   tags:
     - never
diff --git a/roles/host/tasks/systemd-podman-auto-update.yml b/roles/host/tasks/systemd-podman-auto-update.yml
deleted file mode 100644
index 3bbb431..0000000
--- a/roles/host/tasks/systemd-podman-auto-update.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: Enable podman-auto-update.timer for all users
-  ansible.builtin.systemd_service:
-    name: "podman-auto-update.timer"
-    enabled: true
-    scope: "global"