From bb8ed67fb8680f18337a9f1c99edfd0d3643e700 Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Tue, 10 May 2016 14:19:01 +0200 Subject: [PATCH] Funktion ist in die generelle Apache Datei gewandert --- modules/apache.yaml | 16 +++++++++++++++- tier/development.yaml | 16 ---------------- tier/int.yaml | 18 ------------------ tier/production.yaml | 1 - tier/test.yaml | 16 ---------------- 5 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 tier/development.yaml delete mode 100644 tier/int.yaml delete mode 100644 tier/production.yaml delete mode 100644 tier/test.yaml diff --git a/modules/apache.yaml b/modules/apache.yaml index 3df96e3d..1954cc66 100644 --- a/modules/apache.yaml +++ b/modules/apache.yaml @@ -13,7 +13,7 @@ apache::mod::info::allow_from: apache::server_signature: 'Off' apache::server_tokens: 'Prod' apache::trace_enable: 'Off' - +apache::default_mods: false apache::mod::ssl::ssl_cipher: 'AES256+EECDH:AES256+EDH:AES128+EECDH:AES128+EDH' apache::mod::alias::icons_options: 'MultiViews' @@ -24,5 +24,19 @@ apache::log_formats: urchinpp: '%%{ich-trickse}{Client-IP}i %v %u %t \"%r\" %>s %b \"%%{ich-trickse}{Referer}i\" \"%%{ich-trickse}{User-Agent}i\" \"%%{ich-trickse}{Cookie}i\"' urchinpp_xf4: '%%{ich-trickse}{X-Forwarded-For}i %v %u %t \"%r\" %>s %b \"%%{ich-trickse}{Referer}i\" \"%%{ich-trickse}{User-Agent}i\" \"%%{ich-trickse}{Cookie}i\"' +apache::mod::expires::expires_by_type: + - { application/javascript: "access plus 1 day" } + - { text/css: "access plus 1 day" } + - { image/jpeg: "access plus 1 day" } + - { image/png: "access plus 1 day" } + - { image/bmp: "access plus 1 day" } + - { image/gif: "access plus 1 day" } + - { image/vnd.microsoft.icon: "access plus 1 day" } + - { application/font-woff: "access plus 1 day" } + - { application/vnd.ms-fontobject: "access plus 1 day" } + - { image/svg+xml: "access plus 1 day" } + - { application/font-sfnt: "access plus 1 day" } + - { application/vnd.oasis.opendocument.formula-template: "access plus 1 day" } + # the repo is managed by site module apache::mod::passenger::manage_repo: false \ No newline at end of file diff --git a/tier/development.yaml b/tier/development.yaml deleted file mode 100644 index b0b0d1f9..00000000 --- a/tier/development.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apache::mod::expires::expires_by_type: - - { application/javascript: "access plus 1 day" } - - { text/css: "access plus 1 day" } - - { image/jpeg: "access plus 1 day" } - - { image/png: "access plus 1 day" } - - { image/bmp: "access plus 1 day" } - - { image/gif: "access plus 1 day" } - - { image/vnd.microsoft.icon: "access plus 1 day" } - - { application/font-woff: "access plus 1 day" } - - { application/vnd.ms-fontobject: "access plus 1 day" } - - { image/svg+xml: "access plus 1 day" } - - { application/font-sfnt: "access plus 1 day" } - - { application/vnd.oasis.opendocument.formula-template: "access plus 1 day" } - -apache::default_mods: false \ No newline at end of file diff --git a/tier/int.yaml b/tier/int.yaml deleted file mode 100644 index 9a62104a..00000000 --- a/tier/int.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Int Umgebungen entsprechen in der Regel test-Umgebungen - -apache::mod::expires::expires_by_type: - - { application/javascript: "access plus 1 day" } - - { text/css: "access plus 1 day" } - - { image/jpeg: "access plus 1 day" } - - { image/png: "access plus 1 day" } - - { image/bmp: "access plus 1 day" } - - { image/gif: "access plus 1 day" } - - { image/vnd.microsoft.icon: "access plus 1 day" } - - { application/font-woff: "access plus 1 day" } - - { application/vnd.ms-fontobject: "access plus 1 day" } - - { image/svg+xml: "access plus 1 day" } - - { application/font-sfnt: "access plus 1 day" } - - { application/vnd.oasis.opendocument.formula-template: "access plus 1 day" } - -apache::default_mods: false \ No newline at end of file diff --git a/tier/production.yaml b/tier/production.yaml deleted file mode 100644 index ed97d539..00000000 --- a/tier/production.yaml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/tier/test.yaml b/tier/test.yaml deleted file mode 100644 index b0b0d1f9..00000000 --- a/tier/test.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apache::mod::expires::expires_by_type: - - { application/javascript: "access plus 1 day" } - - { text/css: "access plus 1 day" } - - { image/jpeg: "access plus 1 day" } - - { image/png: "access plus 1 day" } - - { image/bmp: "access plus 1 day" } - - { image/gif: "access plus 1 day" } - - { image/vnd.microsoft.icon: "access plus 1 day" } - - { application/font-woff: "access plus 1 day" } - - { application/vnd.ms-fontobject: "access plus 1 day" } - - { image/svg+xml: "access plus 1 day" } - - { application/font-sfnt: "access plus 1 day" } - - { application/vnd.oasis.opendocument.formula-template: "access plus 1 day" } - -apache::default_mods: false \ No newline at end of file -- 2.39.5