Add option to have two services in one role and add phpvms_test

playbooks/roles/phpvms/defaults/main.yml

@@ -9,20 +9,20 @@ phpvms_gid: 1000
 
 phpvms_app_key: "{{ undef() }}"
 
+phpvms_domain: "kondor-virtual.de"
+
 phpvms_svc:
-  domain: "kondor-virtual.de"
+  domain: "{{ phpvms_domain }}"
   port: 80
 
 phpvms_env:
   WWWUSER: "{{ phpvms_uid }}"
   WWWGROUP: "{{ phpvms_gid }}"
 
-  CADDY_DOMAIN: "http://{{ svc.domain }}"
-
   APP_KEY: "{{ phpvms_app_key | mandatory }}"
   APP_NAME: phpVMS
   SITE_NAME: phpVMS
-  APP_URL: "https://{{ svc.domain }}"
+  APP_URL: "https://{{ phpvms_domain }}"
   APP_LOCALE: de
 
   APP_ENV: production
@@ -143,12 +143,8 @@ phpvms_compose:
           default:
 
       mariadb:
-        container_name: phpvms-mariadb
         image: mariadb:11
         restart: always
-        # If someone need to access db from the outside
-        ports:
-          - '${FORWARD_DB_PORT:-3306}:3306'
         environment:
           MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
           MYSQL_DATABASE: '${DB_DATABASE}'
@@ -167,7 +163,6 @@ phpvms_compose:
           retries: 3
 
       redis:
-        container_name: phpvms-redis
         image: redis:alpine
         restart: always
         networks:

playbooks/roles/phpvms/files/.gitkeep

@@ -0,0 +1 @@
+vmsacars.tar.gz

playbooks/roles/phpvms/tasks/main.yml

@@ -33,12 +33,14 @@
         group: "{{ phpvms_gid }}"
       become: true
       notify: Restart service {{ service_name }}
+      when: service_name == role_name # Only use on "main" instance
 
-    - name: Copy Caddyfile
+    - name: Template Caddyfile
-      ansible.builtin.copy:
+      ansible.builtin.template:
-        src: Caddyfile
+        src: Caddyfile.j2
         dest: "{{ (service_path, 'Caddyfile') | path_join }}"
         mode: "0644"
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/phpvms/templates/Caddyfile.j2

@@ -1,4 +1,4 @@
-{$CADDY_DOMAIN} {
+http://{{ phpvms_domain }} {
     root * /var/www/html/public
 
     encode zstd gzip

playbooks/roles/phpvms/vars/test.yml

@@ -0,0 +1,2 @@
+service_name_overwrite: phpvms_test # noqa: var-naming[no-role-prefix]
+phpvms_domain: "test.kondor-virtual.de"

playbooks/serguzim.net.yml

@@ -20,13 +20,16 @@
 
     - name: Include service roles
       ansible.builtin.include_role:
-        name: "{{ services_item }}"
+        name: "{{ services_item.value.ansible_role | default(services_item.key, true) }}"
+        tasks_from: "{{ services_item.value.ansible_tasks | default(omit, true) }}"
+        vars_from: "{{ services_item.value.ansible_vars | default(omit, true) }}"
         apply:
-          tags: "{{ services_item }}"
+          tags: "{{ services_item.key }}"
       tags: always
-      loop: "{{ host_services | services_names() }}"
+      loop: "{{ host_services | dict2items }}"
       loop_control:
         loop_var: services_item
+        label: "{{ services_item.key }}"
 
     - name: Reload caddy on caddy tag
       ansible.builtin.import_tasks:

services.auto.tfvars

@@ -641,6 +641,17 @@ services = {
     mail = "phpvms@kondor-virtual.de"
   }
 
+  "phpvms_test" = {
+    host = "node002"
+    dns = [{
+      domain = "airline-test.serguzim.me"
+    }]
+    auth = false
+    database = false
+    ansible_role = "phpvms"
+    ansible_vars = "test"
+  }
+
   "postgresql" = {
     host = "node001"
     dns = [{

variables.tf

@@ -172,6 +172,9 @@ variable "services" {
     mail = optional(string)
     mail_smtp = optional(bool, true)
     mail_imap = optional(bool, false)
+    ansible_role = optional(string)
+    ansible_tasks = optional(string)
+    ansible_vars = optional(string)
   }))
 }