diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index c06f4b6..583e355 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -30,6 +30,7 @@ module.exports = {
     'vue/html-self-closing': 0,
     'vue/multi-word-component-names': 0,
     'vue/no-reserved-component-names': 0,
+    'eol-last': ['error', 'always'],
   },
   globals: {
     'describe': true,
diff --git a/.github/workflows/do-spaces-workflow.yml b/.github/workflows/do-spaces-workflow.yml
index 8130982..e74a8e5 100644
--- a/.github/workflows/do-spaces-workflow.yml
+++ b/.github/workflows/do-spaces-workflow.yml
@@ -2,17 +2,21 @@ name: Deploy to DigitalOcean Spaces
 
 on: push
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: actions/setup-node@v3.5.0
+      - name: Use Node.js
+        uses: actions/setup-node@v3
         with:
-          node-version-file: ".nvmrc"
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Setup NPM
@@ -40,7 +44,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: ${{ secrets.SPACES_REGION }}
 
-      - name: Leave a comment
+      - name: Leave a comment on commit
         run: npm run deploy:spaces:comment
         env:
           REPO_NAME: ${{ github.repository }}
diff --git a/.github/workflows/gh-pages-workflow.yml b/.github/workflows/gh-pages-workflow.yml
index a87bb9f..1e66653 100644
--- a/.github/workflows/gh-pages-workflow.yml
+++ b/.github/workflows/gh-pages-workflow.yml
@@ -5,17 +5,25 @@ on:
     branches:
       - master
 
+permissions:
+  contents: write
+
+concurrency:
+  group: gh-pages-workflow
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: actions/setup-node@v3.5.0
+      - name: Use Node.js
+        uses: actions/setup-node@v3
         with:
-          node-version-file: ".nvmrc"
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Setup NPM
@@ -40,9 +48,8 @@ jobs:
           NODE_ENV: production
 
       - name: Deploy master to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@2.0.0
-        env:
-          ACCESS_TOKEN: ${{ secrets.DEV_GITHUB_TOKEN }}
-          BASE_BRANCH: master
-          BRANCH: gh-pages
-          FOLDER: dist
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: dist
+          clean: true
+          single-commit: true
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
index a0f32c8..e64c8c2 100644
--- a/.github/workflows/test-workflow.yml
+++ b/.github/workflows/test-workflow.yml
@@ -7,12 +7,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: actions/setup-node@v3.5.0
+      - name: Use Node.js
+        uses: actions/setup-node@v3
         with:
-          node-version-file: ".nvmrc"
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Setup NPM
@@ -35,12 +36,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: actions/setup-node@v3.5.0
+      - name: Use Node.js
+        uses: actions/setup-node@v3
         with:
-          node-version-file: ".nvmrc"
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Setup NPM
@@ -63,12 +65,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: Setup Node
-        uses: actions/setup-node@v3.5.0
+      - name: Use Node.js
+        uses: actions/setup-node@v3
         with:
-          node-version-file: ".nvmrc"
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Setup NPM
diff --git a/src/nginxconfig/generators/conf/general.conf.js b/src/nginxconfig/generators/conf/general.conf.js
index a1f32f2..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.accessLog.computed) config['location = /favicon.ico'].access_log = 'off';
 
     config['# robots.txt'] = '';
     config['location = /robots.txt'] = {
         log_not_found: 'off',
     };
-    if (global.logging.accessLog.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.accessLog.computed) config[loc].access_log = 'off';
      }
  
 
@@ -61,7 +58,6 @@ export default (domains, global) => {
                 config[loc] = {
                     expires: global.performance.assetsExpiration.computed,
                 };
-                if (global.logging.accessLog.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.accessLog.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.accessLog.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.accessLog.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.accessLog.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.accessLog.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 e2feb5f..74308a2 100644
--- a/src/nginxconfig/generators/conf/nginx.conf.js
+++ b/src/nginxconfig/generators/conf/nginx.conf.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+import { errorLogPathDisabled } from '../../util/logging';
 import sslProfiles from '../../util/ssl_profiles';
 import websiteConf from './website.conf';
 
@@ -107,8 +108,13 @@ export default (domains, global) => {
     }
 
     config.http.push(['# Logging', '']);
-    config.http.push(['access_log', (global.logging.accessLog.computed.trim() + (global.logging.cloudflare.computed ? ' cloudflare' : '')) || 'off']);
-    config.http.push(['error_log', global.logging.errorLog.computed.trim() || '/dev/null']);
+    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}`]);
+    } else {
+        config.http.push(['error_log', errorLogPathDisabled]);
+    }
 
     if (global.security.limitReq.computed) {
         config.http.push(['# Limits', '']);
diff --git a/src/nginxconfig/generators/conf/website.conf.js b/src/nginxconfig/generators/conf/website.conf.js
index 0363f5d..151f85b 100644
--- a/src/nginxconfig/generators/conf/website.conf.js
+++ b/src/nginxconfig/generators/conf/website.conf.js
@@ -25,8 +25,8 @@ THE SOFTWARE.
 */
 
 import { getSslCertificate, getSslCertificateKey } from '../../util/get_ssl_certificate';
-import { getAccessLogDomainPath, getErrorLogDomainPath } from '../../util/get_log_paths';
 import { extensions, gzipTypes } from '../../util/types_extensions';
+import { getDomainAccessLog, getDomainErrorLog } from '../../util/logging';
 import commonHsts from '../../util/common_hsts';
 import securityConf from './security.conf';
 import pythonConf from './python_uwsgi.conf';
@@ -127,6 +127,19 @@ const httpRedirectConfig = (domain, global, ipPortPairs, domainName, redirectDom
     config.push(...httpListen(domain, global, ipPortPairs));
     config.push(['server_name', domainName]);
 
+    // Logging
+    if (domain.logging.redirectAccessLog.computed || domain.logging.redirectErrorLog.computed) {
+        config.push(['# logging', '']);
+
+        if (domain.logging.redirectAccessLog.computed) {
+            config.push(['access_log', getDomainAccessLog(domain, global)]);
+        }
+
+        if (domain.logging.redirectErrorLog.computed) {
+            config.push(['error_log', getDomainErrorLog(domain)]);
+        }
+    }
+
     if (domain.https.certType.computed === 'letsEncrypt') {
         // Let's encrypt
 
@@ -221,15 +234,14 @@ export default (domain, domains, global, ipPortPairs) => {
     }
 
     // Access log or error log for domain
-    if (domain.logging.accessLog.computed || domain.logging.errorLog.computed) {
+    if (domain.logging.accessLogEnabled.computed || domain.logging.errorLogEnabled.computed) {
         serverConfig.push(['# logging', '']);
 
-        if (domain.logging.accessLog.computed)
-            serverConfig.push(['access_log',
-                getAccessLogDomainPath(domain, global) + (global.logging.cloudflare.computed ? ' cloudflare' : '')]);
+        if (domain.logging.accessLogEnabled.computed)
+            serverConfig.push(['access_log', getDomainAccessLog(domain, global)]);
 
-        if (domain.logging.errorLog.computed)
-            serverConfig.push(['error_log', getErrorLogDomainPath(domain, global)]);
+        if (domain.logging.errorLogEnabled.computed)
+            serverConfig.push(['error_log', getDomainErrorLog(domain)]);
     }
 
     // index.php
@@ -411,7 +423,19 @@ export default (domain, domains, global, ipPortPairs) => {
 
         // HTTPS
         redirectConfig.push(...sslConfig(domain, global));
+        
+        // Logging
+        if (domain.logging.redirectAccessLog.computed || domain.logging.redirectErrorLog.computed) {
+            redirectConfig.push(['# logging', '']);
 
+            if (domain.logging.redirectAccessLog.computed) {
+                redirectConfig.push(['access_log', getDomainAccessLog(domain, global)]);
+            }
+            if (domain.logging.redirectErrorLog.computed) {
+                redirectConfig.push(['error_log', getDomainErrorLog(domain)]);
+            }
+        }
+        
         redirectConfig.push(['return',
             `301 http${domain.https.https.computed ? 's' : ''}://${domain.server.wwwSubdomain.computed ? 'www.' : ''}${domain.server.domain.computed}$request_uri`]);
 
diff --git a/src/nginxconfig/i18n/de/templates/domain_sections/logging.js b/src/nginxconfig/i18n/de/templates/domain_sections/logging.js
index bbe0b08..285f24b 100644
--- a/src/nginxconfig/i18n/de/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/de/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -27,4 +27,7 @@ THE SOFTWARE.
 export default {
     byDomain: 'der Domain',
     enableForThisDomain: 'Für diese Domain aktivieren',
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/de/templates/domain_sections/php.js b/src/nginxconfig/i18n/de/templates/domain_sections/php.js
index 6ce419c..1daaef8 100644
--- a/src/nginxconfig/i18n/de/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/de/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `${common.php} Backup Server`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM Socket',
-    php5Socket: '5.x Socket',
     php70Socket: '7.0 Socket',
     php71Socket: '7.1 Socket',
     php72Socket: '7.2 Socket',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 Socket',
     php80Socket: '8.0 Socket',
     php81Socket: '8.1 Socket',
+    php82Socket: '8.2 Socket',
     phpSocket: 'PHP Socket',
     custom: 'Benutzerdefiniert',
     disabled: 'Deaktiviert',
diff --git a/src/nginxconfig/i18n/de/templates/global_sections/logging.js b/src/nginxconfig/i18n/de/templates/global_sections/logging.js
index 148c2d0..351d3c0 100644
--- a/src/nginxconfig/i18n/de/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/de/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} "Seite nicht gefunden" Error Logging in`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: 'Füge Cloudflare Anfrage-Header dem Standard Log-Format hinzu',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/en/templates/domain_sections/logging.js b/src/nginxconfig/i18n/en/templates/domain_sections/logging.js
index 16f42e7..342d4b9 100644
--- a/src/nginxconfig/i18n/en/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/en/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: 'by domain',
     enableForThisDomain: `${common.enable} for this domain`,
+    arguments: 'arguments',
+    level: 'logging level',
+    forRedirects: 'for redirects',
 };
diff --git a/src/nginxconfig/i18n/en/templates/domain_sections/php.js b/src/nginxconfig/i18n/en/templates/domain_sections/php.js
index 15581fd..bb8414d 100644
--- a/src/nginxconfig/i18n/en/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/en/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `${common.php} backup server`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM socket',
-    php5Socket: '5.x socket',
     php70Socket: '7.0 socket',
     php71Socket: '7.1 socket',
     php72Socket: '7.2 socket',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 socket',
     php80Socket: '8.0 socket',
     php81Socket: '8.1 socket',
+    php82Socket: '8.2 socket',
     phpSocket: 'PHP socket',
     custom: 'Custom',
     disabled: 'Disabled',
diff --git a/src/nginxconfig/i18n/en/templates/global_sections/logging.js b/src/nginxconfig/i18n/en/templates/global_sections/logging.js
index 26e6db9..d31315a 100644
--- a/src/nginxconfig/i18n/en/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/en/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} file not found error logging in`,
     logformat: 'log_format',
+    level: 'logging level',
     enableCloudflare: 'add Cloudflare request headers to the default log format',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/es/templates/domain_sections/logging.js b/src/nginxconfig/i18n/es/templates/domain_sections/logging.js
index 3a04692..e30750e 100644
--- a/src/nginxconfig/i18n/es/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/es/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: 'por dominio',
     enableForThisDomain: `${common.enable} para este dominio`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/es/templates/domain_sections/php.js b/src/nginxconfig/i18n/es/templates/domain_sections/php.js
index f3f67ad..c0f82ac 100644
--- a/src/nginxconfig/i18n/es/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/es/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `Servidor ${common.php} de respaldo`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM socket',
-    php5Socket: '5.x socket',
     php70Socket: '7.0 socket',
     php71Socket: '7.1 socket',
     php72Socket: '7.2 socket',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 socket',
     php80Socket: '8.0 socket',
     php81Socket: '8.1 socket',
+    php82Socket: '8.2 socket',
     phpSocket: 'PHP socket',
     custom: 'Personalizado',
     disabled: 'Desactivado',
diff --git a/src/nginxconfig/i18n/es/templates/global_sections/logging.js b/src/nginxconfig/i18n/es/templates/global_sections/logging.js
index c8985be..a9ce17a 100644
--- a/src/nginxconfig/i18n/es/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/es/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} el registro de error de archivo no encontrado`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: 'agregar cabecera de petición de Cloudflare en el formato por defecto del registro',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/fr/templates/domain_sections/logging.js b/src/nginxconfig/i18n/fr/templates/domain_sections/logging.js
index 51d9cfb..9b46e2c 100644
--- a/src/nginxconfig/i18n/fr/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/fr/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: 'par domaine',
     enableForThisDomain: `${common.enable} pour ce domaine`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/fr/templates/domain_sections/php.js b/src/nginxconfig/i18n/fr/templates/domain_sections/php.js
index 23282b4..41e89df 100644
--- a/src/nginxconfig/i18n/fr/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/fr/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `Serveur de sauvegarde ${common.php}`,
     tcp: 'TCP',
     hhvmSocket: 'Socket HHVM',
-    php5Socket: 'Socket 5.x',
     php70Socket: 'Socket 7.0',
     php71Socket: 'Socket 7.1',
     php72Socket: 'Socket 7.2',
@@ -51,6 +50,7 @@ export default {
     php74Socket: 'Socket 7.4',
     php80Socket: 'Socket 8.0',
     php81Socket: 'Socket 8.1',
+    php82Socket: 'Socket 8.2',
     phpSocket: 'Socket PHP',
     custom: 'Custom',
     disabled: 'Désactivé',
diff --git a/src/nginxconfig/i18n/fr/templates/global_sections/logging.js b/src/nginxconfig/i18n/fr/templates/global_sections/logging.js
index ccce5bf..a401765 100644
--- a/src/nginxconfig/i18n/fr/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/fr/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} les erreurs de fichiers introuvables lors de la journalisation`,
     logformat: 'log_format',
+    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',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/ja/templates/domain_sections/logging.js b/src/nginxconfig/i18n/ja/templates/domain_sections/logging.js
index b1ff230..bcefbef 100644
--- a/src/nginxconfig/i18n/ja/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/ja/templates/domain_sections/logging.js
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: '(ドメインごと)',
     enableForThisDomain: `このドメインで${common.enable}`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/ja/templates/domain_sections/php.js b/src/nginxconfig/i18n/ja/templates/domain_sections/php.js
index cae645e..12238b9 100644
--- a/src/nginxconfig/i18n/ja/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/ja/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `${common.php} バックアップサーバ`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM socket',
-    php5Socket: '5.x socket',
     php70Socket: '7.0 socket',
     php71Socket: '7.1 socket',
     php72Socket: '7.2 socket',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 socket',
     php80Socket: '8.0 socket',
     php81Socket: '8.1 socket',
+    php82Socket: '8.2 socket',
     phpSocket: 'PHP socket',
     custom: 'カスタム',
     disabled: '無効',
diff --git a/src/nginxconfig/i18n/ja/templates/global_sections/logging.js b/src/nginxconfig/i18n/ja/templates/global_sections/logging.js
index 0a85911..990d68a 100644
--- a/src/nginxconfig/i18n/ja/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/ja/templates/global_sections/logging.js
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `FILE NOT FOUND エラーのロギングを${common.enable}`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: 'デフォルトのログフォーマットに Cloudflare のリクエストヘッダを追加する',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/pl/templates/domain_sections/logging.js b/src/nginxconfig/i18n/pl/templates/domain_sections/logging.js
index 5e02483..2bab9ee 100644
--- a/src/nginxconfig/i18n/pl/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/pl/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: 'wg. domen',
     enableForThisDomain: `${common.enable} dla tej domeny`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/pl/templates/domain_sections/php.js b/src/nginxconfig/i18n/pl/templates/domain_sections/php.js
index 3b3eb6f..e0d60ea 100644
--- a/src/nginxconfig/i18n/pl/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/pl/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `serwer backupowy ${common.php}`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM socket',
-    php5Socket: '5.x socket',
     php70Socket: '7.0 socket',
     php71Socket: '7.1 socket',
     php72Socket: '7.2 socket',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 socket',
     php80Socket: '8.0 socket',
     php81Socket: '8.1 socket',
+    php82Socket: '8.2 socket',
     phpSocket: 'PHP socket',
     custom: 'Własny',
     disabled: 'Wyłączony',
diff --git a/src/nginxconfig/i18n/pl/templates/global_sections/logging.js b/src/nginxconfig/i18n/pl/templates/global_sections/logging.js
index 06937f6..f830ca1 100644
--- a/src/nginxconfig/i18n/pl/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/pl/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} logowanie błędów o nieznalezionych plikach`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: 'dodaj nagłówki żądań Cloudflare do domyślnego formatu dziennika ',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/pt-br/templates/domain_sections/logging.js b/src/nginxconfig/i18n/pt-br/templates/domain_sections/logging.js
index b483d88..378acad 100644
--- a/src/nginxconfig/i18n/pt-br/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/pt-br/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: 'por domínio',
     enableForThisDomain: `${common.enable} para este domínio`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/pt-br/templates/domain_sections/php.js b/src/nginxconfig/i18n/pt-br/templates/domain_sections/php.js
index a6cf3a6..0fcff9d 100644
--- a/src/nginxconfig/i18n/pt-br/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/pt-br/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `Servidor de backup ${common.php}`,
     tcp: 'TCP',
     hhvmSocket: 'Socket HHVM',
-    php5Socket: 'Socket 5.x',
     php70Socket: 'Socket 7.0',
     php71Socket: 'Socket 7.1',
     php72Socket: 'Socket 7.2',
@@ -51,6 +50,7 @@ export default {
     php74Socket: 'Socket 7.4',
     php80Socket: 'Socket 8.0',
     php81Socket: 'Socket 8.1',
+    php82Socket: 'Socket 8.2',
     phpSocket: 'Socket PHP',
     custom: 'Custom', // TODO: translate
     disabled: 'Desabilitado',
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 864b3da..418578b 100644
--- a/src/nginxconfig/i18n/pt-br/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/pt-br/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} erro de arquivo não encontrado ao fazer login`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: 'adicionar cabeçalhos de solicitação Cloudflare ao formato de log padrão',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/ru/templates/domain_sections/logging.js b/src/nginxconfig/i18n/ru/templates/domain_sections/logging.js
index 1ad7d67..596f865 100644
--- a/src/nginxconfig/i18n/ru/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/ru/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: 'по домену',
     enableForThisDomain: `${common.enable} для этого домена`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/ru/templates/domain_sections/php.js b/src/nginxconfig/i18n/ru/templates/domain_sections/php.js
index 26ab4e8..5b72943 100644
--- a/src/nginxconfig/i18n/ru/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/ru/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `${common.php} бекап сервер`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM сокет',
-    php5Socket: '5.x сокет',
     php70Socket: '7.0 сокет',
     php71Socket: '7.1 сокет',
     php72Socket: '7.2 сокет',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 сокет',
     php80Socket: '8.0 сокет',
     php81Socket: '8.1 сокет',
+    php82Socket: '8.2 сокет',
     phpSocket: 'PHP сокет',
     custom: 'Другой',
     disabled: 'Выключено',
diff --git a/src/nginxconfig/i18n/ru/templates/global_sections/logging.js b/src/nginxconfig/i18n/ru/templates/global_sections/logging.js
index 19cfd71..5936a21 100644
--- a/src/nginxconfig/i18n/ru/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/ru/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable} логирование ошибок для файлов, которые не были найдены при запросе`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: 'добавить Cloudflare хедеры запроса в дефолтный формат логов',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/logging.js b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/logging.js
index 48323b6..1e69b69 100644
--- a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: '在此站点',
     enableForThisDomain: `为此站点${common.enable}`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/php.js b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/php.js
index b849ad6..72ab797 100644
--- a/src/nginxconfig/i18n/zh-cn/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/zh-cn/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `${common.php}备份服务器`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM socket',
-    php5Socket: '5.x socket',
     php70Socket: '7.0 socket',
     php71Socket: '7.1 socket',
     php72Socket: '7.2 socket',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 socket',
     php80Socket: '8.0 socket',
     php81Socket: '8.1 socket',
+    php82Socket: '8.2 socket',
     phpSocket: 'PHP socket',
     custom: '自定义',
     disabled: '禁用',
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 f3f8b60..019dea7 100644
--- a/src/nginxconfig/i18n/zh-cn/templates/global_sections/logging.js
+++ b/src/nginxconfig/i18n/zh-cn/templates/global_sections/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -29,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable}“文件未找到”错误日志：`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: '将Cloudflare请求头部添加到默认日志格式',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/logging.js b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/logging.js
index 20c9c93..a5260b8 100644
--- a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/logging.js
+++ b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/logging.js
@@ -29,4 +29,7 @@ import common from '../../common';
 export default {
     byDomain: '在此網域',
     enableForThisDomain: `為此網域${common.enable}`,
+    arguments: 'arguments', // TODO: translate
+    level: 'logging level', // TODO: translate
+    forRedirects: 'for redirects', // TODO: translate
 };
diff --git a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/php.js b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/php.js
index 4c80e89..edb9c89 100644
--- a/src/nginxconfig/i18n/zh-tw/templates/domain_sections/php.js
+++ b/src/nginxconfig/i18n/zh-tw/templates/domain_sections/php.js
@@ -43,7 +43,6 @@ export default {
     phpBackupServer: `${common.php} 備份伺服器`,
     tcp: 'TCP',
     hhvmSocket: 'HHVM 通訊端',
-    php5Socket: '5.x 通訊端',
     php70Socket: '7.0 通訊端',
     php71Socket: '7.1 通訊端',
     php72Socket: '7.2 通訊端',
@@ -51,6 +50,7 @@ export default {
     php74Socket: '7.4 通訊端',
     php80Socket: '8.0 通訊端',
     php81Socket: '8.1 通訊端',
+    php82Socket: '8.2 通訊端',
     phpSocket: 'PHP 通訊端',
     custom: '自訂',
     disabled: '停用',
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 a05d022..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,6 +29,7 @@ import common from '../../common';
 export default {
     enableFileNotFoundErrorLogging: `${common.enable}｢找不到檔案｣錯誤日誌：`,
     logformat: 'log_format',
+    level: 'logging level', // TODO: translate
     enableCloudflare: '將 Cloudflare 請求標頭加入預設日誌格式',
     cfRay: 'CF-Ray',
     cfConnectingIp: 'CF-Connecting-IP',
diff --git a/src/nginxconfig/templates/domain_sections/https.vue b/src/nginxconfig/templates/domain_sections/https.vue
index 71e2377..6bf8e13 100644
--- a/src/nginxconfig/templates/domain_sections/https.vue
+++ b/src/nginxconfig/templates/domain_sections/https.vue
@@ -227,6 +227,7 @@ THE SOFTWARE.
     import ExternalLink from 'do-vue/src/templates/external_link';
     import delegatedFromDefaults from '../../util/delegated_from_defaults';
     import computedFromDefaults from '../../util/computed_from_defaults';
+    import { serverDomainDefault } from '../../util/defaults';
     import PrettyCheck from '../inputs/checkbox';
     import PrettyRadio from '../inputs/radio';
 
@@ -269,7 +270,7 @@ THE SOFTWARE.
         },
         letsEncryptEmail: {
             default: '',
-            computed: 'info@example.com', // No default value, but a default computed
+            computed: `info@${serverDomainDefault}`, // No default value, but a default computed
             enabled: true,
         },
         sslCertificate: {
diff --git a/src/nginxconfig/templates/domain_sections/logging.vue b/src/nginxconfig/templates/domain_sections/logging.vue
index 3335a0e..f0770d6 100644
--- a/src/nginxconfig/templates/domain_sections/logging.vue
+++ b/src/nginxconfig/templates/domain_sections/logging.vue
@@ -26,35 +26,124 @@ THE SOFTWARE.
 
 <template>
     <div>
-        <div class="field is-horizontal">
-            <div class="field-label">
+        <div class="field is-horizontal is-aligned-top">
+            <div class="field-label has-small-margin-top">
                 <label class="label">access_log {{ $t('templates.domainSections.logging.byDomain') }}</label>
             </div>
             <div class="field-body">
                 <div class="field">
-                    <div :class="`control${accessLogChanged ? ' is-changed' : ''}`">
+                    <div :class="`control${accessLogEnabledChanged ? ' is-changed' : ''}`">
                         <div class="checkbox">
-                            <PrettyCheck v-model="accessLog" class="p-default p-curve p-fill p-icon">
+                            <PrettyCheck v-model="accessLogEnabled" class="p-default p-curve p-fill p-icon">
                                 {{ $t('templates.domainSections.logging.enableForThisDomain') }}
                             </PrettyCheck>
                         </div>
                     </div>
+                    <div v-if="$props.data.accessLogEnabled.computed" :class="`control field is-horizontal is-expanded${accessLogPathChanged ? ' is-changed' : ''}`">
+                        <input
+                            v-model="accessLogPath"
+                            class="input"
+                            type="text"
+                            :placeholder="$props.data.accessLogPath.default"
+                        />
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div v-if="$props.data.accessLogEnabled.computed" class="field is-horizontal">
+            <div class="field-label">
+                <label class="label">access_log {{ $t('templates.domainSections.logging.arguments') }}</label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <div :class="`control${accessLogParametersChanged ? ' is-changed' : ''}`">
+                        <input
+                            v-model="accessLogParameters"
+                            class="input"
+                            type="text"
+                            :placeholder="$props.data.accessLogParameters.default"
+                        />
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="field is-horizontal is-aligned-top">
+            <div class="field-label has-small-margin-top">
+                <label class="label">access_log {{ $t('templates.domainSections.logging.forRedirects') }}</label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <div :class="`control${redirectAccessLogChanged ? ' is-changed' : ''}`">
+                        <div class="checkbox">
+                            <PrettyCheck v-model="redirectAccessLog" class="p-default p-curve p-fill p-icon">
+                                {{ $t('common.enable') }}
+                            </PrettyCheck>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
 
-        <div class="field is-horizontal">
-            <div class="field-label">
+        <div class="field is-horizontal is-aligned-top">
+            <div class="field-label has-small-margin-top">
                 <label class="label">error_log {{ $t('templates.domainSections.logging.byDomain') }}</label>
             </div>
             <div class="field-body">
                 <div class="field">
-                    <div :class="`control${errorLogChanged ? ' is-changed' : ''}`">
+                    <div :class="`control${errorLogEnabledChanged ? ' is-changed' : ''}`">
                         <div class="checkbox">
-                            <PrettyCheck v-model="errorLog" class="p-default p-curve p-fill p-icon">
+                            <PrettyCheck v-model="errorLogEnabled" class="p-default p-curve p-fill p-icon">
                                 {{ $t('templates.domainSections.logging.enableForThisDomain') }}
                             </PrettyCheck>
                         </div>
+                        <div v-if="$props.data.errorLogEnabled.computed" :class="`control field is-horizontal is-expanded${errorLogPathChanged ? ' is-changed' : ''}`">
+                            <input
+                                v-model="errorLogPath"
+                                class="input"
+                                type="text"
+                                :disabled="!errorLogPathEnabled"
+                                :placeholder="$props.data.errorLogPath.default"
+                            />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div v-if="$props.data.errorLogEnabled.computed" class="field is-horizontal">
+            <div class="field-label">
+                <label class="label">error_log {{ $t('templates.domainSections.logging.level') }}</label>
+            </div>
+            <div class="field-body">
+                <div class="field is-horizontal">
+                    <div
+                        v-for="value in $props.data.errorLogLevel.options"
+                        :class="`control${errorLogLevelChanged && value === errorLogLevel ? ' is-changed' : ''}`"
+                    >
+                        <div class="radio">
+                            <PrettyRadio v-model="errorLogLevel" :value="value" class="p-default p-round p-fill p-icon">
+                                {{ value }}
+                            </PrettyRadio>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="field is-horizontal is-aligned-top">
+            <div class="field-label has-small-margin-top">
+                <label class="label">error_log {{ $t('templates.domainSections.logging.forRedirects') }}</label>
+            </div>
+            <div class="field-body">
+                <div class="field">
+                    <div :class="`control${redirectErrorLogChanged ? ' is-changed' : ''}`">
+                        <div class="checkbox">
+                            <PrettyCheck v-model="redirectErrorLog" class="p-default p-curve p-fill p-icon">
+                                {{ $t('common.enable') }}
+                            </PrettyCheck>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -65,14 +154,41 @@ THE SOFTWARE.
 <script>
     import delegatedFromDefaults from '../../util/delegated_from_defaults';
     import computedFromDefaults from '../../util/computed_from_defaults';
+    import { accessLogPathDefault, accessLogParamsDefault, errorLogPathDefault, errorLogPathDisabled, errorLogLevelDefault, errorLogLevelOptions, errorLogLevelDisabled } from '../../util/logging';
     import PrettyCheck from '../inputs/checkbox';
+    import PrettyRadio from '../inputs/radio';
 
     const defaults = {
-        accessLog: {
+        accessLogEnabled: {
+            default: true,
+            enabled: true,
+        },
+        accessLogPath: {
+            default: accessLogPathDefault,
+            enabled: true,
+        },
+        accessLogParameters: {
+            default: accessLogParamsDefault,
+            enabled: true,
+        },
+        redirectAccessLog: {
             default: false,
             enabled: true,
         },
-        errorLog: {
+        errorLogEnabled: {
+            default: true,
+            enabled: true,
+        },
+        errorLogPath: {
+            default: errorLogPathDefault,
+            enabled: true,
+        },
+        errorLogLevel: {
+            default: errorLogLevelDefault,
+            options: [errorLogLevelDisabled, ...errorLogLevelOptions],
+            enabled: true,
+        },
+        redirectErrorLog: {
             default: false,
             enabled: true,
         },
@@ -85,10 +201,26 @@ THE SOFTWARE.
         delegated: delegatedFromDefaults(defaults),             // Data the parent will present here
         components: {
             PrettyCheck,
+            PrettyRadio,
         },
         props: {
             data: Object,                                       // Data delegated back to us from parent
         },
         computed: computedFromDefaults(defaults, 'logging'),    // Getters & setters for the delegated data
+        watch: {
+            '$props.data.errorLogLevel': {
+                handler(data) {
+                    // disable `error_log` path selection if log level is set to `none`
+                    if (data.computed === errorLogLevelDisabled) {
+                        this.$props.data.errorLogPath.enabled = false;
+                        this.$props.data.errorLogPath.computed = errorLogPathDisabled;
+                    } else if (!this.$props.data.errorLogPath.enabled) {
+                        this.$props.data.errorLogPath.enabled = true;
+                        this.$props.data.errorLogPath.computed = this.$props.data.errorLogPath.value;
+                    }
+                },
+                deep: true,
+            },
+        },
     };
 </script>
diff --git a/src/nginxconfig/templates/domain_sections/php.vue b/src/nginxconfig/templates/domain_sections/php.vue
index af16fcd..b4d781e 100644
--- a/src/nginxconfig/templates/domain_sections/php.vue
+++ b/src/nginxconfig/templates/domain_sections/php.vue
@@ -197,7 +197,6 @@ THE SOFTWARE.
         '127.0.0.1:9000': 'templates.domainSections.php.tcp',
         '/var/run/hhvm/sock': 'templates.domainSections.php.hhvmSocket',
         '/var/run/hhvm/hhvm.sock': 'templates.domainSections.php.hhvmSocket',
-        '/var/run/php5-fpm.sock': 'templates.domainSections.php.php5Socket',
         '/var/run/php/php7.1-fpm.sock': 'templates.domainSections.php.php71Socket',
         '/var/run/php/php7.2-fpm.sock': 'templates.domainSections.php.php72Socket',
         '/var/run/php/php7.0-fpm.sock': 'templates.domainSections.php.php70Socket',
@@ -205,6 +204,7 @@ THE SOFTWARE.
         '/var/run/php/php7.4-fpm.sock': 'templates.domainSections.php.php74Socket',
         '/var/run/php/php8.0-fpm.sock': 'templates.domainSections.php.php80Socket',
         '/var/run/php/php8.1-fpm.sock': 'templates.domainSections.php.php81Socket',
+        '/var/run/php/php8.2-fpm.sock': 'templates.domainSections.php.php82Socket',
         '/var/run/php/php-fpm.sock': 'templates.domainSections.php.phpSocket',
         'custom': 'templates.domainSections.php.custom',
     };
diff --git a/src/nginxconfig/templates/domain_sections/server.vue b/src/nginxconfig/templates/domain_sections/server.vue
index 6f327e5..c13073b 100644
--- a/src/nginxconfig/templates/domain_sections/server.vue
+++ b/src/nginxconfig/templates/domain_sections/server.vue
@@ -147,16 +147,17 @@ THE SOFTWARE.
 <script>
     import delegatedFromDefaults from '../../util/delegated_from_defaults';
     import computedFromDefaults from '../../util/computed_from_defaults';
+    import { serverDomainDefault } from '../../util/defaults';
     import PrettyCheck from '../inputs/checkbox';
 
     const defaults = {
         domain: {
-            default: 'example.com',
+            default: serverDomainDefault,
             enabled: true,
         },
         path: {
             default: '',
-            computed: '/var/www/example.com', // No default value, but a default computed
+            computed: `/var/www/${serverDomainDefault}`, // No default value, but a default computed
             enabled: true,
         },
         documentRoot: {
diff --git a/src/nginxconfig/templates/global_sections/logging.vue b/src/nginxconfig/templates/global_sections/logging.vue
index c831a3b..c98106f 100644
--- a/src/nginxconfig/templates/global_sections/logging.vue
+++ b/src/nginxconfig/templates/global_sections/logging.vue
@@ -26,37 +26,46 @@ THE SOFTWARE.
 
 <template>
     <div>
-        <div class="field is-horizontal">
-            <div class="field-label">
-                <label class="label">access_log</label>
+        <div class="field is-horizontal is-aligned-top">
+            <div class="field-label has-small-margin-top">
+                <label class="label">error_log</label>
             </div>
             <div class="field-body">
                 <div class="field">
-                    <div :class="`control${accessLogChanged ? ' is-changed' : ''}`">
+                    <div :class="`control${errorLogEnabledChanged ? ' is-changed' : ''}`">
+                        <div class="checkbox">
+                            <PrettyCheck v-model="errorLogEnabled" class="p-default p-curve p-fill p-icon">
+                                {{ $t('common.enable') }}
+                            </PrettyCheck>
+                        </div>
+                    </div>
+                    <div v-if="$props.data.errorLogEnabled.computed" :class="`control field is-horizontal is-expanded${errorLogPathChanged ? ' is-changed' : ''}`">
                         <input
-                            v-model="accessLog"
+                            v-model="errorLogPath"
                             class="input"
                             type="text"
-                            :placeholder="$props.data.accessLog.default"
+                            :placeholder="$props.data.errorLogPath.default"
                         />
                     </div>
                 </div>
             </div>
         </div>
 
-        <div class="field is-horizontal">
+        <div v-if="$props.data.errorLogEnabled.computed" class="field is-horizontal">
             <div class="field-label">
-                <label class="label">error_log</label>
+                <label class="label">error_log {{ $t('templates.globalSections.logging.level') }}</label>
             </div>
             <div class="field-body">
-                <div class="field">
-                    <div :class="`control${errorLogChanged ? ' is-changed' : ''}`">
-                        <input
-                            v-model="errorLog"
-                            class="input"
-                            type="text"
-                            :placeholder="$props.data.errorLog.default"
-                        />
+                <div class="field is-horizontal">
+                    <div
+                        v-for="value in $props.data.errorLogLevel.options"
+                        :class="`control${errorLogLevelChanged && value === errorLogLevel ? ' is-changed' : ''}`"
+                    >
+                        <div class="radio">
+                            <PrettyRadio v-model="errorLogLevel" :value="value" class="p-default p-round p-fill p-icon">
+                                {{ value }}
+                            </PrettyRadio>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -157,15 +166,22 @@ THE SOFTWARE.
 <script>
     import delegatedFromDefaults from '../../util/delegated_from_defaults';
     import computedFromDefaults from '../../util/computed_from_defaults';
+    import { errorLogPathDefault, errorLogLevelDefault, errorLogLevelOptions } from '../../util/logging';
     import PrettyCheck from '../inputs/checkbox';
+    import PrettyRadio from '../inputs/radio';
 
     const defaults = {
-        accessLog: {
-            default: '/var/log/nginx/access.log',
+        errorLogEnabled: {
+            default: false,
             enabled: true,
         },
-        errorLog: {
-            default: '/var/log/nginx/error.log warn',
+        errorLogPath: {
+            default: errorLogPathDefault,
+            enabled: true,
+        },
+        errorLogLevel: {
+            default: errorLogLevelDefault,
+            options: errorLogLevelOptions,
             enabled: true,
         },
         logNotFound: {
@@ -217,6 +233,7 @@ THE SOFTWARE.
         delegated: delegatedFromDefaults(defaults),             // Data the parent will present here
         components: {
             PrettyCheck,
+            PrettyRadio,
         },
         props: {
             data: Object,                                       // Data delegated back to us from parent
diff --git a/src/nginxconfig/util/get_log_paths.js b/src/nginxconfig/util/defaults.js
similarity index 75%
rename from src/nginxconfig/util/get_log_paths.js
rename to src/nginxconfig/util/defaults.js
index d61db2c..a2dfe98 100644
--- a/src/nginxconfig/util/get_log_paths.js
+++ b/src/nginxconfig/util/defaults.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -24,10 +24,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-export const getAccessLogDomainPath = (domain, global) => {
-    return global.logging.accessLog.computed.replace(/([^/]+)\.log$/, `${domain.server.domain.computed}.$1.log`);
-};
-
-export const getErrorLogDomainPath = (domain, global) => {
-    return global.logging.errorLog.computed.replace(/([^/]+)\.log (.+)$/, `${domain.server.domain.computed}.$1.log $2`);
-};
+export const serverDomainDefault = 'example.com';
diff --git a/src/nginxconfig/util/logging.js b/src/nginxconfig/util/logging.js
new file mode 100644
index 0000000..4709121
--- /dev/null
+++ b/src/nginxconfig/util/logging.js
@@ -0,0 +1,55 @@
+/*
+Copyright 2022 DigitalOcean
+
+This code is licensed under the MIT License.
+You may obtain a copy of the License at
+https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+export const accessLogPathDefault = '/var/log/nginx/access.log';
+export const accessLogParamsDefault = 'buffer=512k flush=1m';
+
+export const errorLogPathDefault = '/var/log/nginx/error.log';
+export const errorLogPathDisabled = '/dev/null';
+export const errorLogLevelDefault = 'warn';
+export const errorLogLevelOptions = Object.freeze(['debug', 'info', 'notice', 'warn', 'error', 'crit', 'alert', 'emerg']);
+export const errorLogLevelDisabled = 'none';
+
+export const getDomainAccessLog = (domain, global) => {
+    let path = domain.logging.accessLogPath.computed.trim();
+    if (!path) {
+        path = accessLogPathDefault;
+    }
+
+    return path + 
+        (global.logging.cloudflare.computed ? ' cloudflare' : '') +
+        (domain.logging.accessLogParameters.computed.trim() ? ` ${domain.logging.accessLogParameters.computed.trim()}`: '');
+};
+
+export const getDomainErrorLog = (domain) => {
+    let path = domain.logging.errorLogPath.computed.trim();
+    if (!path) {
+        path = errorLogPathDefault;
+    }
+
+    const errorLogLevel = errorLogLevelOptions.includes(domain.logging.errorLogLevel.computed) ? ` ${domain.logging.errorLogLevel.computed}` : '';
+    return `${path}${errorLogLevel}`;
+};
diff --git a/src/nginxconfig/util/vue_backwards_compatibility.js b/src/nginxconfig/util/vue_backwards_compatibility.js
index a3ab923..9996ace 100644
--- a/src/nginxconfig/util/vue_backwards_compatibility.js
+++ b/src/nginxconfig/util/vue_backwards_compatibility.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 DigitalOcean
+Copyright 2022 DigitalOcean
 
 This code is licensed under the MIT License.
 You may obtain a copy of the License at
@@ -26,6 +26,71 @@ THE SOFTWARE.
 
 import isObject from './is_object';
 import deepMerge from './deep_merge';
+import { accessLogPathDefault, accessLogParamsDefault, errorLogPathDefault, errorLogPathDisabled, errorLogLevelDefault } from './logging';
+import { serverDomainDefault } from './defaults';
+
+// Migrate old logging settings to new ones
+const migrateLogging = data => {
+    if (Object.keys(data).length === 0) return;
+
+    const globalLogging = 'logging' in data.global && isObject(data.global.logging) ? data.global.logging : {};
+
+    // global access_log
+    const [globalAccessLogPath, ...globalAccessLogParameters] = (globalLogging.accessLog || accessLogPathDefault).split(' ');
+    const globalAccessLogEnabled = 
+        !('accessLog' in globalLogging) || // accessLog was enabled by default and might not appear at all
+        (globalAccessLogPath !== '' && globalAccessLogPath !== 'off'); // *or* someone turned it off explicitly
+
+    // global error_log
+    const [globalErrorLogPath, ...globalErrorLogLevel] = (globalLogging.errorLog || `${errorLogPathDefault} ${errorLogLevelDefault}`).split(' ');
+    const globalErrorLogEnabled = 
+        !('errorLog' in globalLogging) || // errorLog was enabled by default and might not appear at all
+        (globalErrorLogPath !== '' && globalErrorLogPath !== errorLogPathDisabled); // *or* someone turned it off explicitly
+
+    // set global access_log / error_log files for every domain UNLESS it was explicitly
+    // enabled for the domain
+    for (const key in data.domains) {
+        if (!Object.prototype.hasOwnProperty.call(data.domains, key)) continue;
+
+        const perDomainServer = {
+            domain: serverDomainDefault,
+            ...('server' in data.domains[key] && isObject(data.domains[key].server) ? data.domains[key].server : {}),
+        };
+        const perDomainLogging = 'logging' in data.domains[key] && isObject(data.domains[key].logging) ? data.domains[key].logging : {};
+
+        // access_log
+        let accessLogEnabled = globalAccessLogEnabled,
+            accessLogPath = globalAccessLogPath;
+        const accessLogParameters = globalAccessLogParameters.join(' ') || accessLogParamsDefault;
+
+        const perDomainAccessLogEnabled = !!perDomainLogging.accessLog;
+        if (perDomainAccessLogEnabled) {
+            accessLogEnabled = true;
+            accessLogPath = accessLogPath.replace(/([^/]+)\.log$/, `${perDomainServer.domain}.$1.log`);
+        }
+
+        // error_log
+        let errorLogEnabled = globalErrorLogEnabled,
+            errorLogPath = globalErrorLogPath;
+        const errorLogLevel = globalErrorLogLevel.join(' ') || errorLogLevelDefault;
+        
+        const perDomainErrorLogEnabled = !!perDomainLogging.errorLog;
+        if (perDomainErrorLogEnabled) {
+            errorLogEnabled = true;
+            errorLogPath = errorLogPath.replace(/([^/]+)\.log$/, `${perDomainServer.domain}.$1.log`);
+        }
+
+        data.domains[key].logging = {
+            accessLogEnabled,
+            accessLogPath,
+            accessLogParameters,
+            errorLogEnabled,
+            errorLogPath,
+            errorLogLevel,
+            ...perDomainLogging,
+        };
+    }
+};
 
 // Handle converting the old query format to our new query params
 export default data => {
@@ -68,4 +133,6 @@ export default data => {
             deepMerge(data.domains[key], mappedData);
         }
     }
+
+    migrateLogging(data);
 };