Merge branch 'release-1.4.0'

b9439d7e · Simonas · b16944a8 · bbedb00c · b9439d7e · b9439d7e
Commit b9439d7e authored Jun 12, 2019 by Simonas
Showing with 4629 additions and 8 deletions

data-021.sql !information/data-021.sql +2301 -0

data-022.sql !information/data-022.sql +2305 -0

.env .env +1 -1

staging-biuro.conf nginx/conf.d/staging-biuro.conf +22 -7

No files found.
--- a/!information/data-021.sql
+++ b/!information/data-021.sql
--- a/!information/data-022.sql
+++ b/!information/data-022.sql
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@ PROJECT=biuro-staging

 IMAGE_NGINX=fholzer/nginx-brotli
 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

 DB_NAME=staging_biuro

--- a/nginx/conf.d/staging-biuro.conf
+++ b/nginx/conf.d/staging-biuro.conf
@@ -24,9 +24,6 @@ server {
    ssl_certificate                 /etc/letsencrypt/staging.biuro/fullchain.pem;
    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
    include redirects/biuro.lt.conf;
 }
@@ -41,8 +38,17 @@ server {
    ssl_certificate                 /etc/letsencrypt/staging.biuro/fullchain.pem;
    ssl_certificate_key          /etc/letsencrypt/staging.biuro/private.key;

-    # ssl_certificate                 /etc/letsencrypt/biuro.lv/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/biuro.lv/private.key;
+    location =/robots.txt {
+        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
    include redirects/biuro.lv.conf;
@@ -59,8 +65,17 @@ server {
    ssl_certificate                 /etc/letsencrypt/staging.biuro/fullchain.pem;
    ssl_certificate_key          /etc/letsencrypt/staging.biuro/private.key;

-    # ssl_certificate                 /etc/letsencrypt/biuro.ee/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/biuro.ee/private.key;
+    location =/robots.txt {
+        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
    include         redirects/biuro.ee.conf;