chore: update environment variables and streamline Apache configuration in Taskfile and Docker Compose

Author: koromerzhin

.env.example

@@ -3,4 +3,5 @@ FOLDERPHAR=apps
 FOLDERSQL=database_init
 FILESQL=01_drupal.sql
 FOLDERLAMPY=./lampy
+SERVERNAME=drupal.traefik.me
 DOCKERCOMPOSEFILE=docker-compose-lampy.yml

Taskfile.yml

@@ -16,12 +16,11 @@ vars:
   PROJECT_NAME: '{{.PROJECT_NAME | default "drupal"}}'
   PROJECT_VERSION: '1.0.0'
   ENVIRONMENT: '{{.ENVIRONMENT | default "development"}}'
-  SWARM_DEFAULT_ADDR_POOL: '{{.IPSWARM | default "10.20.0.0/16"}}'
-  SWARM_ADVERTISE_ADDR: '{{.ADVERTISEADDR | default "192.168.1.46"}}'
   STACK_NAME: '{{.STACK | default "drupal"}}'
   FOLDERSQL: '{{.FOLDERSQL | default "database_init"}}'
   FILESQL: '{{.FILESQL | default "dump.sql"}}'
-  FOLDERLAMPY: '{{.FOLDERLAMPY | default "drupal"}}'
+  FOLDERLAMPY: '{{.FOLDERLAMPY | default "lampy"}}'
+  SERVERNAME: '{{.SERVERNAME | default "drupal.traefik.me"}}'
   DOCKERCOMPOSEFILE: '{{.DOCKERCOMPOSEFILE | default "docker-compose.yml"}}'
 
 tasks:
@@ -51,16 +50,26 @@ tasks:
 
   drupal:getapacheconf:
     desc: "Récupère la configuration Apache depuis l'image Docker"
-    silent: false
+    silent: true
     cmds:
     - rm -rf ./conf/apache2 || true
     - docker create --name drupal-php koromerzhin/php:8.4.3-apache-symfony 
-    - docker cp drupal-php:/etc/apache2/ ./conf/apache2
+    - mkdir -p ./conf/apache2
+    - docker cp drupal-php:/etc/apache2/sites-available/000-default.conf ./conf/apache2/000-default.conf
+    - docker cp drupal-php:/etc/apache2/apache2.conf ./conf/apache2/apache2.conf
     - docker rm -f drupal-php
 
-    - sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" ./conf/apache2/sites-available/*.conf 
-    - sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" ./conf/apache2/apache2.conf 
-    - sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" ./conf/apache2/conf-available/*
+    - sed -ri -e 's|\$\{APACHE_DOCUMENT_ROOT\}|/var/www/web|g' ./conf/apache2/000-default.conf
+    - sed -ri -e 's|#ServerName www.example.com|ServerName {{.SERVERNAME}}|g' ./conf/apache2/000-default.conf
+    - sed -ri -e 's|\$\{APACHE_DOCUMENT_ROOT\}|/var/www/web|g' ./conf/apache2/apache2.conf
+    - |
+      sed -i '/^# Global configuration/a\
+      #\
+      # ServerName: Set the servers fully qualified domain name globally\
+      # This suppresses the warning about not being able to reliably determine\
+      # the servers fully qualified domain name\
+      #\
+      ServerName {{.SERVERNAME}}' ./conf/apache2/apache2.conf
 
   drupal:copysql:
     desc: "Copie le fichier SQL de dump dans le dossier drupal"
@@ -101,7 +110,7 @@ tasks:
     cmds:
     - task: docker:stack:check:containers:ready
       vars:
-        CONTAINERS: "phpfpm"
+        CONTAINERS: "www"
         STACK_NAME: "{{.STACK_NAME}}"
 
   drupal:ls:
@@ -130,12 +139,12 @@ tasks:
         TOOLS_DIR: ./../apps
 
   drupal:bash:
-    desc: "Ouvre un shell bash dans le conteneur phpfpm"
+    desc: "Ouvre un shell bash dans le conteneur www"
     cmds:
     - task: docker:stack:shell
       vars:
         STACK_NAME: "drupal"
-        SERVICE_NAME: "phpfpm"
+        SERVICE_NAME: "www"
 
   create:apps:
     desc: "Créer l'install de drupal"
@@ -154,7 +163,7 @@ tasks:
     - task: docker:stack:exec
       vars:
         STACK_NAME: "drupal"
-        SERVICE_NAME: "phpfpm"
+        SERVICE_NAME: "www"
         COMMAND: "{{.COMMAND}}"
         INTERACTIVE: "{{.INTERACTIVE}}"
 
@@ -231,35 +240,3 @@ tasks:
     - task: composer:exec
       vars:
         CMD: "install --no-progress --prefer-dist --optimize-autoloader --no-dev"
-
-  ecs-check:
-    desc: "Vérifie le code avec PHP CS Fixer"
-    silent: true
-    cmds:
-    - task: composer:exec
-      vars:
-        CMD: "run ecs-check"
-
-  ecs-fix:
-    desc: "Corrige le code avec PHP CS Fixer"
-    silent: true
-    cmds:
-    - task: composer:exec
-      vars:
-        CMD: "run ecs-fix"
-
-  rector:
-    desc: "Refactorise le code avec Rector"
-    silent: true
-    cmds:
-    - task: composer:exec
-      vars:
-        CMD: "run rector"
-
-  rector:dry:
-    desc: "Refactorise le code avec Rector en mode dry-run"
-    silent: true
-    cmds:
-    - task: composer:exec
-      vars:
-        CMD: "run rector --dry-run"

docker-compose-lampy.yml

@@ -8,7 +8,7 @@ networks:
     driver: overlay
     attachable: true
 services:
-  phpfpm:
+  www:
     image: koromerzhin/php:8.4.3-apache
     depends_on:
       - mariadb
@@ -17,8 +17,9 @@ services:
       - redis
     volumes:
       - ${PWD}/apps:/var/www/:rw
-      - ${PWD}/conf/apache2:/etc/apache2/
-      - ${PWD}/conf/php.ini-development://usr/local/etc/php/conf.d/php.ini
+      - ${PWD}/conf/php.ini-development:/usr/local/etc/php/conf.d/php.ini
+      - ${PWD}/conf/apache2/000-default.conf:/etc/apache2/sites-available/000-default.conf:ro
+      - ${PWD}/conf/apache2/apache2.conf:/etc/apache2/apache2.conf:ro
     networks:
       - net
       - serverlampy