From bb06d35e7b61aee3805451e19b6bf96cbecb810a Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Wed, 14 May 2025 20:51:22 +0200
Subject: [PATCH] refactor(service): imporve limesurvey

- improve ENV naming and add missing ones
- formatting
---
 templates/compose/limesurvey.yaml | 52 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/templates/compose/limesurvey.yaml b/templates/compose/limesurvey.yaml
index ba9f7d7a0..edd5a6542 100644
--- a/templates/compose/limesurvey.yaml
+++ b/templates/compose/limesurvey.yaml
@@ -4,41 +4,43 @@
 # logo: svgs/limesurvey.svg
 # port: 80
 
-services: 
+services:
   limesurvey:
     image: adamzammit/limesurvey:latest
     environment:
       - SERVICE_FQDN_LIMESURVEY_80
       - LIMESURVEY_DB_HOST=mariadb
-      - LIMESURVEY_DB_PASSWORD=$SERVICE_PASSWORD_MYSQL
-      - LIMESURVEY_DB_USER=$SERVICE_USER_MYSQL
-      - LIMESURVEY_DB_NAME=${MYSQL_DATABASE:-limesurvey}
+      - LIMESURVEY_DB_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - LIMESURVEY_DB_USER=${SERVICE_USER_MYSQL}
+      - LIMESURVEY_DB_NAME=${MYSQL_DATABASE:-limesurvey-db}
       - LIMESURVEY_ADMIN_USER=${LIMESURVEY_ADMIN_USER:-admin}
       - LIMESURVEY_ADMIN_PASSWORD=${SERVICE_PASSWORD_ADMIN}
-      - LIMESURVEY_ADMIN_NAME=${LIMESURVEY_ADMIN_NAME:-Lime Administrator}
-      - LIMESURVEY_ADMIN_EMAIL=${LIMESURVEY_ADMIN_EMAIL:-lime@lime.lime}
-      - LIMESURVEY_FROM_EMAIL= 
-      - LIMESURVEY_SMTP_HOST= 
-      - LIMESURVEY_SMTP_USER= 
-      - LIMESURVEY_SMTP_PASSWORD= 
-      - LIMESURVEY_SMTP_SSL= 
+      - LIMESURVEY_ADMIN_NAME=${LIMESURVEY_ADMIN_NAME:-Admin}
+      - LIMESURVEY_ADMIN_EMAIL=${LIMESURVEY_ADMIN_EMAIL:-admin@example.com}
+      - LIMESURVEY_FROM_EMAIL=${LIMESURVEY_FROM_EMAIL}
+      - LIMESURVEY_SMTP_HOST=${LIMESURVEY_SMTP_HOST}
+      - LIMESURVEY_SMTP_USER=${LIMESURVEY_SMTP_USER}
+      - LIMESURVEY_SMTP_PASSWORD=${LIMESURVEY_SMTP_PASSWORD}
+      - LIMESURVEY_SMTP_SSL=${LIMESURVEY_SMTP_SSL}
       - LIMESURVEY_PHP_SESSION_SAVE_HANDLER=redis
       - LIMESURVEY_PHP_SESSION_SAVE_PATH=tcp://redis:6379
-      - TZ=America/Jamaica
+      - TZ=${TZ:-America/Jamaica}
     volumes:
-      - limesurvey-plugins-data:/var/www/html/plugins
-      - limesurvey-upload-data:/var/www/html/upload
-      - limesurvey-config-data:/var/www/html/application/config
-      - limesurvey-sessions-data:/var/lime/sessions
+      - limesurvey_plugins_data:/var/www/html/plugins
+      - limesurvey_upload_data:/var/www/html/upload
+      - limesurvey_config_data:/var/www/html/application/config
+      - limesurvey_sessions_data:/var/lime/sessions
     depends_on:
       mariadb:
         condition: service_healthy
+      redis:
+        condition: service_healthy
     healthcheck:
       test:
         - CMD
         - curl
-        - '-f'
-        - 'http://127.0.0.1'
+        - "-f"
+        - "http://127.0.0.1"
       interval: 2s
       timeout: 10s
       retries: 10
@@ -46,24 +48,24 @@ services:
   mariadb:
     image: mariadb:11
     environment:
-      - MYSQL_USER=${SERVICE_USER_MYSQL:-limesurvey}
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
       - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
-      - MYSQL_DATABASE=${MYSQL_DATABASE:-limesurvey}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-limesurvey-db}
       - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
     volumes:
-      - limesurvey-mariadb-data:/var/lib/mysql
+      - limesurvey_mariadb_data:/var/lib/mysql
     healthcheck:
       test:
         - CMD
         - healthcheck.sh
-        - '--connect'
-        - '--innodb_initialized'
+        - "--connect"
+        - "--innodb_initialized"
       interval: 5s
       timeout: 20s
       retries: 10
- 
+
   redis:
-    image: redis:7
+    image: redis:7-alpine
     healthcheck:
       test:
         - CMD