diff --git a/src/nginxconfig/generators/conf/general.conf.js b/src/nginxconfig/generators/conf/general.conf.js index 3053b01..abd8fea 100644 --- a/src/nginxconfig/generators/conf/general.conf.js +++ b/src/nginxconfig/generators/conf/general.conf.js @@ -33,13 +33,11 @@ export default (domains, global) => { config['location = /favicon.ico'] = { log_not_found: 'off', }; - if (global.logging.accessLogEnabled.computed) config['location = /favicon.ico'].access_log = 'off'; config['# robots.txt'] = ''; config['location = /robots.txt'] = { log_not_found: 'off', }; - if (global.logging.accessLogEnabled.computed) config['location = /robots.txt'].access_log = 'off'; if (global.performance.disableHtmlCaching.computed) { // Disable HTML caching for changes take effect in time @@ -48,7 +46,6 @@ export default (domains, global) => { config[loc] = { add_header: 'Cache-Control "no-cache"', }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } @@ -61,7 +58,6 @@ export default (domains, global) => { config[loc] = { expires: global.performance.assetsExpiration.computed, }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } } else { // Assets & media separately @@ -71,7 +67,6 @@ export default (domains, global) => { config[loc] = { expires: global.performance.assetsExpiration.computed, }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } if (global.performance.mediaExpiration.computed) { @@ -80,7 +75,6 @@ export default (domains, global) => { config[loc] = { expires: global.performance.mediaExpiration.computed, }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } } @@ -93,7 +87,6 @@ export default (domains, global) => { add_header: 'Access-Control-Allow-Origin "*"', expires: global.performance.svgExpiration.computed, }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } } else { // SVG & fonts separately @@ -104,7 +97,6 @@ export default (domains, global) => { add_header: 'Access-Control-Allow-Origin "*"', expires: global.performance.svgExpiration.computed, }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } if (global.performance.fontsExpiration.computed) { @@ -114,7 +106,6 @@ export default (domains, global) => { add_header: 'Access-Control-Allow-Origin "*"', expires: global.performance.fontsExpiration.computed, }; - if (global.logging.accessLogEnabled.computed) config[loc].access_log = 'off'; } } } diff --git a/src/nginxconfig/generators/conf/nginx.conf.js b/src/nginxconfig/generators/conf/nginx.conf.js index 35953b7..648995c 100644 --- a/src/nginxconfig/generators/conf/nginx.conf.js +++ b/src/nginxconfig/generators/conf/nginx.conf.js @@ -107,14 +107,7 @@ export default (domains, global) => { } config.http.push(['# Logging', '']); - if (global.logging.accessLogEnabled.computed) { - config.http.push(['access_log', global.logging.accessLogPath.computed.trim() + - (global.logging.cloudflare.computed ? ' cloudflare' : '') + - (global.logging.accessLogParameters.computed ? ` ${global.logging.accessLogParameters.computed.trim()}` : ''), - ]); - } else { - config.http.push(['access_log', 'off']); - } + config.http.push(['access_log', 'off']); if (global.logging.errorLogEnabled.computed) { config.http.push(['error_log', global.logging.errorLogPath.computed.trim() + ` ${global.logging.errorLogLevel.computed}`]); diff --git a/src/nginxconfig/i18n/de/templates/global_sections/logging.js b/src/nginxconfig/i18n/de/templates/global_sections/logging.js index 06487b3..351d3c0 100644 --- a/src/nginxconfig/i18n/de/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/de/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} "Seite nicht gefunden" Error Logging in`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'Füge Cloudflare Anfrage-Header dem Standard Log-Format hinzu', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/en/templates/global_sections/logging.js b/src/nginxconfig/i18n/en/templates/global_sections/logging.js index e75f9df..d31315a 100644 --- a/src/nginxconfig/i18n/en/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/en/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} file not found error logging in`, logformat: 'log_format', - arguments: 'arguments', level: 'logging level', enableCloudflare: 'add Cloudflare request headers to the default log format', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/es/templates/global_sections/logging.js b/src/nginxconfig/i18n/es/templates/global_sections/logging.js index b3f0146..a9ce17a 100644 --- a/src/nginxconfig/i18n/es/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/es/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} el registro de error de archivo no encontrado`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'agregar cabecera de petición de Cloudflare en el formato por defecto del registro', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/fr/templates/global_sections/logging.js b/src/nginxconfig/i18n/fr/templates/global_sections/logging.js index 603295f..a401765 100644 --- a/src/nginxconfig/i18n/fr/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/fr/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} les erreurs de fichiers introuvables lors de la journalisation`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'ajouter les en-têtes de requête CloudFlare au format de journal par défaut', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/ja/templates/global_sections/logging.js b/src/nginxconfig/i18n/ja/templates/global_sections/logging.js index 39c0781..990d68a 100644 --- a/src/nginxconfig/i18n/ja/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/ja/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `FILE NOT FOUND エラーのロギングを${common.enable}`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'デフォルトのログフォーマットに Cloudflare のリクエストヘッダを追加する', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/pl/templates/global_sections/logging.js b/src/nginxconfig/i18n/pl/templates/global_sections/logging.js index 89a15f3..f830ca1 100644 --- a/src/nginxconfig/i18n/pl/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/pl/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} logowanie błędów o nieznalezionych plikach`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'dodaj nagłówki żądań Cloudflare do domyślnego formatu dziennika ', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/pt-br/templates/global_sections/logging.js b/src/nginxconfig/i18n/pt-br/templates/global_sections/logging.js index 06a2d0c..418578b 100644 --- a/src/nginxconfig/i18n/pt-br/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/pt-br/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} erro de arquivo não encontrado ao fazer login`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'adicionar cabeçalhos de solicitação Cloudflare ao formato de log padrão', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/ru/templates/global_sections/logging.js b/src/nginxconfig/i18n/ru/templates/global_sections/logging.js index a23459f..5936a21 100644 --- a/src/nginxconfig/i18n/ru/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/ru/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable} логирование ошибок для файлов, которые не были найдены при запросе`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: 'добавить Cloudflare хедеры запроса в дефолтный формат логов', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/zh-cn/templates/global_sections/logging.js b/src/nginxconfig/i18n/zh-cn/templates/global_sections/logging.js index cac1e7e..019dea7 100644 --- a/src/nginxconfig/i18n/zh-cn/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/zh-cn/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable}“文件未找到”错误日志:`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: '将Cloudflare请求头部添加到默认日志格式', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/i18n/zh-tw/templates/global_sections/logging.js b/src/nginxconfig/i18n/zh-tw/templates/global_sections/logging.js index 0b85b01..bb4c064 100644 --- a/src/nginxconfig/i18n/zh-tw/templates/global_sections/logging.js +++ b/src/nginxconfig/i18n/zh-tw/templates/global_sections/logging.js @@ -29,7 +29,6 @@ import common from '../../common'; export default { enableFileNotFoundErrorLogging: `${common.enable}「找不到檔案」錯誤日誌:`, logformat: 'log_format', - arguments: 'arguments', // TODO: translate level: 'logging level', // TODO: translate enableCloudflare: '將 Cloudflare 請求標頭加入預設日誌格式', cfRay: 'CF-Ray', diff --git a/src/nginxconfig/templates/global_sections/logging.vue b/src/nginxconfig/templates/global_sections/logging.vue index 476b9d6..8ff3551 100644 --- a/src/nginxconfig/templates/global_sections/logging.vue +++ b/src/nginxconfig/templates/global_sections/logging.vue @@ -26,49 +26,6 @@ THE SOFTWARE.