Merge remote-tracking branch 'origin/main' into production

Author: mikethicke

Dockerfile.nginx

@@ -1,13 +1,10 @@
 # Nginx container for running WordPress on production
-
 FROM nginx:stable-alpine3.19
 
 # Ensure that important users and groups have consistent IDs across all containers.
 # 82 is the standard uid/gid for "www-data" on php-fpm Alpine.
 RUN adduser -u 82 -D -S -G www-data www-data \
-	&& addgroup nginx www-data \
-	&& addgroup -g 33 xfs || true \
-	&& addgroup nginx xfs
+	&& addgroup nginx www-data
 
 COPY ./config/all/nginx/nginx.conf /etc/nginx/
 COPY ./config/all/nginx/templates /etc/nginx/templates

composer.json

@@ -69,7 +69,7 @@
     "wpackagist-plugin/multisite-plugin-manager":"^3.1.6",
     "wpackagist-plugin/ninja-forms":"^3.6.16",
     "wpackagist-plugin/participants-database":"^2.1.5",
-    "wpackagist-plugin/pressforward":"^5.2.9",
+    "wpackagist-plugin/pressforward":"^5.8.0",
     "wpackagist-plugin/redis-cache":"^2.0.26",
     "wpackagist-plugin/so-widgets-bundle":"^1.36.0",
     "wpackagist-plugin/wordpress-importer":"^0.8",

config/all/nginx/templates/redirects.conf.template

@@ -608,4 +608,4 @@ if ($http_host = "stemedplus.commons.msu.edu") {
 
 if ($http_host = "sofiabacasen.commons.msu.edu") {
 	rewrite ^/(.*)$ https://sofiabacasen.hcommons.org/ permanent;
-}
+}

docs/user-content.md

@@ -2,12 +2,12 @@
 
 ## Accessing Content
 
-To work with user content, you need to import the WordPress database and uploads directory. 
+To work with user content, you need to import the WordPress database and uploads directory.
 
 The uploads directory can be accessed through AWS EFS via an NFS mount. You can do this by:
 
 1. Ensure that your local machine can mount NFS v4 shares.
-2. Copy the `.lando.efs.yml` file to `.lando.yml` in the root of the project. This configuration should work for macOS, but may need to be adjusted for other OSes, depending on the NFS client being used. (See [NFS configuration](#NFS-Configuration) below.)
+2. Copy the `.lando.efs.yml` file to `.lando.yml` in the root of the project. This configuration should work for macOS, but may need to be adjusted for other OSes, depending on the NFS client being used. (See [NFS configuration](#nfs-configuration) below.)
 3. Connect to the Commons OpenVPN.
 4. Rebuild with `./lando-rebuild.sh`.
 
@@ -23,16 +23,16 @@ For ubuntu, you may need to install the `nfs-common` package. You may also need
 
 ```yaml
 wp_uploads:
-	driver: local
-	driver_opts:
-		type: nfs4
-		o: addr=10.100.11.189,ro
-		device: ":/"
+    driver: local
+    driver_opts:
+        type: nfs4
+        o: addr=10.100.11.189,ro
+        device: ":/"
 ```
 
 ## Logging in to the site
 
 There are two login options for local development:
 
 1) Login using the WordPress native login. When the site is up, run `lando reset-local-passwords` to reset all passwords to 'password'. You can then log in using the WordPress login form.
-2) Login using the dev IDMS stack. Once secrets have been imported using `scripts/get-local-secrets.php`, your local instance should be able to login using the dev IDMS stack, as you would from EC2-based dev instances. (Local enrollment flows do not yet exist, so you cannot register using this method.)
+2) Login using the dev IDMS stack. Once secrets have been imported using `scripts/get-local-secrets.php`, your local instance should be able to login using the dev IDMS stack, as you would from EC2-based dev instances. (Local enrollment flows do not yet exist, so you cannot register using this method.)

scripts/build-scripts/link-efs-themes-plugins.sh

@@ -4,6 +4,7 @@
 if [ -d "/content/plugins" ]; then
   for plugin in /content/plugins/*/; do
     if [ -d "$plugin" ]; then
+      rm -rf /app/site/web/app/plugins/$plugin
       ln -sf "$plugin" /app/site/web/app/plugins/
     fi
   done
@@ -13,6 +14,7 @@ fi
 if [ -d "/content/themes" ]; then
   for theme in /content/themes/*/; do
     if [ -d "$theme" ]; then
+      rm -rf /app/site/web/app/themes/$theme
       ln -sf "$theme" /app/site/web/app/themes/
     fi
   done

themes/aupresses-jobs/functions.php

@@ -29,7 +29,7 @@ function aupresses_enqueue_styles() {
 function dm_display_wpjm_single_categories () {
 	$terms = wp_get_post_terms( get_the_ID(), 'job_listing_category' );
 	if ( ! empty( $terms ) && ! is_wp_error( $terms ) ){
-			echo '<div class="job-categories-wrapper"><span>Catgeory:</span><ul>';
+			echo '<div class="job-categories-wrapper"><span>Category:</span><ul>';
 			foreach ( $terms as $term ) {
 					echo '<li>' . $term->name . '</li>';
 			}
@@ -51,6 +51,7 @@ function dm_display_wpjm_single_categories () {
 function custom_submit_job_form_fields_dm( $fields ) {
 	unset($fields['company']['company_tagline']);
 	unset($fields['company']['company_video']);
+	unset($fields['company']['company_twitter']);
 
 	$fields['job']['application']['label'] = "URL or email for the 'Apply for job' button";
   $fields['job']['application']['description'] = "Defaults to your email address.";