PR #4 from psaux-it/minor

minor

Author: hsntgm

.env

@@ -21,9 +21,10 @@ export NGINX_CONF=./nginx/nginx.conf
 export NPP_NGINX_CONF=./nginx/npp.conf
 export NPP_NGINX_PARAMS_CONF=./nginx/fastcgi_params
 export NGINX_LOGS=./logs/nginx
+export NPP_NGINX_IP=172.19.0.3
 
 # WP-CLI Settings
-export WORDPRESS_SITE_URL_=https://172.19.0.3
+export WORDPRESS_SITE_URL_="https://${NPP_NGINX_IP}"
 export WORDPRESS_SITE_TITLE_="NPP Dockerized"
 export WORDPRESS_ADMIN_USER_=npp
 export WORDPRESS_ADMIN_PASSWORD_=npp

README.md

@@ -14,15 +14,24 @@ Explore the **[NPP Main GitHub Repository](https://github.com/psaux-it/nginx-fas
 - ✅ Isolated and secure **PHP process owner** for enhanced security and performance
 - ✅ Built with **bindfs** (1.17.7) + **fuse3** (1.16.2) for FUSE-based mounting of **Nginx Cache Path**
 - ✅ Supports a wide range of **PHP extensions**
+- ✅ Easily switch between the **stable** release and the **bleeding-edge dev** version of the **NPP**
 - ✅ All containers powered by **Debian 12** for a stable, consistent environment
 
 ## 🔑 Environment Variables
 
 Please check the **.env** file for the environment variables used by the project.
 
-Some variables can be directly modified by the user to customize the setup, while others are integral to the project's core configuration. Changing these core variables may require some work to adjust other parts of the project to maintain proper integration and workflow.
+Some variables can be directly modified by the user to customize the setup easily, while others are hard depend to the project's core configuration. Modifying these core variables for a production environment may require adjustments in other parts of the project to ensure proper integration and workflow. Feel free to customize it to meet your full-stack WordPress **production** needs!
 
-Enjoy customizing it to suit your needs!
+#### Use the Bleeding-Edge Version of NPP or Contribute to Development  
+
+If you want to use the **latest bleeding-edge version** of the NPP plugin or set up a **development/test environment**, simply set the following environment variable:  
+
+```bash
+NPP_DEV_ENABLED=1
+```
+
+🔄 This will sync the plugin with the latest development branch commit from GitHub, ensuring you always have access to the newest features and improvements.
 
 ## ⚙️️ Setup Instructions
 

docker-compose.yml

@@ -30,7 +30,7 @@ services:
       - WORDPRESS_CONFIG_EXTRA=
           define('FORCE_SSL_ADMIN', true);
           define('FORCE_SSL_LOGIN', true);
-          if (defined('WP_CLI') && WP_CLI && !isset($$_SERVER['HTTP_HOST'])) $$_SERVER['HTTP_HOST'] = "172.19.0.3";
+          if (defined('WP_CLI') && WP_CLI && !isset($$_SERVER['HTTP_HOST'])) $$_SERVER['HTTP_HOST'] = "${NPP_NGINX_IP}";
       - NPP_WEB_ROOT=${NPP_WEB_ROOT_}
       - NPP_NGINX_CACHE_PATH=${NPP_NGINX_CACHE_PATH_}
       - NPP_USER=${NPP_USER_}
@@ -66,6 +66,17 @@ services:
       - command: /scripts/wp-cli.sh
         working_dir: ${NPP_WEB_ROOT_}
         user: root
+    mem_limit: "2GB"
+    mem_reservation: "1GB"
+    cpus: "1.0"
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: "2GB"
+        reservations:
+          cpus: "1.0"
+          memory: "1GB"
 
   db:
     build:
@@ -94,6 +105,17 @@ services:
     networks:
       npp_network:
         ipv4_address: 172.19.0.2
+    mem_limit: "2GB"
+    mem_reservation: "1GB"
+    cpus: "1.0"
+    deploy:
+      resources:
+        limits:
+          cpus: "1.0"
+          memory: "2GB"
+        reservations:
+          cpus: "0.5"
+          memory: "1GB"
 
   nginx:
     build:
@@ -124,10 +146,22 @@ services:
       - NPP_UID=${NPP_UID_}
       - NPP_GID=${NPP_GID_}
       - NGINX_WEB_USER=${NGINX_WEB_USER_}
+      - NPP_NGINX_IP=${NPP_NGINX_IP}
       - MOUNT_DIR=${MOUNT_DIR_}
     networks:
       npp_network:
         ipv4_address: 172.19.0.3
+    mem_limit: "1.5GB"
+    mem_reservation: "1GB"
+    cpus: "1.0"
+    deploy:
+      resources:
+        limits:
+          cpus: "1"
+          memory: "1.5GB"
+        reservations:
+          cpus: "0.5"
+          memory: "1GB"
 
 volumes:
   wordpress-db:

nginx/entrypoint-nginx.sh

@@ -65,7 +65,7 @@ wait_for_service "wordpress" 9001
 wait_for_service "wordpress" 9999
 
 # Check if required environment variables are set
-for var in NPP_UID NPP_GID NPP_USER NPP_WEB_ROOT NGINX_WEB_USER MOUNT_DIR; do
+for var in NPP_UID NPP_GID NPP_USER NPP_WEB_ROOT NGINX_WEB_USER MOUNT_DIR NPP_NGINX_IP; do
     if [[ -z "${!var:-}" ]]; then
         echo -e "${COLOR_RED}${COLOR_BOLD}NPP-NGINX-FATAL:${COLOR_RESET} Missing required environment variable: ${COLOR_LIGHT_CYAN}${var}${COLOR_RESET} - ${COLOR_RED}Exiting...${COLOR_RESET}"
         exit 1
@@ -99,14 +99,14 @@ sleep 3
 
 # Congratulatory Header
 echo -e "\n${COLOR_YELLOW}${COLOR_BOLD}🎉 CONGRATULATIONS! 🎉${COLOR_RESET}"
-echo -e "${COLOR_GREEN}${COLOR_BOLD}Your docker stack is ready, Unlocked Ultra-Performance with NPP Plugin${COLOR_RESET}"
+echo -e "${COLOR_GREEN}${COLOR_BOLD}Unlocked Ultra-Performance with NPP${COLOR_RESET}"
 
 # Clean separator
 echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
 
 # URL Access Information
-echo -e "\n${COLOR_GREEN}${COLOR_BOLD}🔑 Access your WordPress admin page at:${COLOR_RESET}"
-echo -e "${COLOR_LIGHT_CYAN}URL: ${COLOR_RESET}${COLOR_BOLD}https://172.19.0.3/wp-admin${COLOR_RESET}"
+echo -e "\n${COLOR_GREEN}${COLOR_BOLD}🔑 Access WordPress:${COLOR_RESET}"
+echo -e "${COLOR_LIGHT_CYAN}URL: ${COLOR_RESET}${COLOR_BOLD}https://${NPP_NGINX_IP}/wp-admin${COLOR_RESET}"
 
 # Separator for credentials
 echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
@@ -123,11 +123,15 @@ echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━
 echo -e "\n${COLOR_GREEN}${COLOR_BOLD}💾 Nginx Cache Path:${COLOR_RESET}"
 echo -e "${COLOR_LIGHT_CYAN}Path: ${COLOR_RESET}${COLOR_BOLD}${MOUNT_DIR}${COLOR_RESET}"
 
-# Final separator
+# Separator for author message
 echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
 
-# Author message
-echo -e "\n${COLOR_RED}${COLOR_BOLD}☪︎${COLOR_RESET} ${COLOR_GREEN}${COLOR_BOLD}NE MUTLU TÜRK'ÜM DİYENE!${COLOR_RESET}"
+# Universal Author messaege
+echo -e "\n${COLOR_RED}${COLOR_BOLD}☪︎${COLOR_RESET} ${COLOR_GREEN}${COLOR_BOLD}Author Message:${COLOR_RESET}"
+echo -e "${COLOR_LIGHT_CYAN}Message: ${COLOR_RESET}${COLOR_BOLD}1.f3 e5 2.g4 Qh4# ~checkmate${COLOR_RESET}"
+
+# Final separator
+echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${COLOR_RESET}"
 
 # Start nginx
 exec /docker-entrypoint.sh "$@"

wordpress/wp-cli.sh

@@ -165,7 +165,7 @@ if [[ "${#NPP_PLUGINS[@]}" -gt 0 ]]; then
                 echo -e "${COLOR_RED}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Plugin ${COLOR_CYAN}${plugin}${COLOR_RESET} installation failed. Please check the logs for more details."
             fi
         else
-            echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Plugin ${COLOR_CYAN}${plugin}${COLOR_RESET} is already installed."
+            echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Plugin ${COLOR_CYAN}${plugin}${COLOR_RESET} is already installed. Skipping..."
         fi
     done
 else
@@ -182,13 +182,26 @@ if [[ "${#NPP_THEMES[@]}" -gt 0 ]]; then
                 echo -e "${COLOR_RED}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Theme ${COLOR_CYAN}${theme}${COLOR_RESET} installation failed. Please check the logs for more details."
             fi
         else
-            echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Theme ${COLOR_CYAN}${theme}${COLOR_RESET} is already installed."
+            echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} Theme ${COLOR_CYAN}${theme}${COLOR_RESET} is already installed. Skipping..."
         fi
     done
 else
     echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} ${COLOR_CYAN}No themes${COLOR_RESET} to install."
 fi
 
+# Check if the current permalink structure is already set
+CURRENT_PERMALINK=$(su -m -c "wp option get permalink_structure" "${NPP_USER}")
+if [[ -z "$CURRENT_PERMALINK" || "$CURRENT_PERMALINK" == "/index.php/%pagename%/" ]]; then
+    # Apply the new permalink structure
+    if su -m -c "wp rewrite structure '/%postname%/' --hard" "${NPP_USER}" >/dev/null 2>&1; then
+        echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} ${COLOR_CYAN}Permalink structure${COLOR_RESET} has been successfully updated."
+    else
+        echo -e "${COLOR_RED}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} ${COLOR_CYAN}Failed to update${COLOR_RESET} permalink structure. Please check logs for more details."
+    fi
+else
+    echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP-CLI:${COLOR_RESET} ${COLOR_CYAN}Permalink structure${COLOR_RESET} is already properly set. Skipping..."
+fi
+
 # Check development deploy wanted
 if [[ "${NPP_DEV_ENABLED}" -eq 1 ]]; then
     # Set variables
@@ -213,6 +226,7 @@ if [[ "${NPP_DEV_ENABLED}" -eq 1 ]]; then
     REMOTE_COMMIT_HASH=$(git ls-remote --heads "${GITHUB_REPO}" "refs/heads/${TARGET_BRANCH}" \
       | awk '{print substr($1,1,7)}' | awk '{$1=$1;print}')
 
+    echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} ${COLOR_LIGHT_CYAN}######################${COLOR_RESET}"
     echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Latest branch: ${COLOR_CYAN}${TARGET_BRANCH}${COLOR_RESET}"
     echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Latest dev version: ${COLOR_CYAN}${LATEST_VERSION}${COLOR_RESET}"
     echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Remote commit: ${COLOR_CYAN}${REMOTE_COMMIT_HASH}${COLOR_RESET}"
@@ -299,8 +313,10 @@ if [[ "${NPP_DEV_ENABLED}" -eq 1 ]]; then
         # Adjust ownership (ensure NPP_USER is set in the environment)
         chown -R "${NPP_USER}":"${NPP_USER}" "${PLUGIN_DIR}"
         echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Deployed build ${COLOR_CYAN}${TARGET_BRANCH}${COLOR_RESET} with (commit ${COLOR_CYAN}${CLONED_COMMIT_HASH}${COLOR_RESET})."
+        echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} ${COLOR_LIGHT_CYAN}######################${COLOR_RESET}"
     else
         echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} Plugin is up-to-date with commit ${COLOR_CYAN}${REMOTE_COMMIT_HASH}${COLOR_RESET}."
+        echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DEV:${COLOR_RESET} ${COLOR_LIGHT_CYAN}######################${COLOR_RESET}"
     fi
 fi