easy-devops 0.1.1 → 0.1.2

package/cli/managers/nginx-manager.js

@@ -15,6 +15,7 @@ import inquirer from 'inquirer';
 import ora from 'ora';
 import { run, runLive } from '../../core/shell.js';
 import { loadConfig } from '../../core/config.js';
+import { ensureNginxInclude } from '../../core/nginx-conf-generator.js';
 
 const isWindows = process.platform === 'win32';
 
@@ -51,6 +52,7 @@ async function getNginxStatus(nginxDir) {
 // ─── testConfig ───────────────────────────────────────────────────────────────
 
 async function testConfig(nginxExe, nginxDir) {
+  await ensureNginxInclude(nginxDir);
   const cmd = isWindows ? `& "${nginxExe}" -t` : 'nginx -t';
   const result = await run(cmd, { cwd: nginxDir });
   return {

package/cli/managers/ssl-manager.js

@@ -242,25 +242,68 @@ async function renewExpiring(certs) {
 // ─── installCertbot ───────────────────────────────────────────────────────────
 
 async function installCertbot() {
-  if (isWindows) {
-    // Official EFF certbot package via winget — installs to
-    // C:\Program Files\Certbot\bin\ and adds it to the system PATH.
-    // pip install certbot is NOT used: it lands in a user Python Scripts
-    // folder that is not on PATH and cannot renew certs system-wide.
+  if (!isWindows) {
+    const exitCode = await runLive('sudo apt-get install -y certbot', { timeout: 180000 });
+    return { success: exitCode === 0 };
+  }
+
+  // ── Windows: winget → Chocolatey → direct EFF installer ──────────────────────
+
+  // 1. Try winget (Windows 10/11 desktop; not on Windows Server by default)
+  const wingetCheck = await run('where.exe winget 2>$null');
+  if (wingetCheck.success && wingetCheck.stdout.trim().length > 0) {
     console.log(chalk.gray('\n  Installing via winget (EFF.Certbot) ...\n'));
     const exitCode = await runLive(
       'winget install -e --id EFF.Certbot --accept-package-agreements --accept-source-agreements',
       { timeout: 180000 },
     );
-    if (exitCode !== 0) return { success: false };
-    // winget updates the system PATH but the current session won't see it yet.
-    // Verify via the known exe path directly.
-    const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
-    return { success: check.stdout.trim().toLowerCase() === 'true' };
+    if (exitCode === 0) {
+      const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
+      return { success: check.stdout.trim().toLowerCase() === 'true' };
+    }
+    console.log(chalk.yellow('  winget failed, trying Chocolatey...\n'));
+  }
+
+  // 2. Try Chocolatey (common on Windows Server)
+  const chocoCheck = await run('where.exe choco 2>$null');
+  if (chocoCheck.success && chocoCheck.stdout.trim().length > 0) {
+    console.log(chalk.gray('\n  Installing via Chocolatey ...\n'));
+    const exitCode = await runLive('choco install certbot -y', { timeout: 180000 });
+    if (exitCode === 0) {
+      const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
+      return { success: check.stdout.trim().toLowerCase() === 'true' };
+    }
+    console.log(chalk.yellow('  Chocolatey failed, trying direct download...\n'));
   }
 
-  const exitCode = await runLive('sudo apt-get install -y certbot', { timeout: 180000 });
-  return { success: exitCode === 0 };
+  // 3. Direct download — official EFF installer (NSIS, supports /S silent flag)
+  const installerUrl = 'https://dl.eff.org/certbot-beta-installer-win_amd64_signed.exe';
+
+  console.log(chalk.gray('\n  Downloading certbot installer from dl.eff.org ...\n'));
+
+  const downloadResult = await run(
+    `$ProgressPreference='SilentlyContinue'; Invoke-WebRequest -Uri '${installerUrl}' -OutFile "$env:TEMP\\certbot-installer.exe" -UseBasicParsing -TimeoutSec 120`,
+    { timeout: 130000 },
+  );
+
+  if (!downloadResult.success) {
+    console.log(chalk.red('  Download failed: ' + (downloadResult.stderr || downloadResult.stdout)));
+    return { success: false };
+  }
+
+  console.log(chalk.gray('  Running installer silently ...\n'));
+
+  await run(
+    `Start-Process -FilePath "$env:TEMP\\certbot-installer.exe" -ArgumentList '/S' -Wait -NoNewWindow`,
+    { timeout: 120000 },
+  );
+
+  // Cleanup installer
+  await run(`Remove-Item -Force "$env:TEMP\\certbot-installer.exe" -ErrorAction SilentlyContinue`);
+
+  // Verify
+  const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
+  return { success: check.stdout.trim().toLowerCase() === 'true' };
 }
 
 // ─── showSslManager ───────────────────────────────────────────────────────────

package/core/nginx-conf-generator.js

@@ -11,6 +11,63 @@ import fs from 'fs/promises';
 import path from 'path';
 import { loadConfig } from './config.js';
 
+const isWindows = process.platform === 'win32';
+
+/** Returns the conf.d directory for domain config files. */
+function getConfDDir(nginxDir) {
+  return isWindows
+    ? path.join(nginxDir, 'conf', 'conf.d')
+    : path.join(nginxDir, 'conf.d');
+}
+
+/** Returns the path to nginx.conf. */
+function getNginxConfPath(nginxDir) {
+  return isWindows
+    ? path.join(nginxDir, 'conf', 'nginx.conf')
+    : path.join(nginxDir, 'nginx.conf');
+}
+
+/** Returns the include directive line for this platform. */
+function buildIncludeLine(nginxDir) {
+  if (isWindows) {
+    const fwd = nginxDir.replace(/\\/g, '/');
+    return `    include "${fwd}/conf/conf.d/*.conf";`;
+  }
+  return `    include ${nginxDir}/conf.d/*.conf;`;
+}
+
+/**
+ * Ensures that nginx.conf contains an include directive for conf.d/*.conf.
+ * If the line is missing it is inserted just before the closing } of the http block.
+ * @param {string} nginxDir
+ */
+export async function ensureNginxInclude(nginxDir) {
+  const confPath = getNginxConfPath(nginxDir);
+
+  let content;
+  try {
+    content = await fs.readFile(confPath, 'utf8');
+  } catch {
+    return; // nginx.conf not present yet — skip silently
+  }
+
+  // Already has a conf.d include
+  if (/include\s+[^\n]*conf\.d[^\n]*\*\.conf/.test(content)) return;
+
+  const includeLine = buildIncludeLine(nginxDir);
+
+  // Insert before the last } in the file (closes the http block)
+  const lastBrace = content.lastIndexOf('}');
+  if (lastBrace === -1) return;
+
+  const newContent =
+    content.slice(0, lastBrace) +
+    `${includeLine}\n` +
+    content.slice(lastBrace);
+
+  await fs.writeFile(confPath, newContent, 'utf8');
+}
+
 // ─── DOMAIN DEFAULTS (v2 schema) ─────────────────────────────────────────────
 
 export const DOMAIN_DEFAULTS = {
@@ -274,13 +331,17 @@ export function buildConf(domain, nginxDir, certbotDir) {
  */
 export async function generateConf(domain) {
   const { nginxDir, certbotDir } = loadConfig();
-  const confPath = path.join(nginxDir, 'conf.d', `${domain.name}.conf`);
+  const confDir = getConfDDir(nginxDir);
+  const confPath = path.join(confDir, `${domain.name}.conf`);
   const confContent = buildConf(domain, nginxDir, certbotDir);
 
   // Ensure conf.d directory exists
-  await fs.mkdir(path.dirname(confPath), { recursive: true });
+  await fs.mkdir(confDir, { recursive: true });
   await fs.writeFile(confPath, confContent, 'utf8');
 
+  // Ensure nginx.conf includes conf.d
+  await ensureNginxInclude(nginxDir);
+
   // Update domain with config file path
   domain.configFile = confPath;
   domain.updatedAt = new Date().toISOString();

package/dashboard/lib/nginx-service.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { run } from '../../core/shell.js';
 import { loadConfig } from '../../core/config.js';
+import { ensureNginxInclude } from '../../core/nginx-conf-generator.js';
 
 // ─── Error Types ──────────────────────────────────────────────────────────────
 
@@ -23,6 +24,12 @@ function getNginxDir() {
   return nginxDir;
 }
 
+function getConfDDir(nginxDir) {
+  return process.platform === 'win32'
+    ? path.join(nginxDir, 'conf', 'conf.d')
+    : path.join(nginxDir, 'conf.d');
+}
+
 /**
  * Returns the PS-safe invocation string for the nginx binary.
  * On Windows: checks PATH first, then falls back to configured nginxDir.
@@ -50,7 +57,7 @@ export function validateFilename(filename) {
     throw new InvalidFilenameError('Invalid filename');
   }
   const nginxDir = getNginxDir();
-  const confDir = path.join(nginxDir, 'conf.d');
+  const confDir = getConfDDir(nginxDir);
   const resolved = path.resolve(path.join(confDir, filename));
   if (!resolved.startsWith(path.resolve(confDir))) {
     throw new InvalidFilenameError('Invalid filename');
@@ -135,6 +142,7 @@ export async function start() {
   }
 
   // Test config before starting
+  await ensureNginxInclude(nginxDir);
   const testResult = await run(`${nginxExe} -t`);
   if (!testResult.success) {
     return { success: false, output: combineOutput(testResult) };
@@ -201,11 +209,13 @@ export async function stop() {
 
 export async function test() {
   const nginxExe = getNginxExe();
+  const nginxDir = getNginxDir();
   const versionResult = await run(`${nginxExe} -v`);
   if (!versionResult.success && !versionResult.stderr.includes('nginx/')) {
     throw new NginxNotFoundError('nginx binary not found');
   }
 
+  await ensureNginxInclude(nginxDir);
   const result = await run(`${nginxExe} -t`);
   return { success: result.success, output: combineOutput(result) };
 }
@@ -214,7 +224,7 @@ export async function test() {
 
 export async function listConfigs() {
   const nginxDir = getNginxDir();
-  const confDir = path.join(nginxDir, 'conf.d');
+  const confDir = getConfDDir(nginxDir);
   let entries;
   try {
     entries = await fs.readdir(confDir);
@@ -228,7 +238,7 @@ export async function listConfigs() {
 export async function getConfig(filename) {
   validateFilename(filename);
   const nginxDir = getNginxDir();
-  const confPath = path.join(nginxDir, 'conf.d', filename);
+  const confPath = path.join(getConfDDir(nginxDir), filename);
   const content = await fs.readFile(confPath, 'utf8');
   return { content };
 }
@@ -236,7 +246,7 @@ export async function getConfig(filename) {
 export async function saveConfig(filename, content) {
   validateFilename(filename);
   const nginxDir = getNginxDir();
-  const confPath = path.join(nginxDir, 'conf.d', filename);
+  const confPath = path.join(getConfDDir(nginxDir), filename);
   const backupPath = confPath + '.bak';
 
   // Backup only if the file already exists (it may be a new file)
@@ -252,6 +262,7 @@ export async function saveConfig(filename, content) {
   await fs.writeFile(confPath, content, 'utf8');
 
   const nginxExe = getNginxExe();
+  await ensureNginxInclude(nginxDir);
   const result = await run(`${nginxExe} -t`);
   if (!result.success) {
     if (hasBackup) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-devops",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A unified DevOps management tool with CLI and web dashboard for managing Nginx, SSL certificates, and Node.js on Linux and Windows servers.",
   "keywords": [
     "devops",