Merge remote-tracking branch 'origin/production'

MESH-Research · Sep 25, 2024 · 91e5c37 · 91e5c37
2 parents a03af2d + c6752d9
commit 91e5c37
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/config/all/nginx/templates/redirects.conf.template b/config/all/nginx/templates/redirects.conf.template
@@ -599,3 +599,8 @@ if ($http_host = "building.hcommons.org") {
 if ($http_host = "stemedplus.commons.msu.edu") {
 	rewrite ^/(.*)$ https://stemedplus.hcommons.org/ permanent;
 }
+
+# Redirects for plugins and themes that aren't compatible with knowledge-commons-wordpress folder structure
+rewrite ^/app/core-plugins/(.*) https://${DOMAIN_NAME}/app/plugins/$1 permanent;
+rewrite ^/app/forked-plugins/(.*) https://${DOMAIN_NAME}/app/plugins/$1 permanent;
+rewrite ^/app/ancillary-plugins/(.*) https://${DOMAIN_NAME}/app/plugins/$1 permanent;
diff --git a/core-plugins/humcore/functions.php b/core-plugins/humcore/functions.php
@@ -1870,6 +1870,9 @@ function humcore_deposits_can_deposit_for_others( $user_id ) {
 			'1053480', // emeryma4
 			'1053525', // denniss9
 			'1056213', // salhabje
+			'1055912', // vcweller
+			'1057442', // mbonete
+			'1052148', // hende472
 		) 
 	);
 	return apply_filters( 'humcore_deposits_can_deposit_for_others', $user_id );

diff --git a/scripts/cron/commons.crontab b/scripts/cron/commons.crontab
@@ -18,5 +18,5 @@
 # Run wp-cron for base sites once per hour
 0 * * * * [ "$RUN_CRON" = "true" ] && /app/scripts/cron/all_networks_wp.bash cron event run --due-now
 
-# Run wp-cron once per day
-0 1 * * * [ "$RUN_CRON" = "true" ] && wp site list --field=url | xargs -i -n1 sudo -u www-data /usr/local/bin/wp --path=/srv/www/commons/current/web/wp cron event run --due-now --url="{}"
+# Run wp-cron for all sites every 3 hours
+30 */3 * * * [ "$RUN_CRON" = "true" ] && wp site list --field=url | xargs -i -n1 wp cron event run --due-now --url="{}"
diff --git a/site/config/application.php b/site/config/application.php
@@ -225,6 +225,9 @@ function_exists('wp_is_cli') && wp_is_cli()
  */
 Config::define('REDIS_HOST', getenv('REDIS_HOST'));       // wp-redis
 Config::define('WP_REDIS_HOST', getenv('WP_REDIS_HOST')); // redis-cache
+Config::define('WP_REDIS_MAXTTL', 60 * 60 * 24);
+Config::define('WP_REDIS_TIMEOUT', 4);
+Config::define('WP_REDIS_READ_TIMEOUT', 4);
 
 /**
  * ElasticPress Elasticsearch