diff --git a/.env b/.env new file mode 100644 index 0000000..aff160f --- /dev/null +++ b/.env @@ -0,0 +1,12 @@ +COMPOSE_PROJECT_NAME=erable + +PROJECT_ROOT=./src +LOG_ROOT=./log + +DB_IMPORTE_FILE=./ressources/erable.sql +DB_ROOT_PASSWORD=erable +DB_NAME=erable +DB_USERNAME=erable +DB_PASSWORD=erable + +XDEBUG_INI=./ressources/xdebug.ini diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index ab4e1bf..1603bd6 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -1,8 +1,8 @@ server { listen 80; - root /var/www/reha/web; + root /var/www/erable/web; index index.html index.php; - server_name dev.reha.fr; + server_name dev.erable.fr; charset utf-8; @@ -14,7 +14,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } access_log on; - error_log /var/log/nginx/reha/error.log error; + error_log /var/log/nginx/erable/error.log error; sendfile off; diff --git a/Makefile b/Makefile index a61096d..f189396 100644 --- a/Makefile +++ b/Makefile @@ -35,28 +35,28 @@ ps: logs: docker-compose logs -f -maj_config: crd composer_install updb cim cr pag #dev.phpmyadmin.reha.fr +maj_config: crd composer_install updb cim cr pag #dev.phpmyadmin.erable.fr crd: - docker exec reha-php-1 /bin/bash -c "drush cache-clear drush" + docker exec erable-php-1 /bin/bash -c "drush cache-clear drush" composer_install: - docker exec reha-php-1 /bin/bash -c "composer install --no-dev" + docker exec erable-php-1 /bin/bash -c "composer install --no-dev" updb: - docker exec reha-php-1 /bin/bash -c "drush updb -y" + docker exec erable-php-1 /bin/bash -c "drush updb -y" cim: - docker exec reha-php-1 /bin/bash -c "drush config-import -y" + docker exec erable-php-1 /bin/bash -c "drush config-import -y" # sync_struct: -# docker exec reha-php-1 /bin/bash -c "drush im --choice safe && drush ib --choice full" +# docker exec erable-php-1 /bin/bash -c "drush im --choice safe && drush ib --choice full" cr: - docker exec reha-php-1 /bin/bash -c "drush cr" + docker exec erable-php-1 /bin/bash -c "drush cr" pag: - docker exec reha-php-1 /bin/bash -c "drush pag all canonical_entities:node && drush pag all canonical_entities:taxonomy_term" + docker exec erable-php-1 /bin/bash -c "drush pag all canonical_entities:node && drush pag all canonical_entities:taxonomy_term" restart_nginx: docker-compose restart nginx @@ -68,13 +68,13 @@ down: docker-compose down exec_nginx: - docker exec -it reha-nginx-1 bash + docker exec -it erable-nginx-1 bash exec_php: - docker exec -it reha-php-1 bash + docker exec -it erable-php-1 bash exec_mysql: - docker exec -it reha-mysql-1 bash + docker exec -it erable-mysql-1 bash dump_db: - docker exec reha-mysql-1 sh -c 'exec mysqldump -uroot -preha reha' > ./ressources/reha-$(DATE_NOW)-local.sql + docker exec erable-mysql-1 sh -c 'exec mysqldump -uroot -perable erable' > ./ressources/erable-$(DATE_NOW)-local.sql diff --git a/docker-compose.yml b/docker-compose.yml index a99934e..df97351 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: volumes: - db-data:/var/lib/mysql - ./Docker/mysql/mysql.cnf:/etc/mysql/conf.d/custom.cnf:ro - - "${DB_IMPORTE_FILE}:/docker-entrypoint-initdb.d/reha.sql" + - "${DB_IMPORTE_FILE}:/docker-entrypoint-initdb.d/erable.sql" networks: - database environment: @@ -30,10 +30,10 @@ services: user: ${USER_UID}:${USER_GID} volumes: - php-user-data:/home/${USER_UNAME} - - "${PROJECT_ROOT}:/var/www/reha" + - "${PROJECT_ROOT}:/var/www/erable" - "${LOG_ROOT}/php:/var/log:rw" - "${XDEBUG_INI}:/usr/local/etc/php/conf.d/xdebug.ini" - working_dir: "/var/www/reha/" + working_dir: "/var/www/erable/" networks: - database - redis @@ -64,7 +64,7 @@ services: - 8980:80 working_dir: "/var/www" volumes: - - "${PROJECT_ROOT}:/var/www/reha" + - "${PROJECT_ROOT}:/var/www/erable" - "${LOG_ROOT}:/var/log:rw" networks: - server diff --git a/ressources/drupal/settings.php b/ressources/drupal/settings.php index 1cfdeed..a338203 100644 --- a/ressources/drupal/settings.php +++ b/ressources/drupal/settings.php @@ -845,9 +845,9 @@ $settings['migrate_node_migrate_type_classic'] = FALSE; $databases['default']['default'] = array ( - 'database' => 'reha', + 'database' => 'erable', 'username' => 'root', - 'password' => 'reha', + 'password' => 'erable', 'prefix' => '', 'host' => 'mysql', 'port' => '3306', diff --git a/src b/src index 6d6a286..6c737b9 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 6d6a28601b4b332172fd4a63df878c3ba0c9582a +Subproject commit 6c737b9cc4f51b6ba49a3927cea3fce4f5cf90d7