joby/webserver-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some more cleanup

Browse source
This commit is contained in:
Joby 2024-10-23 20:12:45 -06:00
parent 1121b1f185
commit 7626e7ccce
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
add-site.sh
View file

@ -36,7 +36,7 @@ hostname=$(hostname -f)
# Set up directory structure # Set up directory structure
main_web_root="/var/www/$domain" main_web_root="/var/www/$domain"
sudo mkdir -p "$main_web_root"/{_main/www,subdomains,logs} sudo mkdir -p "$main_web_root"/{_main/www,subdomains,logs,error-pages}
# Create the user with the web root as home directory and add to www-data and websftpusers groups # Create the user with the web root as home directory and add to www-data and websftpusers groups
sudo useradd -m -d /var/www/$domain -s /bin/false -U -G www-data,websftpusers $username sudo useradd -m -d /var/www/$domain -s /bin/false -U -G www-data,websftpusers $username
@ -82,6 +82,12 @@ Password: $password
MySQL Username: $username MySQL Username: $username
MySQL Password: $mysql_password MySQL Password: $mysql_password
MySQL Host: $hostname MySQL Host: $hostname
Main web root: $main_web_root/_main/www
Subdomain web root: $main_web_root/subdomains/[subdomain]/www
Custom error pages: $main_web_root/error-pages
Subdomain custom error pages: $main_web_root/subdomains/[subdomain]/error-pages
EOL" EOL"
sudo chown "$username:$username" "$info_file" sudo chown "$username:$username" "$info_file"
sudo chmod 600 "$info_file" sudo chmod 600 "$info_file"
@ -138,7 +144,9 @@ sudo systemctl reload nginx
echo "Setup complete for $domain" echo "Setup complete for $domain"
echo "Access via SFTP at $hostname with the username $username and the password $password" echo "Access via SFTP at $hostname with the username $username and the password $password"
echo "Main website files should be placed in: _main/www" echo "Main website files should be placed in: _main/www"
echo "Custom error pages can be placed in: error-pages"
echo "Subdomain files should be placed in: subdomains/[subdomain]/www" echo "Subdomain files should be placed in: subdomains/[subdomain]/www"
echo "Subdomain custom error pages can be placed in: subdomains/[subdomain]/error-pages"
echo "Site information (including MySQL credentials) is stored in: $info_file" echo "Site information (including MySQL credentials) is stored in: $info_file"
echo "Cloudflare credentials for this domain are stored in: $cf_credentials" echo "Cloudflare credentials for this domain are stored in: $cf_credentials"
echo "Logs are stored in: logs" echo "Logs are stored in: logs"

10
install/nginx-snippets/error-pages.conf
View file

@ -1,9 +1,9 @@
error_page 403 /error/403.html; error_page 403 /generic-error-page/403.html;
error_page 404 /error/404.html; error_page 404 /generic-error-page/404.html;
error_page 503 /error/503.html; error_page 503 /generic-error-page/503.html;
error_page 500 502 504 /error/50x.html; error_page 500 502 504 /generic-error-page/50x.html;
location ^~ /error/ { location ^~ /generic-error-page/ {
alias /var/www/error-pages/; alias /var/www/error-pages/;
internal; internal;
} }

20
site-config.conf
View file

@ -45,12 +45,22 @@ server {
return 403; return 403;
} }
# Domain-specific error pages
error_page 403 /domain-error-page/403.html;
error_page 404 /domain-error-page/404.html;
error_page 503 /domain-error-page/503.html;
error_page 500 502 504 /domain-error-page/50x.html;
location ^~ /domain-error-page/ {
alias "/var/www/$DOMAIN/error-pages/";
internal;
}
# Site-specific error pages # Site-specific error pages
error_page 403 /error/403.html; error_page 403 /site-error-page/403.html;
error_page 404 /error/404.html; error_page 404 /site-error-page/404.html;
error_page 503 /error/503.html; error_page 503 /site-error-page/503.html;
error_page 500 502 504 /error/50x.html; error_page 500 502 504 /site-error-page/50x.html;
location ^~ /error/ { location ^~ /site-error-page/ {
alias "$site_root/error-pages/"; alias "$site_root/error-pages/";
internal; internal;
} }