PR #2 from psaux-it/prod

Prod

Author: hsntgm

.env

@@ -13,6 +13,7 @@ export MYSQL_DATABASE=${WORDPRESS_DB_NAME}
 export MYSQL_USER=${WORDPRESS_DB_USER}
 export MYSQL_PASSWORD=${WORDPRESS_DB_PASSWORD}
 export MYSQL_ROOT_PASSWORD=rootpassword123!
+export NPP_MYSQL_CONF=./mysql/50-npp-server.cnf
 
 # Nginx Settings
 export NGINX_CACHE=nginx_cache

docker-compose.yml

@@ -20,6 +20,8 @@ services:
       - ${NPP_FPM_CONF}:/usr/local/etc/php-fpm.d/www.conf
       - ${FPM_DOCKER_CONF}:/usr/local/etc/php-fpm.d/zz-docker.conf
       - ${NPP_PHP_CONF}:/usr/local/etc/php/conf.d/npp.ini
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
     environment:
       - WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST}
       - WORDPRESS_DB_USER=${WORDPRESS_DB_USER}
@@ -68,8 +70,16 @@ services:
     env_file:
       - .env
     restart: unless-stopped
+    cap_add:
+      - SYS_NICE
+    security_opt:
+      - apparmor:unconfined
+      - seccomp:unconfined
     volumes:
       - ${MYSQL_HOME}:/var/lib/mysql
+      - ${NPP_MYSQL_CONF}:/etc/mysql/conf.d/50-npp-server.cnf
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
@@ -100,6 +110,8 @@ services:
       - ${NPP_NGINX_CONF}:/etc/nginx/conf.d/npp.conf
       - ${NPP_NGINX_PARAMS_CONF}:/etc/nginx/fastcgi_params
       - ${NGINX_SSL_CERTS}:/etc/ssl:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
     environment:
       - NPP_WEB_ROOT=${NPP_WEB_ROOT_}
       - NPP_USER=${NPP_USER_}

fpm/www.conf

@@ -11,4 +11,5 @@ pm.max_spare_servers = 4
 pm.max_requests = 750
 rlimit_files = 131072
 rlimit_core = unlimited
+listen.backlog = 65535
 php_admin_value[memory_limit] = 512M

mysql/50-npp-server.cnf

@@ -0,0 +1,12 @@
+[mysqld]
+character-set-server = utf8mb4           # UTF-8 character set
+skip-external-locking                    # Skip external locking for speed
+skip-log-bin                             # Disable binary logging
+wait_timeout = 1800                      # Timeout for inactive connections (30 min)
+max_allowed_packet = 128M                # Max packet size for queries
+innodb_flush_log_at_trx_commit = 2       # InnoDB log flush for performance
+innodb_dedicated_server = ON             # Enable InnoDB optimizations
+innodb_log_buffer_size = 32M             # InnoDB log buffer size
+max_connections = 100                    # Max allowed connections
+tmp_table_size = 32M                     # Max temp table size in memory
+max_heap_table_size = 32M                # Max in-memory heap table size

mysql/entrypoint-sql.sh

@@ -35,5 +35,10 @@ COLOR_WHITE='\033[0;97m'
 COLOR_BLACK='\033[0;30m'
 COLOR_LIGHT_CYAN='\033[0;96m'
 
+# Fix permissions for consistency
+chown -R root:root /etc/mysql/conf.d &&
+echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-DB:${COLOR_RESET} Permissions fixed successfully!" ||
+echo -e "${COLOR_RED}${COLOR_BOLD}NPP-DB:${COLOR_RESET} Failed to fix permissions!"
+
 # Start mysqld
-exec /usr/local/bin/docker-entrypoint.sh "$@" >/dev/null 2>&1
+exec /usr/local/bin/docker-entrypoint.sh "$@"

nginx/entrypoint-nginx.sh

@@ -90,6 +90,11 @@ else
     echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-NGINX:${COLOR_RESET} User ${COLOR_LIGHT_CYAN}${NGINX_WEB_USER}${COLOR_RESET} is already in group ${COLOR_LIGHT_CYAN}${NPP_USER}${COLOR_RESET} Skipping.."
 fi
 
+# Fix permissions for consistency
+chown -R root:root /etc/nginx &&
+echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-NGINX:${COLOR_RESET} Permissions fixed successfully!" ||
+echo -e "${COLOR_RED}${COLOR_BOLD}NPP-NGINX:${COLOR_RESET} Failed to fix permissions!"
+
 sleep 3
 
 # Congratulatory Header
@@ -118,4 +123,4 @@ echo -e "\n${COLOR_YELLOW}━━━━━━━━━━━━━━━━━━
 echo -e "\n${COLOR_RED}${COLOR_BOLD}☪︎${COLOR_RESET} ${COLOR_GREEN}${COLOR_BOLD}NE MUTLU TÜRK'ÜM DİYENE!${COLOR_RESET}"
 
 # Start nginx
-exec /docker-entrypoint.sh "$@" >/dev/null 2>&1
+exec /docker-entrypoint.sh "$@"

nginx/npp.conf

@@ -23,11 +23,6 @@ server {
     root /var/www/html;
     index index.php index.html index.htm;
 
-    # Logging
-    ##########
-    access_log /var/log/nginx/npp.com.access.log;
-    error_log /var/log/nginx/npp.com.error.log;
-
     # Cache Settings
     #################
     set $skip_cache 0;

wordpress/entrypoint-wp.sh

@@ -84,6 +84,14 @@ fi
 # Log that the bindfs mount was successful
 echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP:${COLOR_RESET} The Nginx Cache Path: ${COLOR_LIGHT_CYAN}${NPP_NGINX_CACHE_PATH}${COLOR_RESET} has been successfully mounted to ${COLOR_LIGHT_CYAN}${MOUNT_DIR}${COLOR_RESET} with ${COLOR_CYAN}UID:${NPP_UID}${COLOR_RESET} and ${COLOR_CYAN}GID:${NPP_GID}${COLOR_RESET}."
 
+# Fix permissions for consistency
+chown -R root:root \
+    /etc/nginx \
+    /usr/local/etc/php-fpm.d \
+    /usr/local/etc/php/conf.d &&
+echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP:${COLOR_RESET} Permissions fixed successfully!" ||
+echo -e "${COLOR_RED}${COLOR_BOLD}NPP-WP:${COLOR_RESET} Failed to fix permissions!"
+
 # Wait for the 'wordpress-db' to be ready
 until mysql -h wordpress-db -u"${WORDPRESS_DB_USER}" -p"${WORDPRESS_DB_PASSWORD}" "${WORDPRESS_DB_NAME}" -e "SELECT 1" > /dev/null 2>&1; do
     echo -e "${COLOR_YELLOW}${COLOR_BOLD}NPP-WP:${COLOR_RESET} The ${COLOR_LIGHT_CYAN}MySQL database${COLOR_RESET} is not available yet. Retrying..."
@@ -92,4 +100,4 @@ done
 echo -e "${COLOR_GREEN}${COLOR_BOLD}NPP-WP:${COLOR_RESET} The ${COLOR_LIGHT_CYAN}MySQL database${COLOR_RESET} is ready! Proceeding..."
 
 # Start php-fpm
-exec /usr/local/bin/docker-entrypoint.sh "$@" >/dev/null 2>&1
+exec /usr/local/bin/docker-entrypoint.sh "$@"