diff --git a/ct/romm.sh b/ct/romm.sh index dc49b8af7..7a34a8e75 100644 --- a/ct/romm.sh +++ b/ct/romm.sh @@ -59,8 +59,13 @@ function update_script() { ROMM_BASE=${ROMM_BASE:-/var/lib/romm} ln -sfn "$ROMM_BASE"/resources /opt/romm/frontend/dist/assets/romm/resources ln -sfn "$ROMM_BASE"/assets /opt/romm/frontend/dist/assets/romm/assets - sed -i "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm - systemctl reload nginx + if [[ -f /etc/angie/http.d/romm.conf ]]; then + sed -i "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" /etc/angie/http.d/romm.conf + systemctl reload angie + elif [[ -f /etc/nginx/sites-available/romm ]]; then + sed -i "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm + systemctl reload nginx + fi msg_ok "Updated ROMM" msg_info "Starting Services" diff --git a/install/romm-install.sh b/install/romm-install.sh index fcf2a99a8..bf126dea0 100644 --- a/install/romm-install.sh +++ b/install/romm-install.sh @@ -37,20 +37,19 @@ $STD apt install -y \ redis-server \ redis-tools \ p7zip-full \ - tzdata \ - nginx + tzdata msg_ok "Installed Dependencies" -msg_info "Installing Nginx mod_zip module" +msg_info "Installing Angie with mod_zip module" setup_deb822_repo \ - "getpagespeed-extras" \ - "https://extras.getpagespeed.com/deb-archive-keyring.gpg" \ - "https://extras.getpagespeed.com/debian" \ + "angie" \ + "https://angie.software/keys/angie-signing.gpg" \ + "https://download.angie.software/angie/debian/$(get_os_info version_id)" \ "$(get_os_info codename)" \ "main" -$STD apt-get install -y nginx nginx-module-zip -msg_ok "Installed Nginx mod_zip module" - +$STD apt-get install -y angie angie-module-zip +sed -i '1i load_module modules/ngx_http_zip_module.so;' /etc/angie/angie.conf +msg_ok "Installed Angie with mod_zip module" PYTHON_VERSION="3.13" setup_uv NODE_VERSION="24" setup_nodejs setup_mariadb @@ -196,8 +195,8 @@ ln -sfn "$ROMM_BASE"/resources /opt/romm/frontend/dist/assets/romm/resources ln -sfn "$ROMM_BASE"/assets /opt/romm/frontend/dist/assets/romm/assets msg_ok "Set up RomM Frontend" -msg_info "Configuring Nginx" -cat <<'EOF' >/etc/nginx/sites-available/romm +msg_info "Configuring Angie" +cat <<'EOF' >/etc/angie/http.d/romm.conf upstream romm_backend { server 127.0.0.1:5000; } @@ -267,13 +266,11 @@ server { } EOF -sed -i "s|alias /var/lib/romm/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm -rm -f /etc/nginx/sites-enabled/default -rm -f /etc/nginx/conf.d/default.conf -ln -sf /etc/nginx/sites-available/romm /etc/nginx/sites-enabled/romm -systemctl restart nginx -systemctl enable -q --now nginx -msg_ok "Configured Nginx" +sed -i "s|alias /var/lib/romm/library/;|alias ${ROMM_BASE}/library/;|" /etc/angie/http.d/romm.conf +rm -f /etc/angie/http.d/default.conf +systemctl restart angie +systemctl enable -q --now angie +msg_ok "Configured Angie" msg_info "Creating Services" cat </etc/systemd/system/romm-backend.service