diff --git a/Makefile b/Makefile index 12ee12b..cf1c02e 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,11 @@ CONTAINER_BASENAME ?= chevereto-build-${VERSION} TAG ?= chevereto-build:${VERSION}-${NAMESPACE} # SERVICE php|database|http SERVICE ?= php +LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key: " license; stty echo; echo $$license) PORT ?= 8040 # NAMESPACE prefix in project's name -NAMESPACE = local +NAMESPACE ?= local VERSION_DOTLESS = $(shell echo \${VERSION} | tr -d '.') -LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key: " license; stty echo; echo $$license) # Echo doing FEEDBACK = $(shell echo 👉 V\${VERSION} \${NAMESPACE} [PHP \${PHP}] \(\${DOCKER_USER}\)) FEEDBACK_SHORT = $(shell echo 👉 V\${VERSION} [PHP \${PHP}] \(\${DOCKER_USER}\)) @@ -75,7 +75,6 @@ up--d: arguments stop: arguments @CONTAINER_BASENAME=${CONTAINER_BASENAME} \ PORT=${PORT} \ - TAG=${TAG} \ VERSION=${VERSION} \ docker compose \ -p ${PROJECT} \ @@ -85,7 +84,6 @@ stop: arguments down: arguments @CONTAINER_BASENAME=${CONTAINER_BASENAME} \ PORT=${PORT} \ - TAG=${TAG} \ VERSION=${VERSION} \ docker compose \ -p ${PROJECT} \ @@ -95,7 +93,6 @@ down: arguments down--volumes: arguments @CONTAINER_BASENAME=${CONTAINER_BASENAME} \ PORT=${PORT} \ - TAG=${TAG} \ VERSION=${VERSION} \ docker compose \ -p ${PROJECT} \ diff --git a/httpd/httpd.conf b/httpd/httpd.conf index bdb1aec..f29ff75 100644 --- a/httpd/httpd.conf +++ b/httpd/httpd.conf @@ -557,17 +557,15 @@ LoadModule rewrite_module modules/mod_rewrite.so DirectoryIndex index.html index.php - - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - - - SetHandler "proxy:fcgi://php:9000/" - - ServerAdmin webmaster@localhost - DocumentRoot /var/www/html - ErrorLog /proc/self/fd/2 - CustomLog /proc/self/fd/1 common - + + Options Indexes FollowSymLinks + AllowOverride All + Require all granted + + + SetHandler "proxy:fcgi://php:9000/" + +ServerAdmin webmaster@localhost +DocumentRoot /var/www/html +ErrorLog /proc/self/fd/2 +CustomLog /proc/self/fd/1 common