From 9e434a7453dd1eafe007c0d6724d28543cf68617 Mon Sep 17 00:00:00 2001 From: Alex Weber Date: Mon, 6 Jan 2014 20:26:20 -0200 Subject: [PATCH 1/5] remove d6 imagecache config from d7 version --- apps/drupal/drupal_boost.conf | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/apps/drupal/drupal_boost.conf b/apps/drupal/drupal_boost.conf index 1cb10e16..5915e452 100644 --- a/apps/drupal/drupal_boost.conf +++ b/apps/drupal/drupal_boost.conf @@ -63,19 +63,6 @@ location / { log_not_found off; } - ## If accessing an image generated by Drupal 6 imagecache, serve it - ## directly if available, if not relay the request to Drupal to (re)generate - ## the image. - location ~* /imagecache/ { - ## Image hotlinking protection. If you want hotlinking - ## protection for your images uncomment the following line. - #include apps/drupal/hotlinking_protection.conf; - - access_log off; - expires 30d; - try_files $uri @drupal; - } - ## Drupal 7 generated image handling, i.e., imagecache in core. See: ## http://drupal.org/node/371374. location ~* /files/styles/ { From 21890f120005c6562720503c41f324b75a7c27f9 Mon Sep 17 00:00:00 2001 From: Alex Weber Date: Mon, 6 Jan 2014 20:27:09 -0200 Subject: [PATCH 2/5] remove d7 image style config from d6 version --- apps/drupal/drupal_boost6.conf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/drupal/drupal_boost6.conf b/apps/drupal/drupal_boost6.conf index 81d6c269..233d5db8 100644 --- a/apps/drupal/drupal_boost6.conf +++ b/apps/drupal/drupal_boost6.conf @@ -102,15 +102,7 @@ location / { expires 30d; try_files $uri /index.php?q=$no_slash_uri&$args; } - - ## Drupal 7 generated image handling, i.e., imagecache in core. See: - ## http://drupal.org/node/371374. - location ~* /files/styles/ { - access_log off; - expires 30d; - try_files $uri /index.php?q=$no_slash_uri&$args; - } - + ## Advanced Aggregation module CSS ## support. http://drupal.org/project/advagg. location ^~ /sites/default/files/advagg_css/ { From 02d8153c9ad2786c5848c5c38ebc9ec72a66ef1b Mon Sep 17 00:00:00 2001 From: Alex Weber Date: Tue, 7 Jan 2014 11:49:32 -0200 Subject: [PATCH 3/5] Revert "remove d7 image style config from d6 version" This reverts commit 21890f120005c6562720503c41f324b75a7c27f9. --- apps/drupal/drupal_boost6.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/drupal/drupal_boost6.conf b/apps/drupal/drupal_boost6.conf index 233d5db8..81d6c269 100644 --- a/apps/drupal/drupal_boost6.conf +++ b/apps/drupal/drupal_boost6.conf @@ -102,7 +102,15 @@ location / { expires 30d; try_files $uri /index.php?q=$no_slash_uri&$args; } - + + ## Drupal 7 generated image handling, i.e., imagecache in core. See: + ## http://drupal.org/node/371374. + location ~* /files/styles/ { + access_log off; + expires 30d; + try_files $uri /index.php?q=$no_slash_uri&$args; + } + ## Advanced Aggregation module CSS ## support. http://drupal.org/project/advagg. location ^~ /sites/default/files/advagg_css/ { From 435bc0a2bdb91592b136c80d2e13eaa96c67ad05 Mon Sep 17 00:00:00 2001 From: Alex Weber Date: Tue, 7 Jan 2014 11:49:41 -0200 Subject: [PATCH 4/5] Revert "remove d6 imagecache config from d7 version" This reverts commit 9e434a7453dd1eafe007c0d6724d28543cf68617. --- apps/drupal/drupal_boost.conf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apps/drupal/drupal_boost.conf b/apps/drupal/drupal_boost.conf index 5915e452..1cb10e16 100644 --- a/apps/drupal/drupal_boost.conf +++ b/apps/drupal/drupal_boost.conf @@ -63,6 +63,19 @@ location / { log_not_found off; } + ## If accessing an image generated by Drupal 6 imagecache, serve it + ## directly if available, if not relay the request to Drupal to (re)generate + ## the image. + location ~* /imagecache/ { + ## Image hotlinking protection. If you want hotlinking + ## protection for your images uncomment the following line. + #include apps/drupal/hotlinking_protection.conf; + + access_log off; + expires 30d; + try_files $uri @drupal; + } + ## Drupal 7 generated image handling, i.e., imagecache in core. See: ## http://drupal.org/node/371374. location ~* /files/styles/ { From 0b5cebda4118849a8c649549c336cab5b3f28dc1 Mon Sep 17 00:00:00 2001 From: Alex Weber Date: Tue, 7 Jan 2014 11:55:57 -0200 Subject: [PATCH 5/5] comment out d6 imagecache rules in d7 config & vice-versa and add brief explanation in comments --- apps/drupal/drupal_boost.conf | 21 ++++++++++++--------- apps/drupal/drupal_boost6.conf | 13 ++++++++----- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/apps/drupal/drupal_boost.conf b/apps/drupal/drupal_boost.conf index 1cb10e16..cddc25b9 100644 --- a/apps/drupal/drupal_boost.conf +++ b/apps/drupal/drupal_boost.conf @@ -63,18 +63,21 @@ location / { log_not_found off; } + ## Drupal 6 imagecache handling. Uncomment the block below if your site + ## has been migrated from Drupal 6 and/or you need to use the "imagecache" + ## files directory. ## If accessing an image generated by Drupal 6 imagecache, serve it ## directly if available, if not relay the request to Drupal to (re)generate ## the image. - location ~* /imagecache/ { - ## Image hotlinking protection. If you want hotlinking - ## protection for your images uncomment the following line. - #include apps/drupal/hotlinking_protection.conf; - - access_log off; - expires 30d; - try_files $uri @drupal; - } + #location ~* /imagecache/ { + # ## Image hotlinking protection. If you want hotlinking + # ## protection for your images uncomment the following line. + # #include apps/drupal/hotlinking_protection.conf; + # + # access_log off; + # expires 30d; + # try_files $uri @drupal; + #} ## Drupal 7 generated image handling, i.e., imagecache in core. See: ## http://drupal.org/node/371374. diff --git a/apps/drupal/drupal_boost6.conf b/apps/drupal/drupal_boost6.conf index 81d6c269..335d65bc 100644 --- a/apps/drupal/drupal_boost6.conf +++ b/apps/drupal/drupal_boost6.conf @@ -103,13 +103,16 @@ location / { try_files $uri /index.php?q=$no_slash_uri&$args; } + ## Drupal 7 image style handling. Uncomment the block below if your site + ## is being migrated to Drupal 7 and/or you need to use the "styles" files + ## directory. ## Drupal 7 generated image handling, i.e., imagecache in core. See: ## http://drupal.org/node/371374. - location ~* /files/styles/ { - access_log off; - expires 30d; - try_files $uri /index.php?q=$no_slash_uri&$args; - } + #location ~* /files/styles/ { + # access_log off; + # expires 30d; + # try_files $uri /index.php?q=$no_slash_uri&$args; + #} ## Advanced Aggregation module CSS ## support. http://drupal.org/project/advagg.