Skip to content

Commit 6b55eb2

Browse files
PDowneyPDowney
authored
Code cleanup
1 parent e261975 commit 6b55eb2

3 files changed

Lines changed: 61 additions & 61 deletions

File tree

‎scripts/functions/server-tools/analyze-tables.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ SQL="${SQL} ('information_schema','performance_schema','mysql','sys','innodb')"
3838
SQL="${SQL} AND engine IS NOT NULL"
3939

4040
# Create SQL Commands to run ANALYZE TABLE
41-
mysql ${MYSQL_AUTH} -ANe"${SQL}" > ${RUN_SQL}
41+
mariadb ${MYSQL_AUTH} -ANe"${SQL}" > "${RUN_SQL}"
4242

4343
# Execute ANALYZE TABLE Commands
44-
mysql ${MYSQL_AUTH} --table < ${RUN_SQL} > ${RUN_LOG} 2>&1
44+
mariadb ${MYSQL_AUTH} --table < "${RUN_SQL}" > "${RUN_LOG}" 2>&1
4545

4646
# Ask user to acknowledge that the scan has completed before moving on
4747
echo ""

‎scripts/functions/vhost/vhost-import.sh‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ else
8787
fi
8888

8989
# PHP Service Check
90-
STATUS="$(systemctl is-active php${PHP_VER}-fpm)"
90+
STATUS="$(systemctl is-active "php${PHP_VER}-fpm")"
9191
if [ "${STATUS}" = "active" ]; then
9292
echo "PASSED: PHP ${PHP_VER} is running."
9393
else
@@ -483,64 +483,64 @@ echo "Starting domain import for ${DOMAIN} from archive ${WP_ARCHIVE_FILE} and D
483483
# Continue the installation
484484

485485
# Store SQL credentials (Generate new ones for EngineScript)
486-
echo "SITE_URL=\"${DOMAIN}\"" >> /home/EngineScript/mysql-credentials/${DOMAIN}.txt
486+
echo "SITE_URL=\"${DOMAIN}\"" >> "/home/EngineScript/mysql-credentials/${DOMAIN}.txt"
487487

488488
# Add Domain to Site List
489489
sed -i "/SITES\=(/a\
490490
\"$DOMAIN\"" /home/EngineScript/sites-list/sites.sh
491491

492492
# Create Nginx Vhost File
493-
cp -rf /usr/local/bin/enginescript/config/etc/nginx/sites-available/your-domain.conf /etc/nginx/sites-enabled/${DOMAIN}.conf
494-
sed -i "s|YOURDOMAIN|${DOMAIN}|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
493+
cp -rf "/usr/local/bin/enginescript/config/etc/nginx/sites-available/your-domain.conf" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
494+
sed -i "s|YOURDOMAIN|${DOMAIN}|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
495495

496496
# Create Admin Subdomain Vhost File
497-
cp -rf /usr/local/bin/enginescript/config/etc/nginx/admin/admin.your-domain.conf /etc/nginx/admin/admin.${DOMAIN}.conf
498-
sed -i "s|YOURDOMAIN|${DOMAIN}|g" /etc/nginx/admin/admin.${DOMAIN}.conf
497+
cp -rf "/usr/local/bin/enginescript/config/etc/nginx/admin/admin.your-domain.conf" "/etc/nginx/admin/admin.${DOMAIN}.conf"
498+
sed -i "s|YOURDOMAIN|${DOMAIN}|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
499499

500500
# Enable Admin Subdomain Vhost File
501501
if [ "${ADMIN_SUBDOMAIN}" = 1 ];
502502
then
503-
sed -i "s|#include /etc/nginx/admin/admin.your-domain.conf;|include /etc/nginx/admin/admin.${DOMAIN}.conf;|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
503+
sed -i "s|#include /etc/nginx/admin/admin.your-domain.conf;|include /etc/nginx/admin/admin.${DOMAIN}.conf;|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
504504
else
505505
echo ""
506506
fi
507507

508508
# Secure Admin Subdomain
509509
if [ "${NGINX_SECURE_ADMIN}" = 1 ];
510510
then
511-
sed -i "s|#satisfy any|satisfy any|g" /etc/nginx/admin/admin.${DOMAIN}.conf
512-
sed -i "s|#auth_basic|auth_basic|g" /etc/nginx/admin/admin.${DOMAIN}.conf
513-
sed -i "s|#allow |allow |g" /etc/nginx/admin/admin.${DOMAIN}.conf
511+
sed -i "s|#satisfy any|satisfy any|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
512+
sed -i "s|#auth_basic|auth_basic|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
513+
sed -i "s|#allow |allow |g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
514514
else
515515
echo ""
516516
fi
517517

518518
# Enable HTTP/3 if configured
519519
if [ "${INSTALL_HTTP3}" = 1 ]; then
520-
sed -i "s|#listen 443 quic|listen 443 quic|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
521-
sed -i "s|#listen [::]:443 quic|listen [::]:443 quic|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
520+
sed -i "s|#listen 443 quic|listen 443 quic|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
521+
sed -i "s|#listen [::]:443 quic|listen [::]:443 quic|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
522522
fi
523523

524524
# Create Origin Certificate
525-
mkdir -p /etc/nginx/ssl/${DOMAIN}
525+
mkdir -p "/etc/nginx/ssl/${DOMAIN}"
526526

527527
# Cloudflare Keys
528528
export CF_Key="${CF_GLOBAL_API_KEY}"
529529
export CF_Email="${CF_ACCOUNT_EMAIL}"
530530

531531
# Issue Certificate (Same as vhost-install)
532532
echo "Issuing SSL Certificate via ACME.sh (ZeroSSL)..."
533-
/root/.acme.sh/acme.sh --issue --dns dns_cf --server zerossl --ocsp -d ${DOMAIN} -d admin.${DOMAIN} -d *.${DOMAIN} -k ec-384
533+
/root/.acme.sh/acme.sh --issue --dns dns_cf --server zerossl --ocsp -d "${DOMAIN}" -d "admin.${DOMAIN}" -d "*.${DOMAIN}" -k ec-384
534534

535-
/root/.acme.sh/acme.sh --install-cert -d ${DOMAIN} --ecc \
536-
--cert-file /etc/nginx/ssl/${DOMAIN}/cert.pem \
537-
--key-file /etc/nginx/ssl/${DOMAIN}/key.pem \
538-
--fullchain-file /etc/nginx/ssl/${DOMAIN}/fullchain.pem \
539-
--ca-file /etc/nginx/ssl/${DOMAIN}/ca.pem
535+
/root/.acme.sh/acme.sh --install-cert -d "${DOMAIN}" --ecc \
536+
--cert-file "/etc/nginx/ssl/${DOMAIN}/cert.pem" \
537+
--key-file "/etc/nginx/ssl/${DOMAIN}/key.pem" \
538+
--fullchain-file "/etc/nginx/ssl/${DOMAIN}/fullchain.pem" \
539+
--ca-file "/etc/nginx/ssl/${DOMAIN}/ca.pem"
540540

541541
# Print version and date for logs
542542
echo "EngineScript Date: ${VARIABLES_DATE}"
543-
echo "System Date: `date`"
543+
echo "System Date: $(date)"
544544

545545
# --- Database and File Handling ---
546546

@@ -552,12 +552,12 @@ SUSR="${RAND_CHAR16}"
552552
SPS="${RAND_CHAR32}"
553553

554554
# Domain Database Credentials (Store the *new* credentials)
555-
echo "DB=\"${SDB}\"" >> /home/EngineScript/mysql-credentials/${DOMAIN}.txt
556-
echo "USR=\"${SUSR}\"" >> /home/EngineScript/mysql-credentials/${DOMAIN}.txt
557-
echo "PSWD=\"${SPS}\"" >> /home/EngineScript/mysql-credentials/${DOMAIN}.txt
558-
echo "" >> /home/EngineScript/mysql-credentials/${DOMAIN}.txt
555+
echo "DB=\"${SDB}\"" >> "/home/EngineScript/mysql-credentials/${DOMAIN}.txt"
556+
echo "USR=\"${SUSR}\"" >> "/home/EngineScript/mysql-credentials/${DOMAIN}.txt"
557+
echo "PSWD=\"${SPS}\"" >> "/home/EngineScript/mysql-credentials/${DOMAIN}.txt"
558+
echo "" >> "/home/EngineScript/mysql-credentials/${DOMAIN}.txt"
559559

560-
source /home/EngineScript/mysql-credentials/${DOMAIN}.txt
560+
source "/home/EngineScript/mysql-credentials/${DOMAIN}.txt"
561561

562562
echo "Generated new MySQL database credentials for ${SITE_URL}."
563563

@@ -568,16 +568,16 @@ sudo mariadb -e "GRANT ALL ON ${DB}.* TO '${USR}'@'localhost'; FLUSH PRIVILEGES;
568568
sudo mariadb -e "GRANT ALL ON mysql.* TO '${USR}'@'localhost'; FLUSH PRIVILEGES;" # Needed for mariadb-health-checks plugin
569569

570570
# Backup Dir Creation (Same as vhost-install)
571-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/database/daily
572-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/database/hourly
573-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/nginx
574-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/ssl-keys
575-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/wp-config
576-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/wp-content
577-
mkdir -p /home/EngineScript/site-backups/${SITE_URL}/wp-uploads
571+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/database/daily"
572+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/database/hourly"
573+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/nginx"
574+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys"
575+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/wp-config"
576+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/wp-content"
577+
mkdir -p "/home/EngineScript/site-backups/${SITE_URL}/wp-uploads"
578578

579579
# Site Root
580-
mkdir -p /var/www/sites/${SITE_URL}/html
580+
mkdir -p "/var/www/sites/${SITE_URL}/html"
581581
TARGET_WP_PATH="/var/www/sites/${SITE_URL}/html"
582582

583583
# Domain Logs
@@ -638,7 +638,7 @@ if [ "${#SITES[@]}" = 1 ];
638638
fi
639639

640640
# Set Redis Prefix (Same as vhost-install)
641-
REDISPREFIX="$(echo ${DOMAIN::5})" && sed -i "s|SEDREDISPREFIX|${REDISPREFIX}|g" "${TARGET_WP_PATH}/wp-config.php"
641+
REDISPREFIX="$(echo "${DOMAIN::5}")" && sed -i "s|SEDREDISPREFIX|${REDISPREFIX}|g" "${TARGET_WP_PATH}/wp-config.php"
642642

643643
# WP Salt Creation (Generate new salts)
644644
echo "Generating new WordPress salts..."
@@ -720,10 +720,10 @@ wp plugin install wp-crontrol --allow-root
720720
wp plugin install wp-mail-smtp --allow-root --activate # Activate this one
721721

722722
# Install EngineScript Optimization Plugin
723-
cp -rf /usr/local/bin/enginescript/config/var/www/wordpress/plugins/simple-wp-optimizer-enginescript /var/www/sites/${SITE_URL}/html/wp-content/plugins/
723+
cp -rf "/usr/local/bin/enginescript/config/var/www/wordpress/plugins/simple-wp-optimizer-enginescript" "/var/www/sites/${SITE_URL}/html/wp-content/plugins/"
724724

725725
# Install EngineScript Site Exporter Plugin
726-
cp -rf /usr/local/bin/enginescript/config/var/www/wordpress/plugins/simple-site-exporter-enginescript /var/www/sites/${SITE_URL}/html/wp-content/plugins/
726+
cp -rf "/usr/local/bin/enginescript/config/var/www/wordpress/plugins/simple-site-exporter-enginescript" "/var/www/sites/${SITE_URL}/html/wp-content/plugins/"
727727

728728

729729
# WP-CLI Flush Transients
@@ -789,13 +789,13 @@ gzip -f "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABASE_FI
789789
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/wp-content/$WPCONTENT_FILE" wp-content
790790

791791
# Nginx vhost backup
792-
gzip -cf "/etc/nginx/sites-enabled/${SITE_URL}.conf" > /home/EngineScript/site-backups/${SITE_URL}/nginx/$VHOST_FILE
792+
gzip -cf "/etc/nginx/sites-enabled/${SITE_URL}.conf" > "/home/EngineScript/site-backups/${SITE_URL}/nginx/${VHOST_FILE}"
793793

794794
# SSL keys backup
795-
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys/$SSL_FILE" /etc/nginx/ssl/${SITE_URL}
795+
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys/${SSL_FILE}" "/etc/nginx/ssl/${SITE_URL}"
796796

797797
# wp-config.php backup
798-
gzip -cf "${TARGET_WP_PATH}/wp-config.php" > /home/EngineScript/site-backups/${SITE_URL}/wp-config/$WPCONFIG_FILE
798+
gzip -cf "${TARGET_WP_PATH}/wp-config.php" > "/home/EngineScript/site-backups/${SITE_URL}/wp-config/${WPCONFIG_FILE}"
799799

800800
# Remove old backups (Keep this logic)
801801
find "/home/EngineScript/site-backups/${SITE_URL}/database/daily" -type f -mtime +7 | xargs rm -fR

‎scripts/functions/vhost/vhost-install.sh‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -197,39 +197,39 @@ sed -i "\/SITES\=(/a\
197197
\"$DOMAIN\"" /home/EngineScript/sites-list/sites.sh
198198

199199
# Create Nginx Vhost File
200-
cp -rf /usr/local/bin/enginescript/config/etc/nginx/sites-available/your-domain.conf /etc/nginx/sites-enabled/${DOMAIN}.conf
201-
sed -i "s|YOURDOMAIN|${DOMAIN}|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
200+
cp -rf "/usr/local/bin/enginescript/config/etc/nginx/sites-available/your-domain.conf" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
201+
sed -i "s|YOURDOMAIN|${DOMAIN}|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
202202

203203
# Create Admin Subdomain Vhost File
204-
cp -rf /usr/local/bin/enginescript/config/etc/nginx/admin/admin.your-domain.conf /etc/nginx/admin/admin.${DOMAIN}.conf
205-
sed -i "s|YOURDOMAIN|${DOMAIN}|g" /etc/nginx/admin/admin.${DOMAIN}.conf
204+
cp -rf "/usr/local/bin/enginescript/config/etc/nginx/admin/admin.your-domain.conf" "/etc/nginx/admin/admin.${DOMAIN}.conf"
205+
sed -i "s|YOURDOMAIN|${DOMAIN}|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
206206

207207
# Enable Admin Subdomain Vhost File
208208
if [ "${ADMIN_SUBDOMAIN}" = 1 ];
209209
then
210-
sed -i "s|#include /etc/nginx/admin/admin.your-domain.conf;|include /etc/nginx/admin/admin.${DOMAIN}.conf;|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
210+
sed -i "s|#include /etc/nginx/admin/admin.your-domain.conf;|include /etc/nginx/admin/admin.${DOMAIN}.conf;|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
211211
else
212212
echo ""
213213
fi
214214

215215
# Secure Admin Subdomain
216216
if [ "${NGINX_SECURE_ADMIN}" = 1 ];
217217
then
218-
sed -i "s|#satisfy any|satisfy any|g" /etc/nginx/admin/admin.${DOMAIN}.conf
219-
sed -i "s|#auth_basic|auth_basic|g" /etc/nginx/admin/admin.${DOMAIN}.conf
220-
sed -i "s|#allow |allow |g" /etc/nginx/admin/admin.${DOMAIN}.conf
218+
sed -i "s|#satisfy any|satisfy any|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
219+
sed -i "s|#auth_basic|auth_basic|g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
220+
sed -i "s|#allow |allow |g" "/etc/nginx/admin/admin.${DOMAIN}.conf"
221221
else
222222
echo ""
223223
fi
224224

225225
# Enable HTTP/3 if configured
226226
if [ "${INSTALL_HTTP3}" = 1 ]; then
227-
sed -i "s|#listen 443 quic|listen 443 quic|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
228-
sed -i "s|#listen [::]:443 quic|listen [::]:443 quic|g" /etc/nginx/sites-enabled/${DOMAIN}.conf
227+
sed -i "s|#listen 443 quic|listen 443 quic|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
228+
sed -i "s|#listen [::]:443 quic|listen [::]:443 quic|g" "/etc/nginx/sites-enabled/${DOMAIN}.conf"
229229
fi
230230

231231
# Create Origin Certificate
232-
mkdir -p /etc/nginx/ssl/${DOMAIN}
232+
mkdir -p "/etc/nginx/ssl/${DOMAIN}"
233233

234234
# Cloudflare Keys
235235
export CF_Key="${CF_GLOBAL_API_KEY}"
@@ -245,7 +245,7 @@ export CF_Email="${CF_ACCOUNT_EMAIL}"
245245

246246
# Print verion and date for logs
247247
echo "EngineScript Date: ${VARIABLES_DATE}"
248-
echo "System Date: `date`"
248+
echo "System Date: $(date)"
249249

250250
# Domain Creation Variables
251251
PREFIX="${RAND_CHAR2}"
@@ -322,26 +322,26 @@ if [ "${#SITES[@]}" = 1 ];
322322

323323
# Set WordPress to use the latest Redis database number.
324324
# Redis starts databases at number 0, so we take the total number of domains in sites.sh and reduce by 1. Three installed domains = database 2
325-
sed -i "s|WP_REDIS_DATABASE', 0|WP_REDIS_DATABASE', ${OLDREDISDB}|g" /var/www/sites/${SITE_URL}/html/wp-config.php
325+
sed -i "s|WP_REDIS_DATABASE', 0|WP_REDIS_DATABASE', ${OLDREDISDB}|g" "/var/www/sites/${SITE_URL}/html/wp-config.php"
326326
fi
327327

328328
# Set Redis Prefix
329-
REDISPREFIX="$(echo ${DOMAIN::5})" && sed -i "s|SEDREDISPREFIX|${REDISPREFIX}|g" /var/www/sites/${SITE_URL}/html/wp-config.php
329+
REDISPREFIX="$(echo "${DOMAIN::5}")" && sed -i "s|SEDREDISPREFIX|${REDISPREFIX}|g" "/var/www/sites/${SITE_URL}/html/wp-config.php"
330330

331331
# WP Salt Creation
332332
SALT=$(curl -L https://api.wordpress.org/secret-key/1.1/salt/)
333333
STRING='put your unique phrase here'
334-
printf '%s\n' "g/$STRING/d" a "$SALT" . w | ed -s /var/www/sites/${SITE_URL}/html/wp-config.php
334+
printf '%s\n' "g/$STRING/d" a "$SALT" . w | ed -s "/var/www/sites/${SITE_URL}/html/wp-config.php"
335335

336336
# WP Scan API Token
337-
sed -i "s|SEDWPSCANAPI|${WPSCANAPI}|g" /var/www/sites/${SITE_URL}/html/wp-config.php
337+
sed -i "s|SEDWPSCANAPI|${WPSCANAPI}|g" "/var/www/sites/${SITE_URL}/html/wp-config.php"
338338

339339
# WP Recovery Email
340-
sed -i "s|SEDWPRECOVERYEMAIL|${WP_RECOVERY_EMAIL}|g" /var/www/sites/${SITE_URL}/html/wp-config.php
340+
sed -i "s|SEDWPRECOVERYEMAIL|${WP_RECOVERY_EMAIL}|g" "/var/www/sites/${SITE_URL}/html/wp-config.php"
341341

342342
# Create robots.txt
343-
cp -rf /usr/local/bin/enginescript/config/var/www/wordpress/robots.txt /var/www/sites/${SITE_URL}/html/robots.txt
344-
sed -i "s|SEDURL|${SITE_URL}|g" /var/www/sites/${SITE_URL}/html/robots.txt
343+
cp -rf "/usr/local/bin/enginescript/config/var/www/wordpress/robots.txt" "/var/www/sites/${SITE_URL}/html/robots.txt"
344+
sed -i "s|SEDURL|${SITE_URL}|g" "/var/www/sites/${SITE_URL}/html/robots.txt"
345345

346346
# WP File Permissions
347347
find "/var/www/sites/${SITE_URL}" -type d -print0 | sudo xargs -0 chmod 0755
@@ -372,7 +372,7 @@ echo "============================================="
372372

373373
# WP-CLI Install WordPress
374374
cd "/var/www/sites/${SITE_URL}/html"
375-
wp core install --admin_user=${WP_ADMIN_USERNAME} --admin_password=${WP_ADMIN_PASSWORD} --admin_email=${WP_ADMIN_EMAIL} --url=https://${SITE_URL} --title='New Site' --skip-email --allow-root
375+
wp core install --admin_user="${WP_ADMIN_USERNAME}" --admin_password="${WP_ADMIN_PASSWORD}" --admin_email="${WP_ADMIN_EMAIL}" --url="https://${SITE_URL}" --title='New Site' --skip-email --allow-root
376376

377377
# WP-CLI Install Plugins
378378
wp plugin install app-for-cf --allow-root

0 commit comments

Comments
 (0)