Merge pull request #8 from j4ys0n/nginx-config

fix default template & interpolation

Author: j4ys0n

package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-proxy",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Manages Nginx for reverse proxy to multiple LLMs, with TLS & Bearer Auth tokens",
   "main": "dist/index.js",
   "scripts": {

src/controllers/nginx.ts

@@ -34,9 +34,14 @@ export class NginxController {
   }
 
   private async updateConfig(req: Request, res: Response): Promise<void> {
-    const { success, message } = await this.nginxManager.updateConfig(req.body)
-    const status = success ? 200 : 500
-    res.status(status).json({ success, message })
+    if (req.body != null && req.body.config != null) {
+      const newConfig = req.body.config
+      const { success, message } = await this.nginxManager.updateConfig(newConfig)
+      const status = success ? 200 : 500
+      res.status(status).json({ success, message })
+    } else {
+      res.status(400).json({ success: false, message: 'Invalid request body' })
+    }
   }
 
   private async getConfig(req: Request, res: Response): Promise<void> {
@@ -55,11 +60,16 @@ export class NginxController {
   }
 
   private async writeDefaultConfig(req: Request, res: Response): Promise<void> {
-    const { success, message } = await this.nginxManager.writeDefaultTemplate()
-    if (success) {
-      res.json({ success, message: 'Default config written successfully' })
+    if (req.body != null && req.body.domain != null) {
+      const domain = req.body.domain
+      const { success, message } = await this.nginxManager.writeDefaultTemplate(domain)
+      if (success) {
+        res.json({ success, message: 'Default config written successfully' })
+      } else {
+        res.status(500).json({ success, message })
+      }
     } else {
-      res.status(500).json({ success, message })
+      res.status(400).json({ success: false, message: 'Invalid request body' })
     }
   }
 

src/static/nginx-server-template.conf

@@ -4,13 +4,13 @@ server {
   add_header 'Access-Control-Allow-Origin' '*';
   add_header 'Add-Control-Allow-Methods' 'GET, POST';
 
-  server_name {{ domainName }};
+  server_name {{domainName}};
   server_tokens off;
 
   real_ip_header X-Forwarded-For;
 
-  ssl_certificate /etc/letsencrypt/live/{{ domainName }}/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/{{ domainName }}/privkey.pem;
+  ssl_certificate /etc/letsencrypt/live/{{domainName}}/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/{{domainName}}/privkey.pem;
   # include /etc/letsencrypt/options-ssl-nginx.conf;
   # ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 

src/utils/nginx.ts

@@ -62,9 +62,10 @@ export class NginxManager {
     return this.putFile(this.configPath, newConfig)
   }
 
-  async writeDefaultTemplate(): Promise<NginxResponse> {
+  async writeDefaultTemplate(domain: string): Promise<NginxResponse> {
     const templateContent = await readFile(CONFIG_TEMPLATE_PATH, 'utf-8')
-    return this.putFile(this.configPath, templateContent)
+    const content = templateContent.replace(/{{domainName}}/g, domain)
+    return this.putFile(this.configPath, content)
   }
 
   async getConfig(): Promise<NginxConfigResponse> {