templates/deployment.yaml を更新

templates/deployment.yaml

@@ -27,26 +27,135 @@ spec:
               set -e
               echo "=== WordPress Initialization Started ==="
               
-              echo "Preparing wp-content in persistent storage..."
+              if [ ! -d /var/www/html/wp-content ]; then
-              if [ ! -d /var/www/html-persistent/wp-content ]; then
                 echo "Initializing wp-content directory..."
-                mkdir -p /var/www/html-persistent/wp-content
+                mkdir -p /var/www/html/wp-content
-                cp -rp /usr/src/wordpress/wp-content/* /var/www/html-persistent/wp-content/
+                cp -rp /usr/src/wordpress/wp-content/* /var/www/html/wp-content/
-                echo "wp-content initialized in persistent storage"
+                echo "wp-content initialized"
               else
-                echo "wp-content already exists in persistent storage, preserving user data"
+                echo "wp-content already exists, preserving user data"
               fi
               
-              echo "Copying WordPress core files to ephemeral storage (excluding wp-content)..."
+              echo "Generating wp-config.php..."
-              cd /usr/src/wordpress
+              cat > /var/www/html/wp-config.php << 'EOF'
-              find . -maxdepth 1 ! -name wp-content ! -name . -exec cp -rp {} /var/www/html/ \;
+              <?php
+              define('DB_NAME', getenv('WORDPRESS_DB_NAME'));
+              define('DB_USER', getenv('WORDPRESS_DB_USER'));
+              define('DB_PASSWORD', getenv('WORDPRESS_DB_PASSWORD'));
+              define('DB_HOST', getenv('WORDPRESS_DB_HOST'));
+              define('DB_CHARSET', 'utf8');
+              define('DB_COLLATE', '');
               
-              echo "Creating symlink for wp-content..."
+              $table_prefix = getenv('WORDPRESS_TABLE_PREFIX') ?: 'wp_';
-              ln -sf /var/www/html-persistent/wp-content /var/www/html/wp-content
               
-              echo "Verifying directory structure..."
+              define('AUTH_KEY',         getenv('WP_AUTH_KEY'));
-              ls -la /var/www/html/ | head -20
+              define('SECURE_AUTH_KEY',  getenv('WP_SECURE_AUTH_KEY'));
-              ls -la /var/www/html/ | grep wp-content
+              define('LOGGED_IN_KEY',    getenv('WP_LOGGED_IN_KEY'));
+              define('NONCE_KEY',        getenv('WP_NONCE_KEY'));
+              define('AUTH_SALT',        getenv('WP_AUTH_SALT'));
+              define('SECURE_AUTH_SALT', getenv('WP_SECURE_AUTH_SALT'));
+              define('LOGGED_IN_SALT',   getenv('WP_LOGGED_IN_SALT'));
+              define('NONCE_SALT',       getenv('WP_NONCE_SALT'));
+              
+              if ( defined( 'WP_CLI' ) ) {
+                $_SERVER['HTTP_HOST'] = '127.0.0.1';
+              }
+              
+              $protocol = 'http';
+              if ( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ) {
+                $protocol = 'https';
+              } elseif ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ) {
+                $protocol = 'https';
+              }
+              
+              define( 'WP_HOME', $protocol . '://' . $_SERVER['HTTP_HOST'] . '/' );
+              define( 'WP_SITEURL', $protocol . '://' . $_SERVER['HTTP_HOST'] . '/' );
+              define( 'WP_AUTO_UPDATE_CORE', false );
+              define('WP_DEBUG', false);
+              define('WP_DEBUG_LOG', false);
+              define('WP_DEBUG_DISPLAY', false);
+              define('FS_METHOD', 'direct');
+              define('WP_MEMORY_LIMIT', '256M');
+              define('WP_MAX_MEMORY_LIMIT', '512M');
+              
+              if ( ! defined( 'ABSPATH' ) ) {
+                define( 'ABSPATH', '/usr/src/wordpress/' );
+              }
+              
+              require_once ABSPATH . 'wp-settings.php';
+              EOF
+              
+              echo "wp-config.php generated"
+              
+              echo "Setting up WP-CLI..."
+              curl -o /tmp/wp-cli.phar https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar 2>/dev/null || true
+              chmod +x /tmp/wp-cli.phar
+              
+              echo "Waiting for database connection..."
+              max_attempts=30
+              attempt=0
+              while [ $attempt -lt $max_attempts ]; do
+                if /tmp/wp-cli.phar --path=/usr/src/wordpress db check 2>/dev/null; then
+                  echo "Database connection successful"
+                  break
+                fi
+                attempt=$((attempt + 1))
+                echo "Waiting for database... ($attempt/$max_attempts)"
+                sleep 2
+              done
+              
+              echo "Checking if WordPress is already installed..."
+              TABLES=$(/tmp/wp-cli.phar --path=/usr/src/wordpress db query "SHOW TABLES LIKE '${WORDPRESS_TABLE_PREFIX}options';" 2>/dev/null || echo "")
+              
+              if [ -z "$TABLES" ]; then
+                echo "=== Starting WordPress Installation ==="
+                
+                if [ -z "$WP_ADMIN_PASSWORD" ]; then
+                  WP_ADMIN_PASSWORD=$(tr -dc 'A-Za-z0-9!@#$%^&*' < /dev/urandom | head -c 16)
+                  echo "Generated admin password: $WP_ADMIN_PASSWORD"
+                  echo "$WP_ADMIN_PASSWORD" > /var/www/html/.initial-admin-password
+                fi
+                
+                INSTALL_URL="http://127.0.0.1"
+                
+                echo "Installing WordPress..."
+                /tmp/wp-cli.phar --path=/usr/src/wordpress core install \
+                  --url="$INSTALL_URL" \
+                  --title="$WP_SITE_TITLE" \
+                  --admin_user="$WP_ADMIN_USER" \
+                  --admin_password="$WP_ADMIN_PASSWORD" \
+                  --admin_email="$WP_ADMIN_EMAIL" \
+                  --skip-email
+                
+                echo "=== WordPress Installation Completed ==="
+                echo "Admin User: $WP_ADMIN_USER"
+                if [ -f /var/www/html/.initial-admin-password ]; then
+                  echo "Admin Password: $(cat /var/www/html/.initial-admin-password)"
+                fi
+                echo "Note: Site URL is dynamic and will be set based on HTTP_HOST"
+              else
+                echo "WordPress is already installed, skipping installation"
+                
+                if /tmp/wp-cli.phar --path=/usr/src/wordpress core version 2>/dev/null; then
+                  CURRENT_VERSION=$(cat /usr/src/wordpress/wp-includes/version.php | grep "wp_version = " | cut -d "'" -f 2)
+                  echo "Checking for WordPress updates... Target version: $CURRENT_VERSION"
+                  /tmp/wp-cli.phar --path=/usr/src/wordpress core update --version=$CURRENT_VERSION 2>/dev/null || true
+                  /tmp/wp-cli.phar --path=/usr/src/wordpress core update-db 2>/dev/null || true
+                fi
+              fi
+              
+              {{- if .Values.wordpress.adsTxt.enabled }}
+              echo "Deploying ads.txt..."
+              cat > /var/www/html/ads.txt << 'ADSTXT'
+              {{ .Values.wordpress.adsTxt.content }}
+              ADSTXT
+              echo "ads.txt deployed"
+              {{- end }}
+              
+              echo "=== WordPress Initialization Completed ==="
+          volumeMounts:
+            - name: wordpress-persistent
+              mountPath: /var/www/html
               
               echo "Generating wp-config.php from Secret..."
               cat > /var/www/html/wp-config.php << 'EOF'
@@ -247,8 +356,15 @@ spec:
               containerPort: 80
               protocol: TCP
           volumeMounts:
-            - name: wordpress-core
+            - name: wordpress-source
               mountPath: /var/www/html
+              subPath: wordpress
+              readOnly: true
+            - name: wordpress-persistent
+              mountPath: /var/www/html/wp-content
+            - name: wordpress-persistent
+              mountPath: /var/www/html/wp-config.php
+              subPath: wp-config.php
             - name: nginx-config
               mountPath: /etc/nginx/conf.d/default.conf
               subPath: default.conf
@@ -282,14 +398,15 @@ spec:
             - name: WORDPRESS_TABLE_PREFIX
               value: {{ .Values.wordpress.tablePrefix | quote }}
           volumeMounts:
-            - name: wordpress-core
-              mountPath: /var/www/html
             - name: wordpress-persistent
-              mountPath: /var/www/html-persistent
+              mountPath: /var/www/html/wp-content
+            - name: wordpress-persistent
+              mountPath: /var/www/html/wp-config.php
+              subPath: wp-config.php
           resources:
             {{- toYaml .Values.resources.wordpress | nindent 12 }}
       volumes:
-        - name: wordpress-core
+        - name: wordpress-source
           emptyDir: {}
         - name: wordpress-persistent
           {{- if .Values.persistence.enabled }}