Optimized listmonk, wordpress and activity pub for wordpress

roles/docker-listmonk/tasks/main.yml

@@ -19,21 +19,17 @@
     domain: 	"{{ domains[application_id] }}"
     http_port: 	"{{ ports.localhost.http[application_id] }}"
 
-- name: "copy docker-compose.yml and env file"
-  include_tasks: copy-docker-compose-and-env.yml
-
 - name: add config.toml
   template: 
     src:  "config.toml.j2" 
     dest: "{{docker_compose.directories.config}}config.toml"
   notify: docker compose project setup
 
-- name: flush docker service
-  meta: flush_handlers
-  when: applications.listmonk.setup |bool 
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 - name: setup routine for listmonk
   command:
     cmd:   docker compose run -T --rm application sh -c "yes | ./listmonk --install"
     chdir: "{{docker_compose.directories.instance}}"
-  when: applications.listmonk.setup |bool 
+  ignore_errors: true # Ignore errors if already setup

roles/docker-listmonk/templates/config.toml.j2

@@ -5,14 +5,6 @@
 # port, use port 80 (this will require running with elevated permissions).
 address = "0.0.0.0:9000"
 
-# BasicAuth authentication for the admin dashboard. This will eventually
-# be replaced with a better multi-user, role-based authentication system.
-# IMPORTANT: Leave both values empty to disable authentication on admin
-# only where an external authentication is already setup.
-# admin_username = "{{applications.listmonk.users.administrator.username}}"
-# admin_password = "{{listmonk_admin_password}}"
-# Deactivated for newer versions
-
 # Database.
 [db]
 host = "{{database_host}}"

roles/docker-listmonk/templates/env.j2

@@ -2,8 +2,8 @@ TZ=Etc/UTC
 
 # Administrator setup
 
-LISTMONK_ADMIN_USER={{users.administrator.username}}
-LISTMONK_ADMIN_PASSWORD={{users.administrator.password}}
+LISTMONK_ADMIN_USER={{ applications[application_id].users.administrator.username }}
+LISTMONK_ADMIN_PASSWORD={{ applications[application_id].users.administrator.password }}
 
 {% if applications[application_id].features.oidc | bool %}
 ################################### 

roles/docker-listmonk/vars/main.yml

@@ -1,3 +1,3 @@
 application_id:  	  "listmonk"
-database_password:  "{{listmonk_database_password}}"
+database_password:  "{{applications[application_id].credentials.database.password}}"
 database_type:      "postgres"