Commit b9439d7e authored by Simonas's avatar Simonas

Merge branch 'release-1.4.0'

parents b16944a8 bbedb00c
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,7 +2,7 @@ PROJECT=biuro-staging ...@@ -2,7 +2,7 @@ PROJECT=biuro-staging
IMAGE_NGINX=fholzer/nginx-brotli IMAGE_NGINX=fholzer/nginx-brotli
IMAGE_MYSQL=mariadb:10.3 IMAGE_MYSQL=mariadb:10.3
IMAGE_WORDPRESS=biuro/web:1.3.1 IMAGE_WORDPRESS=biuro/web:1.4.0
IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3 IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
DB_NAME=staging_biuro DB_NAME=staging_biuro
......
...@@ -24,9 +24,6 @@ server { ...@@ -24,9 +24,6 @@ server {
ssl_certificate /etc/letsencrypt/staging.biuro/fullchain.pem; ssl_certificate /etc/letsencrypt/staging.biuro/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/staging.biuro/private.key; ssl_certificate_key /etc/letsencrypt/staging.biuro/private.key;
# ssl_certificate /etc/letsencrypt/biuro.lt/fullchain.pem;
# ssl_certificate_key /etc/letsencrypt/biuro.lt/private.key;
# 301 redirects # 301 redirects
include redirects/biuro.lt.conf; include redirects/biuro.lt.conf;
} }
...@@ -41,8 +38,17 @@ server { ...@@ -41,8 +38,17 @@ server {
ssl_certificate /etc/letsencrypt/staging.biuro/fullchain.pem; ssl_certificate /etc/letsencrypt/staging.biuro/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/staging.biuro/private.key; ssl_certificate_key /etc/letsencrypt/staging.biuro/private.key;
# ssl_certificate /etc/letsencrypt/biuro.lv/fullchain.pem; location =/robots.txt {
# ssl_certificate_key /etc/letsencrypt/biuro.lv/private.key; root /var/www/html/biuro.lv;
}
location =/sitemap.xml {
root /var/www/html/biuro.lv;
}
location =/old-sitemap.xml {
root /var/www/html/biuro.lv;
}
# 301 redirects # 301 redirects
include redirects/biuro.lv.conf; include redirects/biuro.lv.conf;
...@@ -59,8 +65,17 @@ server { ...@@ -59,8 +65,17 @@ server {
ssl_certificate /etc/letsencrypt/staging.biuro/fullchain.pem; ssl_certificate /etc/letsencrypt/staging.biuro/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/staging.biuro/private.key; ssl_certificate_key /etc/letsencrypt/staging.biuro/private.key;
# ssl_certificate /etc/letsencrypt/biuro.ee/fullchain.pem; location =/robots.txt {
# ssl_certificate_key /etc/letsencrypt/biuro.ee/private.key; root /var/www/html/biuro.ee;
}
location =/sitemap.xml {
root /var/www/html/biuro.ee;
}
location =/old-sitemap.xml {
root /var/www/html/biuro.ee;
}
# 301 redirects # 301 redirects
include redirects/biuro.ee.conf; include redirects/biuro.ee.conf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment