diff --git a/software/apache-frontend/common.cfg b/software/apache-frontend/common.cfg index 3016f09a946a1ae7402c5a8fdd6cadb5ba3dda2d..c77d1626b943b156a5ecb499a0c689b2cd4bb717 100644 --- a/software/apache-frontend/common.cfg +++ b/software/apache-frontend/common.cfg @@ -98,7 +98,7 @@ mode = 640 [template-apache-frontend-configuration] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/templates/apache.conf.in -md5sum = e68401762b25b7a462ba5df187e003e8 +md5sum = ce88924c53f09c9a3ef12ec4d8a8ad16 mode = 640 [template-apache-cached-configuration] diff --git a/software/apache-frontend/templates/apache.conf.in b/software/apache-frontend/templates/apache.conf.in index 07d8cd24ad3b5c4245d482af3d8195efe616d9f0..3447a821da53498be99170da8fbdb4edc72130af 100644 --- a/software/apache-frontend/templates/apache.conf.in +++ b/software/apache-frontend/templates/apache.conf.in @@ -97,14 +97,6 @@ BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully IPReadLimit {{ slapparameter_dict.get('ip-read-limit', '10') }} </IfModule> -# Cache directives -CacheEnable mem / -CacheDefaultExpire 3600 -MCacheSize 8192 -MCacheMaxObjectCount 1000 -MCacheMaxObjectSize 8192 -MCacheRemovalAlgorithm LRU - # Deflate AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript BrowserMatch ^Mozilla/4 gzip-only-text/html