Merge pull request #14 from oracle-quickstart/develop2

Fixes for multinode scenario when WP upgrade to be executed in WP-admin tool

Author: lfeldman

modules/wordpress/main.tf

@@ -33,6 +33,7 @@ data "template_file" "install_wp" {
 
   vars = {
     wp_working_dir = var.wp_working_dir
+    wp_version     = var.wp_version
   }
 }
 

modules/wordpress/scripts/install_wp.sh

@@ -3,9 +3,12 @@
 
 echo "Starting Wordpress installation..."
 cd ${wp_working_dir}/www/
-wget https://wordpress.org/latest.tar.gz
-tar zxvf latest.tar.gz
-rm -rf html/ latest.tar.gz
+wget https://wordpress.org/wordpress-${wp_version}.tar.gz
+tar zxvf wordpress-${wp_version}.tar.gz
+rm -rf html/ wordpress-${wp_version}.tar.gz
+#wget https://wordpress.org/latest.tar.gz
+#tar zxvf latest.tar.gz
+#rm -rf html/ latest.tar.gz
 mv wordpress html
 chown apache. -R html
 sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 512M/g' /etc/php.ini

modules/wordpress/scripts/setup_fss.sh

@@ -4,12 +4,12 @@
 export use_shared_storage='${use_shared_storage}'
 
 if [[ $use_shared_storage == "true" ]]; then
-  echo "Mount NFS share for WP-CONTENT directory."
+  echo "Mount NFS share for WP-CONTENT, WP-ADMIN, WP-INCLUDES directories."
   yum install -y -q nfs-utils
   mkdir -p ${wp_shared_working_dir}
   echo '${mt_ip_address}:${wp_shared_working_dir} ${wp_shared_working_dir} nfs nosharecache,context="system_u:object_r:httpd_sys_rw_content_t:s0" 0 0' >> /etc/fstab
   setsebool -P httpd_use_nfs=1
   mount ${wp_shared_working_dir}
   mount
-  echo "NFS share for WP-CONTENT directory mounted."
+  echo "NFS share for WP-CONTENT, WP-ADMIN, WP-INCLUDES directories mounted."
 fi

modules/wordpress/scripts/setup_wp.sh

@@ -62,4 +62,39 @@ if [[ $use_shared_storage == "true" ]]; then
   ls -latr ${wp_shared_working_dir}/wp-content/
   chown -R apache:apache /sharedwp
   echo "WP-CONTENT in shared NFS space."
+
+  echo "Using shared storage, moving WP-ADMIN and WP-INCLUDES directories to shared NFS space."
+  mkdir ${wp_shared_working_dir}/wp-admin/
+  mkdir ${wp_shared_working_dir}/wp-includes/
+
+  echo "... moving WP-ADMIN/* ..."
+  cp -r ${wp_working_dir}/www/html/wp-admin/* ${wp_shared_working_dir}/wp-admin/
+  rm -rf ${wp_working_dir}/www/html/wp-admin/
+  ln -s ${wp_shared_working_dir}/wp-admin ${wp_working_dir}/www/html/wp-admin
+  chown -R apache:apache ${wp_shared_working_dir}/wp-admin
+  chown -R apache:apache ${wp_working_dir}/www/html/wp-admin
+  ls -latr ${wp_shared_working_dir}/wp-admin
+  echo "... WP-ADMIN/* moved to NFS..."
+
+  echo "... moving WP-INCLUDES/* ..."
+  cp -r ${wp_working_dir}/www/html/wp-includes/* ${wp_shared_working_dir}/wp-includes/
+  rm -rf ${wp_working_dir}/www/html/wp-includes/
+  ln -s ${wp_shared_working_dir}/wp-includes ${wp_working_dir}/www/html/wp-includes
+  chown -R apache:apache ${wp_shared_working_dir}/wp-includes
+  chown -R apache:apache ${wp_working_dir}/www/html/wp-includes
+  ls -latr ${wp_shared_working_dir}/wp-includes
+  echo "... WP-INCLUDES/* moved to NFS..."
+
+  echo "... coping rest of the root level PHP files and .htaccess ..."
+  cp -r ${wp_working_dir}/www/html/*.php ${wp_shared_working_dir}/
+  cp -r ${wp_working_dir}/www/html/.htaccess ${wp_shared_working_dir}/
+  chown -R apache:apache ${wp_shared_working_dir}/*.php
+  chown -R apache:apache ${wp_working_dir}/www/html/*.php
+  ls -latr ${wp_shared_working_dir}/*.php
+  ls -latr ${wp_shared_working_dir}/.htaccess  
+  echo "... root level PHP files and .htaccess copied to NFS..."
+
+  echo "... Changing /etc/httpd/conf/httpd.conf with Document set to new shared NFS space ..."
+  sed -i 's/"\/var\/www\/html"/"\/sharedwp"/g' /etc/httpd/conf/httpd.conf
+  echo "... /etc/httpd/conf/httpd.conf with Document set to new shared NFS space ..."
 fi

modules/wordpress/variables.tf

@@ -143,6 +143,11 @@ variable "vm_user" {
   default     = "opc"
 }
 
+variable "wp_version" {
+  description = "WordPress version"
+  default = "5.8"
+}
+
 variable "wp_name" {
   description = "WordPress Database User Name."
 }

schema.yaml

@@ -75,6 +75,7 @@ variableGroups:
       and:
         - show_advanced
   variables:
+  - wp_version
   - wp_site_admin_email
   - wp_site_admin_user
   - wp_plugins
@@ -488,6 +489,26 @@ variables:
     maxLength: 14
     pattern: "^[a-zA-Z][a-zA-Z0-9]+$"
 
+  wp_version:
+    type: enum
+    required: false
+    visible: false
+    title: "WordPress Version"
+    description: "WordPress Version"
+    default: "5.8.3"
+    enum:
+      - "5.9"
+      - "5.8.3"
+      - "5.8.2"
+      - "5.8.1"
+      - "5.8"
+      - "5.7.5"
+      - "5.7.4"
+      - "5.7.3"
+      - "5.7.2"
+      - "5.7.1"
+      - "5.7"
+
   wp_name:
     type: string
     required: false

tags.tf

@@ -24,7 +24,7 @@ resource "oci_identity_tag" "ArchitectureCenterTag" {
 
   validator {
     validator_type = "ENUM"
-    values         = ["release", "1.4.1"]
+    values         = ["release", "1.4.2"]
   }
 
   provisioner "local-exec" {

variables.tf

@@ -29,7 +29,7 @@ variable "flex_lb_max_shape" {
 
 variable "release" {
   description = "Reference Architecture Release (OCI Architecture Center)"
-  default     = "1.4.1"
+  default     = "1.4.2"
 }
 
 variable "vcn" {
@@ -110,6 +110,11 @@ variable "mysql_is_highly_available" {
   default = false
 }
 
+variable "wp_version" {
+  description = "WordPress version"
+  default = "5.8"
+}
+
 variable "wp_name" {
   description = "WordPress Database User Name."
   default     = "wp"

wordpress.tf

@@ -24,6 +24,7 @@ module "wordpress" {
   admin_password            = var.admin_password
   admin_username            = var.admin_username
   wp_schema                 = var.wp_schema
+  wp_version                = var.wp_version
   wp_name                   = var.wp_name
   wp_password               = var.wp_password
   wp_plugins                = split(",", var.wp_plugins)