diff --git a/Makefile b/Makefile index 31ed9db..df88142 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,10 @@ COMPOSE = ./srcs/docker-compose.yml # then expend the home path # then expend the pwd path # and finally remove the leading "EXPEND_" word -EXPENDED_ENV_VAR := $(shell grep "^EXPEND_" ./srcs/.env) +EXPENDED_ENV_VAR := $(shell grep "^#EXPEND_" ./srcs/.env) EXPENDED_ENV_VAR := $(subst $$HOME_PATH,$(HOME),$(EXPENDED_ENV_VAR)) EXPENDED_ENV_VAR := $(subst $$PWD_PATH,$(shell pwd),$(EXPENDED_ENV_VAR)) -EXPENDED_ENV_VAR := $(EXPENDED_ENV_VAR:EXPEND_%=%) +EXPENDED_ENV_VAR := $(EXPENDED_ENV_VAR:#EXPEND_%=%) # this creates a list of the path from the list of the variables : # VAR_1=/path/to_1 VAR_2=/path/to_2 diff --git a/README.md b/README.md index 134d713..f495a1f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,11 @@ - mes: "fixed volume variable" - end: 13h30 - len: 3h30 - - begin: 14h + - total: 3h30 + - tarif: 105€ + +- 12/09/23 + - begin: 9h30 - mes: "copy site" - end: h - len: h diff --git a/srcs/.env b/srcs/.env index df7f472..6ae0172 100644 --- a/srcs/.env +++ b/srcs/.env @@ -36,18 +36,14 @@ EXECUTION_TIME=300 # 3. then it will remove the leading "EXPEND_" word # 4. then it will erase all the line starting with "HOST_VOLUME_" # 5. and finally it will add the expended lines after the line "EXPENDED LINES :" - -EXPEND_HOST_VOLUME_WP=$HOME_PATH/data/lejourduprof/wp_volume -EXPEND_HOST_VOLUME_DB=$HOME_PATH/data/lejourduprof/db_volume -EXPEND_HOST_VOLUME_PLUGINS=$PWD_PATH/srcs/plugins -EXPEND_HOST_VOLUME_CERTS=$PWD_PATH/srcs/requirements/nginx/conf/ssl +# LINES TO EXPEND : +#EXPEND_HOST_VOLUME_WP=$HOME_PATH/data/lejourduprof/wp_volume +#EXPEND_HOST_VOLUME_DB=$HOME_PATH/data/lejourduprof/db_volume +#EXPEND_HOST_VOLUME_PLUGINS=$PWD_PATH/srcs/plugins +#EXPEND_HOST_VOLUME_CERTS=$PWD_PATH/srcs/requirements/nginx/conf/ssl # EXPENDED LINES : HOST_VOLUME_CERTS=/home/asususus/Nextcloud/informatique/lejourduprof/srcs/requirements/nginx/conf/ssl HOST_VOLUME_PLUGINS=/home/asususus/Nextcloud/informatique/lejourduprof/srcs/plugins HOST_VOLUME_DB=/home/asususus/data/lejourduprof/db_volume HOST_VOLUME_WP=/home/asususus/data/lejourduprof/wp_volume -#HOST_VOLUME_WP=/home/lenovo/data/lejourduprof/wp_volume -#HOST_VOLUME_DB=/home/lenovo/data/lejourduprof/db_volume -#HOST_VOLUME_PLUGINS=/home/lenovo/42/lejourduprof/srcs/plugins -#HOST_VOLUME_CERTS=/home/lenovo/42/lejourduprof/srcs/requirements/nginx/conf/ssl