release 1.7.0

.env

@@ -2,7 +2,7 @@ PROJECT=biuro-www
 
 IMAGE_NGINX=fholzer/nginx-brotli
 IMAGE_MYSQL=mariadb:10.3
-IMAGE_WORDPRESS=biuro/web:1.6.13
+IMAGE_WORDPRESS=biuro/web:1.7.0
 IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
 
 DB_NAME=www_biuro

nginx/conf.d/server-shared.conf

@@ -13,8 +13,8 @@ include h5bp/cross-origin/requests.conf;
 root /var/www/html;
 index index.php;
 
-# ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-# ssl_certificate_key          /etc/letsencrypt/biuro/private.key;
+ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
+ssl_certificate_key          /etc/letsencrypt/biuro/private.key;
 
 location / {
     try_files $uri $uri/ /index.php?$args;

nginx/conf.d/www-biuro.conf

@@ -55,12 +55,6 @@ server {
 
     include /etc/nginx/conf.d/server-shared.conf;
 
-    # ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/biuro/private.key;
-
-    ssl_certificate                 /etc/letsencrypt/biuro.lt/fullchain.pem;
-    ssl_certificate_key          /etc/letsencrypt/biuro.lt/private.key;
-
     return 301 https://www.biuro.lt$request_uri;
 }
 
@@ -71,21 +65,10 @@ server {
 
     include /etc/nginx/conf.d/server-shared.conf;
 
-    # ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/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;
 }
 
-
-
-
-
-
 server {
     listen      443          ssl http2;
     listen [::]:443          ssl http2;
@@ -93,12 +76,6 @@ server {
 
     include /etc/nginx/conf.d/server-shared.conf;
 
-    # ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/biuro/private.key;
-
-    ssl_certificate                 /etc/letsencrypt/biuro.lv/fullchain.pem;
-    ssl_certificate_key          /etc/letsencrypt/biuro.lv/private.key;
-
     return 301 https://www.biuro.lv$request_uri;
 }
 
@@ -109,33 +86,10 @@ server {
 
     include /etc/nginx/conf.d/server-shared.conf;
 
-    # ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/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;
 }
 
-
-
-
-
-
 server {
     listen      443          ssl http2;
     listen [::]:443          ssl http2;
@@ -143,12 +97,6 @@ server {
 
     include /etc/nginx/conf.d/server-shared.conf;
 
-    # ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/biuro/private.key;
-
-    ssl_certificate                 /etc/letsencrypt/biuro.ee/fullchain.pem;
-    ssl_certificate_key          /etc/letsencrypt/biuro.ee/private.key;
-
     return 301 https://www.biuro.ee$request_uri;
 }
 
@@ -159,24 +107,6 @@ server {
 
     include /etc/nginx/conf.d/server-shared.conf;
 
-    # ssl_certificate                 /etc/letsencrypt/biuro/fullchain.pem;
-    # ssl_certificate_key          /etc/letsencrypt/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;
 }

nginx/nginx.conf

@@ -178,42 +178,3 @@ http {
 
     include /etc/nginx/conf.d/www-biuro.conf;
 }
-
-
-
-# user  nginx;
-# worker_processes  1;
-
-# error_log  /var/log/nginx/error.log warn;
-# pid        /var/run/nginx.pid;
-
-
-# events {
-#     worker_connections  1024;
-# }
-
-
-# http {
-#     include       /etc/nginx/mime.types;
-#     default_type  application/octet-stream;
-
-#     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-#                       '$status $body_bytes_sent "$http_referer" '
-#                       '"$http_user_agent" "$http_x_forwarded_for"';
-
-#     access_log  /var/log/nginx/access.log  main;
-
-#     sendfile        on;
-#     #tcp_nopush     on;
-
-#     keepalive_timeout  65;
-
-#     gzip  on;
-#     brotli on;
-
-#     ################################
-#     # DO WHATEVER YOU WANT HERE :) #
-#     ################################
-
-#     include /etc/nginx/conf.d/*.conf;
-# }

nginx/php.ini

 file_uploads = On
 memory_limit = 64M
-upload_max_filesize = 64M
-post_max_size = 64M
+upload_max_filesize = 10M
+post_max_size = 10M
 max_execution_time = 600

nginx/redirects/biuro.ee.conf

+
+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;
+}
+
 # ----------------------------------------------------------------------
 # CV security redirects
 # ----------------------------------------------------------------------

nginx/redirects/biuro.lv.conf

+
+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;
+}
+
 # ----------------------------------------------------------------------
 # CV security redirects
 # ----------------------------------------------------------------------