Mercurial Hosting > luan
diff host/update2.sh @ 2136:3ca8f933209d nginx_decoupled
Initial; use ~/.nginx-luan/ as nginx master conf dir instead of trying to detect the system default.
| author | Violet7 |
|---|---|
| date | Mon, 19 Jan 2026 19:47:11 -0800 |
| parents | de3107eb911f |
| children |
line wrap: on
line diff
--- a/host/update2.sh Fri Jan 16 18:15:14 2026 -0800 +++ b/host/update2.sh Mon Jan 19 19:47:11 2026 -0800 @@ -13,33 +13,11 @@ openssl genrsa 4096 >local/tiny_account.key fi -nginx_conf_dir=$( - for d in \ - /usr/local/etc/nginx/servers \ - /etc/nginx/conf.d; do - if [ -d "$d" ]; then - echo "$d" - break - fi - done -) - -if [ -n "$nginx_conf_dir" ]; then - echo "using nginx conf dir: $nginx_conf_dir" -else - echo "ERROR: No nginx conf dir found.\nFind it and add it to update2.sh." - exit 1 -fi - -# id -gn gets the name of the primary group of the current user (staff) -luan startup/nginx/nginx.conf.luan $(pwd) $nginx_conf_dir $(whoami) $(id -gn) | sudo tee $nginx_conf_dir/luanhost.conf >/dev/null -# DON'T put this in the auto-loaded configs dir, -# it is not meant to be loaded on its own. -luan startup/nginx/nginx.default.conf.luan $(pwd) >$(pwd)/local/luanhost.default.conf +./gen_nginx.sh # this is done because the nginx conf uses absolute paths # and this breaks sites when the luan/host directory is moved luan classpath:luan/host/update.luan -echo Starting... -./start.sh +echo "(re)Starting..." +./restart.sh
