Merge branch 'release-1.3.0'

.env

@@ -2,7 +2,7 @@ PROJECT=biuro-staging
 
 IMAGE_NGINX=fholzer/nginx-brotli
 IMAGE_MYSQL=mariadb:10.3
-IMAGE_WORDPRESS=biuro/web:1.2.0
+IMAGE_WORDPRESS=biuro/web:1.3.0
 IMAGE_WORDPRESS_CLI=wordpress:cli-php7.3
 
 DB_NAME=staging_biuro

docker-compose.yml

@@ -98,33 +98,45 @@ services:
             /bin/sh -c '
                 sleep 15;
                 echo "WP CLI init";
+
                 wp core update --force;
                 wp core update-db --network;
-                wp option update permalink_structure "/%postname%/" --skip-themes --skip-plugins;
+
+                # wp option update permalink_structure "/%postname%/" --skip-themes --skip-plugins;
                 # wp option update timezone_string "Manual Offsets/UTC+2";
                 # wp option update date_format "Y-m-d";
-                wp option update time_format "H:i";
+                # wp option update time_format "H:i";
                 # wp plugin install permalink-manager --force --activate-network;
-                wp plugin install pods --activate-network;
-                wp plugin install polylang --activate-network;
-                wp plugin install wordpress-seo --activate-network;
-                wp plugin install loco-translate --activate-network;
-                wp plugin install google-sitemap-generator --activate-network;
-                wp plugin update --all;
-                wp plugin activate akismet --network;
-                wp plugin activate biuro-contacts --network;
-                wp plugin activate biuro-feedbacks --network;
-                wp plugin activate biuro-html --network;
-                wp plugin activate biuro-sections --network;
-                wp plugin activate biuro-services --network;
-                wp plugin activate biuro-values --network;
-                wp plugin activate cookies-warning --network;
-                wp plugin activate data-controller --network;
-                wp theme update --all;
-                wp theme activate biuro;
+                # wp plugin install pods --activate-network;
+                # wp plugin install polylang --activate-network;
+                # wp plugin install wordpress-seo --activate-network;
+                # wp plugin install loco-translate --activate-network;
+                # wp plugin install google-sitemap-generator --activate-network;
+                # wp plugin update --all;
+
+                wp plugin update akismet --version=4.1.2;
+                wp plugin uninstall hello;
+
+                # wp plugin activate akismet --network;
+                # wp plugin activate biuro-contacts --network;
+                # wp plugin activate biuro-feedbacks --network;
+                # wp plugin activate biuro-html --network;
+                # wp plugin activate biuro-sections --network;
+                # wp plugin activate biuro-services --network;
+                # wp plugin activate biuro-values --network;
+                # wp plugin activate cookies-warning --network;
+                # wp plugin activate data-controller --network;
+                # wp theme update --all;
+                # wp theme activate biuro;
+
+                wp theme delete twentynineteen
+                wp theme delete twentyseventeen
+                wp theme delete twentysixteen
+
                 wp language core update;
                 wp language theme update --all;
                 wp language plugin update --all;
+
                 echo "WP CLI done. Ready to use.";
             '
 

nginx/redirects/biuro.ee.conf

@@ -2,7 +2,7 @@
 # CV security redirects
 # ----------------------------------------------------------------------
 
-location ^~ /wp-content/uploads/2019/ {
+location ^~ /wp-content/uploads/sites/3/additional/ {
     try_files $uri $uri/ /index.php?$args;
 
     if ($http_referer !~* .*livas.biuro.ee.*) {
@@ -14,6 +14,8 @@ location ^~ /wp-content/uploads/2019/ {
 # 301 biuro.ee redirects
 # ----------------------------------------------------------------------
 
+rewrite ^/admin/?$ /wp-login.php permanent;
+
 # Biuro SEO issues
 # https://docs.google.com/spreadsheets/d/1dXP0dh_v2sFajrcwR2_9HONMadCdZQW4Y2dVXvhxG3E/edit?ts=5b5eaa6b#gid=0
 # https://docs.google.com/spreadsheets/d/1wFz9wrCsPOwCm0R0NnrImhUMFlF35Y4-vCOL7fyZpmI/edit#gid=280898487

nginx/redirects/biuro.lt.conf

@@ -10,10 +10,20 @@ location ^~ /wp-content/uploads/2019/ {
     }
 }
 
+location ^~ /wp-content/uploads/additional/ {
+    try_files $uri $uri/ /index.php?$args;
+
+    if ($http_referer !~* .*livas.biuro.lt.*) {
+        return 403;
+    }
+}
+
 # ----------------------------------------------------------------------
 # 301 biuro.lt redirects
 # ----------------------------------------------------------------------
 
+rewrite ^/admin/?$ /wp-login.php permanent;
+
 # rewrite ^/darbo-pasiulymai$ / permanent;
 # rewrite ^/darbo-pasiulymai/(.*)$ /? permanent;
 

nginx/redirects/biuro.lv.conf

@@ -2,7 +2,7 @@
 # CV security redirects
 # ----------------------------------------------------------------------
 
-location ^~ /wp-content/uploads/2019/ {
+location ^~ /wp-content/uploads/sites/2/additional/ {
     try_files $uri $uri/ /index.php?$args;
 
     if ($http_referer !~* .*livas.biuro.lv.*) {
@@ -14,6 +14,8 @@ location ^~ /wp-content/uploads/2019/ {
 # 301 biuro.lv redirects
 # ----------------------------------------------------------------------
 
+rewrite ^/admin/?$ /wp-login.php permanent;
+
 # Biuro SEO issues
 # https://docs.google.com/spreadsheets/d/1dXP0dh_v2sFajrcwR2_9HONMadCdZQW4Y2dVXvhxG3E/edit?ts=5b5eaa6b#gid=0
 # https://docs.google.com/spreadsheets/d/1wFz9wrCsPOwCm0R0NnrImhUMFlF35Y4-vCOL7fyZpmI/edit#gid=0