diff --git a/nginx_config_maker/model.nextcloud.mjs b/nginx_config_maker/model.nextcloud.mjs index c2cbc955..d6ec716e 100644 --- a/nginx_config_maker/model.nextcloud.mjs +++ b/nginx_config_maker/model.nextcloud.mjs @@ -15,7 +15,7 @@ export function makeHostFileForNextcloud (domainConfig) { server { # redirect from www to non-www server_name ${domainConfig.domain}; - listen 80 http2; + listen 80; return 301 https://${domainWithoutWWW}$request_uri; } `; @@ -25,7 +25,7 @@ server { server { # redirect from non-www to www server_name ${domainWithoutWWW}; - listen 80 http2; + listen 80; return 301 https://${domainConfig.domain}$request_uri; } `; @@ -35,7 +35,7 @@ server { server { # redirect to https from http no WWW server_name ${domainWithoutWWW}; - listen 80 http2; + listen 80; return 301 https://${domainWithoutWWW}$request_uri; } `; @@ -43,7 +43,7 @@ server { redirectToWWWConf += `\tserver { \t\t\t\t# redirect from www to HTTPS too server_name ${domainConfig.domain}; - listen 80 http2; + listen 80; return 301 https://${domainConfig.domain}$request_uri; }` } diff --git a/nginx_config_maker/model.php-website.mjs b/nginx_config_maker/model.php-website.mjs index b41d906c..35bba4c6 100644 --- a/nginx_config_maker/model.php-website.mjs +++ b/nginx_config_maker/model.php-website.mjs @@ -23,7 +23,7 @@ export function makeHostFileForPhpPages (domainConfig) { \tserver { \t\t# redirect from www to non-www \t\tserver_name ${domainConfig.domain}; -\t\tlisten 80 http2; +\t\t listen 80; \t\treturn 301 https://${domainWithoutWWW}$request_uri; \t} `; @@ -33,7 +33,7 @@ export function makeHostFileForPhpPages (domainConfig) { \tserver { \t\t# redirect from non-www to www \t\tserver_name ${domainWithoutWWW}; -\t\tlisten 80 http2; +\t\t listen 80; ${certbotChallengeAcmeRedirect} \t\treturn 301 http://${domainConfig.domain}$request_uri; \t} @@ -44,7 +44,7 @@ ${certbotChallengeAcmeRedirect} \tserver { \t\t# redirect to https from http no WWW \t\tserver_name ${domainWithoutWWW}; -\t\tlisten 80 http2; +\t\t listen 80; \t\t# return 301 https://${domainWithoutWWW}$request_uri; @@ -54,7 +54,7 @@ ${certbotChallengeAcmeRedirect} redirectToWWWConf += `\tserver { \t\t\t\t# redirect from www to HTTPS too server_name ${domainConfig.domain}; - listen 80 http2; + listen 80; return 301 https://${domainConfig.domain}$request_uri; }` } diff --git a/nginx_config_maker/model.symfony.mjs b/nginx_config_maker/model.symfony.mjs index 16e76b68..5e7d8731 100644 --- a/nginx_config_maker/model.symfony.mjs +++ b/nginx_config_maker/model.symfony.mjs @@ -12,7 +12,7 @@ export function makeHostFileForSymfony(domainConfig){ server { server_name ${domainConfig.name}; - listen 80 http2; + listen 80; return 301 https://${domainConfig.name}$request_uri; } diff --git a/nginx_config_maker/model.wordpress.mjs b/nginx_config_maker/model.wordpress.mjs index 44207e66..31ac4354 100644 --- a/nginx_config_maker/model.wordpress.mjs +++ b/nginx_config_maker/model.wordpress.mjs @@ -25,7 +25,7 @@ export function makeHostFileForWordpress (domainConfig) { server { # redirect to https from http server_name ${domainConfig.domain}; - listen 80 http2; + listen 80; return 301 https://${domainConfig.domain}$request_uri; }