@stacksjs/ts-cloud 0.5.22 → 0.5.24

package/dist/index.js

@@ -84234,13 +84234,18 @@ function buildNginxVhostScript(options) {
 var NGINX_WRAPPER = "/usr/local/bin/ts-cloud-nginx";
 function buildNginxServiceScript(projectDir = "/opt/pantry") {
   return [
+    ...buildPantryBootstrapScript(),
+    ...buildPantryInstallScript(["nginx.org"]),
+    "if ! /opt/pantry/pantry/.bin/nginx -v >/dev/null 2>&1; then apt-get update -y && apt-get install -y nginx; fi",
     "mkdir -p /etc/nginx/sites-available /etc/nginx/sites-enabled /var/log/nginx /var/lib/nginx/body /var/lib/nginx/proxy /var/lib/nginx/fastcgi /var/lib/nginx/uwsgi /var/lib/nginx/scgi",
     "getent passwd www-data >/dev/null || useradd --system --no-create-home --shell /usr/sbin/nologin www-data",
     "chown -R www-data:www-data /var/lib/nginx /var/log/nginx",
     `cat > ${NGINX_WRAPPER} <<'TS_CLOUD_NGINXBIN_EOF'`,
     "#!/bin/sh",
     `eval "$(cd ${projectDir} && pantry env 2>/dev/null)"`,
-    "NGINX_BIN=$(command -v nginx || echo /opt/pantry/pantry/.bin/nginx)",
+    "NGINX_BIN=$(command -v nginx || true)",
+    'if [ -z "$NGINX_BIN" ] || ! "$NGINX_BIN" -v >/dev/null 2>&1; then NGINX_BIN=/usr/sbin/nginx; fi',
+    'if [ ! -x "$NGINX_BIN" ]; then NGINX_BIN=/opt/pantry/pantry/.bin/nginx; fi',
     'exec "$NGINX_BIN" -c /etc/nginx/nginx.conf "$@"',
     "TS_CLOUD_NGINXBIN_EOF",
     `chmod +x ${NGINX_WRAPPER}`,
@@ -84325,6 +84330,7 @@ function buildNginxServiceScript(projectDir = "/opt/pantry") {
     "WantedBy=multi-user.target",
     "TS_CLOUD_NGINXUNIT_EOF",
     "systemctl daemon-reload",
+    "systemctl disable --now nginx 2>/dev/null || true",
     "systemctl enable ts-cloud-nginx",
     "ls /etc/nginx/sites-enabled/* >/dev/null 2>&1 && systemctl restart ts-cloud-nginx || true"
   ];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/ts-cloud",
   "type": "module",
-  "version": "0.5.22",
+  "version": "0.5.24",
   "description": "A lightweight, performant infrastructure-as-code library and CLI for deploying both server-based (EC2) and serverless applications.",
   "author": "Chris Breuer <chris@stacksjs.com>",
   "license": "MIT",
@@ -89,8 +89,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ts-cloud/aws-types": "0.5.22",
-    "@ts-cloud/core": "0.5.22",
+    "@ts-cloud/aws-types": "0.5.24",
+    "@ts-cloud/core": "0.5.24",
     "@stacksjs/ts-xml": "^0.1.0"
   },
   "devDependencies": {