From cac07b8a933958c6ac3dfee8b2feb9c0ed761767 Mon Sep 17 00:00:00 2001 From: Clemens Krack Date: Sat, 24 Feb 2024 23:52:11 +0100 Subject: [PATCH 1/2] feat: add apache pack --- .gitignore | 4 +++ composer.json | 1 + composer.lock | 28 ++++++++++++++++- public/.htaccess | 70 ++++++++++++++++++++++++++++++++++++++++++ public/data/.gitignore | 0 symfony.lock | 12 ++++++++ 6 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 public/.htaccess create mode 100644 public/data/.gitignore diff --git a/.gitignore b/.gitignore index 6cfbb2b..ddaa27b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,7 @@ ###> phpstan/phpstan ### phpstan.neon ###< phpstan/phpstan ### + +###> ckrack/hydrometer-public-server ### +public/data/*.json +###< ckrack/hydrometer-public-server ### diff --git a/composer.json b/composer.json index db00763..12b74b8 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-migrations-bundle": "^3.3", "doctrine/orm": "^3.0", + "symfony/apache-pack": "^1.0", "symfony/asset": "7.0.*", "symfony/console": "~7.0.0", "symfony/doctrine-messenger": "~7.0.0", diff --git a/composer.lock b/composer.lock index 01c88fc..40ce214 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "304a3d38ee7fcb98318ea90d31b11bc3", + "content-hash": "c678f4afae75baef4236dc46fa087251", "packages": [ { "name": "doctrine/cache", @@ -1575,6 +1575,32 @@ }, "time": "2021-07-14T16:46:02+00:00" }, + { + "name": "symfony/apache-pack", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/apache-pack.git", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/apache-pack/zipball/3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "shasum": "" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for Apache support in Symfony", + "support": { + "issues": "https://github.com/symfony/apache-pack/issues", + "source": "https://github.com/symfony/apache-pack/tree/master" + }, + "time": "2017-12-12T01:46:35+00:00" + }, { "name": "symfony/asset", "version": "v7.0.3", diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 0000000..36c30df --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,70 @@ +# Use the front controller as index file. It serves as a fallback solution when +# every other rewrite/redirect fails (e.g. in an aliased environment without +# mod_rewrite). Additionally, this reduces the matching process for the +# start page (path "/") because otherwise Apache will apply the rewriting rules +# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). +DirectoryIndex index.php + +# By default, Apache does not evaluate symbolic links if you did not enable this +# feature in your server configuration. Uncomment the following line if you +# install assets as symlinks or if you experience problems related to symlinks +# when compiling LESS/Sass/CoffeScript assets. +# Options +FollowSymlinks + +# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve +# to the front controller "/index.php" but be rewritten to "/index.php/index". + + Options -MultiViews + + + + # This Option needs to be enabled for RewriteRule, otherwise it will show an error like + # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden' + Options +SymLinksIfOwnerMatch + + RewriteEngine On + + # Determine the RewriteBase automatically and set it as environment variable. + # If you are using Apache aliases to do mass virtual hosting or installed the + # project in a subdirectory, the base path will be prepended to allow proper + # resolution of the index.php file and to redirect to the correct URI. It will + # work in environments without path prefix as well, providing a safe, one-size + # fits all solution. But as you do not need it in this case, you can comment + # the following 2 lines to eliminate the overhead. + RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$ + RewriteRule .* - [E=BASE:%1] + + # Sets the HTTP_AUTHORIZATION header removed by Apache + RewriteCond %{HTTP:Authorization} .+ + RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0] + + # Redirect to URI without front controller to prevent duplicate content + # (with and without `/index.php`). Only do this redirect on the initial + # rewrite by Apache and not on subsequent cycles. Otherwise we would get an + # endless redirect loop (request -> rewrite to front controller -> + # redirect -> request -> ...). + # So in case you get a "too many redirects" error or you always get redirected + # to the start page because your Apache does not expose the REDIRECT_STATUS + # environment variable, you have 2 choices: + # - disable this feature by commenting the following 2 lines or + # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the + # following RewriteCond (best solution) + RewriteCond %{ENV:REDIRECT_STATUS} ="" + RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] + + # If the requested filename exists, simply serve it. + # We only want to let Apache serve files and not directories. + # Rewrite all other queries to the front controller. + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ %{ENV:BASE}/index.php [L] + + + + + # When mod_rewrite is not available, we instruct a temporary redirect of + # the start page to the front controller explicitly so that the website + # and the generated links can still be used. + RedirectMatch 307 ^/$ /index.php/ + # RedirectTemp cannot be used instead + + diff --git a/public/data/.gitignore b/public/data/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/symfony.lock b/symfony.lock index a0c3843..1369a6e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -64,6 +64,18 @@ "tests/bootstrap.php" ] }, + "symfony/apache-pack": { + "version": "1.0", + "recipe": { + "repo": "github.com/schranz-php-recipes/symfony-recipes-php-contrib", + "branch": "main", + "version": "1.0", + "ref": "efb318193e48384eb5c5aadff15396ed698f8ffc" + }, + "files": [ + "public/.htaccess" + ] + }, "symfony/console": { "version": "7.0", "recipe": { From 79b1f222686ed1e78f30238cc9eb783305ce7dd6 Mon Sep 17 00:00:00 2001 From: Clemens Krack Date: Sat, 24 Feb 2024 23:52:44 +0100 Subject: [PATCH 2/2] build: do not warm cache in deploy --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 00edc92..40e3a7d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: script: | cd ${{ secrets.PROJECT_PATH}} git reset --hard - git clean -df + git clean git pull source .env source .env.local @@ -31,10 +31,10 @@ jobs: composer install --no-dev -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist -o composer dump-env prod export APP_DEBUG=0 - php bin/console cache:clear export PWD=$(pwd) envsubst < config/supervisor/hydro-tcp-server.ini > ~/etc/services.d/hydro-tcp-server.ini supervisorctl reread supervisorctl update supervisorctl restart all php bin/console doctrine:migrations:migrate --no-interaction + php bin/console cache:clear --no-warmup