nginx - update templates - replace deprecated variables with new

MatthewPattell · Dec 26, 2018 · 27bc312
1 parent f8c17e7
commit 27bc312
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/docker/nginx/templates/admin.conf b/docker/nginx/templates/admin.conf
@@ -1,5 +1,5 @@
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # allow domains:
 #

diff --git a/docker/nginx/templates/api.conf b/docker/nginx/templates/api.conf
@@ -1,5 +1,5 @@
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # allow domains:
 #

diff --git a/docker/nginx/templates/coverage.conf b/docker/nginx/templates/coverage.conf
@@ -1,5 +1,5 @@
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # allow domains:
 #

diff --git a/docker/nginx/templates/domain.conf b/docker/nginx/templates/domain.conf
@@ -1,5 +1,5 @@
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # allow domains:
 #
@@ -41,15 +41,15 @@ server {
  location ~ ^(.*)robots\.(.*)$ {
  log_not_found off;
  access_log off;
- try_files $uri $uri/ /robots_$TOPDOMAIN.txt
+ try_files $uri $uri/ /robots_$DOMAIN_1LVL.txt
  break;
  }
 
  # sitemap.xml (sitemap.xml -> sitemap_[by].xml)
  location ~ ^(.*)sitemap\.(.*)$ {
  log_not_found off;
  access_log off;
- try_files $uri $uri/ /sitemap_$TOPDOMAIN.xml;
+ try_files $uri $uri/ /sitemap_$DOMAIN_1LVL.xml;
  break;
  }
 

diff --git a/docker/nginx/templates/opcache.conf b/docker/nginx/templates/opcache.conf
@@ -1,5 +1,5 @@
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # allow domains:
 #

diff --git a/docs/CI-EXAMPLE.md b/docs/CI-EXAMPLE.md
@@ -107,7 +107,7 @@ SERVICES="$SERVICES -f docker/docker-compose.common.yml -f !!docker-compose.test
 Contains your `common-test.conf` file in `docker/nginx/conf-dynamic.d`:
 ```
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # allow domains:
 #
@@ -117,7 +117,7 @@ Contains your `common-test.conf` file in `docker/nginx/conf-dynamic.d`:
 
 # change certificate domain:
 #
-# <certificate-domain>$C_DOMAIN.$TOPDOMAIN</certificate-domain>
+# <certificate-domain>$CERTIFICATE_DOMAIN</certificate-domain>
 
 server {
  charset utf-8;

diff --git a/sample/nginx/conf-dynamic.d/sample.conf b/sample/nginx/conf-dynamic.d/sample.conf
@@ -1,5 +1,5 @@
 # Variable automaticaly replaced:
-# TOPDOMAIN, SSL_INCLUDE, COMMON_DOMAIN, C_DOMAIN, PARSED_DOMAINS
+# SSL_INCLUDE, COMMON_DOMAIN, PARSED_DOMAINS, DOMAIN_1LVL, DOMAIN_2LVL
 
 # copy template:
 #
@@ -13,7 +13,7 @@
 
 # change certificate domain:
 #
-# <certificate-domain>$C_DOMAIN.$TOPDOMAIN</certificate-domain>
+# <certificate-domain>$CERTIFICATE_DOMAIN</certificate-domain>
 
 # root path:
 #