Merge pull request #15 from oracle-quickstart/fixes

fixed WP install

Author: lfeldman

modules/wordpress/main.tf

@@ -28,15 +28,6 @@ data "template_file" "setup_fss" {
   }
 }
 
-data "template_file" "install_wp" {
-  template = file("${path.module}/scripts/install_wp.sh")
-
-  vars = {
-    wp_working_dir = var.wp_working_dir
-    wp_version     = var.wp_version
-  }
-}
-
 data "template_file" "configure_local_security" {
   template = file("${path.module}/scripts/configure_local_security.sh")
 }
@@ -74,7 +65,6 @@ data "template_cloudinit_config" "cloud_init" {
 
 locals {
   php_script      = "~/install_php74.sh"
-  wp_script       = "~/install_wp.sh"
   security_script = "~/configure_local_security.sh"
   create_wp_db    = "~/create_wp_db.sh"
   setup_wp        = "~/setup_wp.sh"
@@ -371,6 +361,8 @@ data "template_file" "setup_wp" {
   template = file("${path.module}/scripts/setup_wp.sh")
 
   vars = {
+    wp_auto_update        = var.wp_auto_update
+    wp_version            = var.wp_version
     wp_name               = var.wp_name
     wp_password           = var.wp_password
     wp_schema             = var.wp_schema
@@ -488,20 +480,6 @@ resource "null_resource" "WordPress_provisioner_without_bastion" {
     }
   }
 
-  provisioner "file" {
-    content     = data.template_file.install_wp.rendered
-    destination = local.wp_script
-
-    connection {
-      type        = "ssh"
-      host        = oci_core_public_ip.WordPress_public_ip_for_single_node[0].ip_address
-      agent       = false
-      timeout     = "5m"
-      user        = var.vm_user
-      private_key = tls_private_key.public_private_key_pair.private_key_pem
-    }
-  }
-
   provisioner "file" {
     content     = data.template_file.configure_local_security.rendered
     destination = local.security_script
@@ -557,8 +535,6 @@ resource "null_resource" "WordPress_provisioner_without_bastion" {
     inline = [
       "chmod +x ${local.php_script}",
       "sudo ${local.php_script}",
-      "chmod +x ${local.wp_script}",
-      "sudo ${local.wp_script}",
       "chmod +x ${local.security_script}",
       "sudo ${local.security_script}",
       "chmod +x ${local.create_wp_db}",
@@ -621,23 +597,6 @@ resource "null_resource" "WordPress_provisioner_with_bastion" {
     }
   }
 
-  provisioner "file" {
-    content     = data.template_file.install_wp.rendered
-    destination = local.wp_script
-
-    connection {
-      type                = "ssh"
-      host                = data.oci_core_vnic.WordPress_vnic1.private_ip_address
-      agent               = false
-      timeout             = "5m"
-      user                = var.vm_user
-      private_key         = tls_private_key.public_private_key_pair.private_key_pem
-      bastion_host        = var.use_bastion_service ? "host.bastion.${var.bastion_service_region}.oci.oraclecloud.com" : oci_core_instance.bastion_instance[0].public_ip
-      bastion_user        = var.use_bastion_service ? oci_bastion_session.ssh_via_bastion_service[0].id : var.vm_user
-      bastion_private_key = tls_private_key.public_private_key_pair.private_key_pem
-    }
-  }
-
   provisioner "file" {
     content     = data.template_file.configure_local_security.rendered
     destination = local.security_script
@@ -722,8 +681,6 @@ resource "null_resource" "WordPress_provisioner_with_bastion" {
     inline = [
       "chmod +x ${local.php_script}",
       "sudo ${local.php_script}",
-      "chmod +x ${local.wp_script}",
-      "sudo ${local.wp_script}",
       "chmod +x ${local.security_script}",
       "sudo ${local.security_script}",
       "chmod +x ${local.create_wp_db}",

modules/wordpress/scripts/install_wp.sh

@@ -1,15 +1,25 @@
 #!/bin/bash
 #set -x
 
+
+echo "Customize httpd.conf for WP..."
+sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 512M/g' /etc/php.ini
+sed -i '/<Directory "\/var\/www\/html">/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/httpd/conf/httpd.conf
+sed -i '/<Directory "\/var\/www">/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/httpd/conf/httpd.conf
+systemctl start httpd
+systemctl enable httpd
+
 echo "Starting wp-cli installation..."
 curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
 chmod +x wp-cli.phar
 sudo mv wp-cli.phar /usr/local/bin/wp
 /usr/local/bin/wp --info
-/usr/local/bin/wp core download --path='${wp_working_dir}/www/html/'
+/usr/local/bin/wp core download --path='${wp_working_dir}/www/html/' --skip-content --force --version=${wp_version}
 /usr/local/bin/wp config create --dbname=${wp_schema} --dbuser=${wp_name} --dbpass=${wp_password} --dbhost=${mds_ip} --skip-check --path='${wp_working_dir}/www/html/'
 echo '${wp_site_admin_pass}' >> admin_password.txt
+/usr/local/bin/wp core version --path='${wp_working_dir}/www/html'
 /usr/local/bin/wp core install --path='${wp_working_dir}/www/html/'  --url=${wp_site_url} --title='${wp_site_title}' --admin_user=${wp_site_admin_user} --admin_email=${wp_site_admin_email} --prompt=admin_password < admin_password.txt
+/usr/local/bin/wp core version --path='${wp_working_dir}/www/html'
 chown -R apache:apache ${wp_working_dir}/www/html/
 /usr/local/bin/wp plugin install ${wp_plugins} --path='${wp_working_dir}/www/html/'
 chown -R apache:apache ${wp_working_dir}/www/html/
@@ -18,8 +28,24 @@ setsebool -P httpd_can_network_connect 1
 systemctl restart php-fpm
 cp /home/opc/htaccess ${wp_working_dir}/www/html/.htaccess
 rm /home/opc/htaccess
-chmod 774 ${wp_working_dir}/www/html/.htaccess
 chown -R apache:apache ${wp_working_dir}/www/html/
+find ${wp_working_dir}/www/html/ -type d -exec chmod 755 '{}' \;
+find ${wp_working_dir}/www/html/ -type f -exec chmod 644 '{}' \;
+chown -R apache:apache ${wp_working_dir}/www/html/
+chcon -R --type httpd_sys_rw_content_t ${wp_working_dir}/www/html/
+chmod 774 ${wp_working_dir}/www/html/.htaccess
+/usr/local/bin/wp core update --version=${wp_version} --force --path='${wp_working_dir}/www/html'
+/usr/local/bin/wp core version --path='${wp_working_dir}/www/html'
+export wp_auto_update='${wp_auto_update}'
+if [[ $wp_auto_update == "false" ]]; then
+  echo "WordPress Auto Update will be disabled."
+  echo "define( 'WP_AUTO_UPDATE_CORE', false );" >> /var/www/html/wp-config.php
+else 
+  echo "WordPress Auto Update will be enabled."
+  echo "define( 'WP_AUTO_UPDATE_CORE', true );" >> /var/www/html/wp-config.php
+fi
+chown apache:apache /var/www/html/wp-config.php
+
 echo "wp-cli installed, wp config, user, plugin theme executed."
 
 export use_shared_storage='${use_shared_storage}'
@@ -90,6 +116,12 @@ if [[ $use_shared_storage == "true" ]]; then
   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
+  chown -R apache:apache ${wp_working_dir}/www/html/
+  find ${wp_shared_working_dir}/ -type d -exec chmod 755 '{}' \;
+  find ${wp_shared_working_dir}/ -type f -exec chmod 644 '{}' \;
+  chown -R apache:apache ${wp_shared_working_dir}/
+  chcon -R --type httpd_sys_rw_content_t ${wp_shared_working_dir}/
+  chmod 774 ${wp_working_dir}/www/html/.htaccess
   ls -latr ${wp_shared_working_dir}/*.php
   ls -latr ${wp_shared_working_dir}/.htaccess  
   echo "... root level PHP files and .htaccess copied to NFS..."

modules/wordpress/scripts/setup_wp.sh

@@ -145,7 +145,11 @@ variable "vm_user" {
 
 variable "wp_version" {
   description = "WordPress version"
-  default = "5.8"
+  default = "5.9"
+}
+
+variable "wp_auto_update" {
+  default     = true
 }
 
 variable "wp_name" {

modules/wordpress/variables.tf

@@ -76,6 +76,7 @@ variableGroups:
       and:
         - show_advanced
   variables:
+  - wp_auto_update
   - wp_site_admin_email
   - wp_site_admin_user
   - wp_plugins
@@ -489,6 +490,13 @@ variables:
     maxLength: 14
     pattern: "^[a-zA-Z][a-zA-Z0-9]+$"
 
+  wp_auto_update:
+    type: boolean
+    title: "WordPress Auto Update"
+    description: "Check if you want to enable automatic updates for WordPress."
+    visible: true
+    default: false
+
   wp_version:
     type: enum
     required: false

schema.yaml

@@ -130,6 +130,10 @@ variable "wp_schema" {
   default     = "wordpress"
 }
 
+variable "wp_auto_update" {
+  default     = false
+}
+
 variable "wp_plugins" {
   description = "WordPress Plugins"
   default     = "hello-dolly,elementor"

variables.tf

@@ -23,6 +23,7 @@ module "wordpress" {
   mds_ip                    = module.mds-instance.private_ip
   admin_password            = var.admin_password
   admin_username            = var.admin_username
+  wp_auto_update            = var.wp_auto_update
   wp_schema                 = var.wp_schema
   wp_version                = var.wp_version
   wp_name                   = var.wp_name