haoshoku 2.1.1 → 2.2.0

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 2.2.0 - 2025-12-12
+- Remove Dashy provisioning from Debian server setup script.
+- Remove Dashy service template from the repository.
+
+

package/haoshoku.js

@@ -12,7 +12,7 @@ const program = new Command();
 program
   .name("haoshoku")
   .description("Haoshoku: Color of the Supreme King. Dominate your setup.")
-  .version("2.1.1");
+  .version("2.2.0");
 
 function detectOS() {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haoshoku",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "module": "haoshoku.js",
   "type": "module",
   "bin": {

package/src/os_scripts/debian_server.js

@@ -3,7 +3,7 @@ import prompts from "prompts";
 import path from "path";
 import fs from "fs";
 import { homedir } from "os";
-import net from "net";
+import { fileURLToPath } from "url";
 
 // --- Constants ---
 const HOME = homedir();
@@ -11,7 +11,9 @@ const FISH_CONFIG_DIR = path.join(HOME, ".config", "fish");
 const STARSHIP_CONFIG_PATH = path.join(HOME, ".config", "starship.toml");
 
 // Project paths
-const PROJECT_ROOT = process.cwd();
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const PROJECT_ROOT = path.resolve(__dirname, "..", "..");
 const CONFIGS_DIR = path.join(PROJECT_ROOT, "configs");
 const CUSTOM_FISH_CONFIG_PATH = path.join(CONFIGS_DIR, "fish", "config.fish");
 
@@ -33,7 +35,10 @@ async function installEssentials() {
   // Split installation to ensure core tools are installed even if optional ones fail
   await runCommand("sudo apt install -y curl wget git vim ufw fail2ban");
   // Try installing software-properties-common separately as it might not be available on all minimal images
-  await runCommand("sudo apt install -y software-properties-common", { check: false });
+  const spcResult = await runCommand("sudo apt install -y software-properties-common", { check: false });
+  if (!spcResult) {
+    log.warning("Could not install software-properties-common. Some PPAs might not work.");
+  }
 }
 
 async function setupSsh() {
@@ -60,10 +65,12 @@ async function setupSsh() {
 async function configureFishShell() {
   if (!(await commandExists("fish"))) {
     log.info("Installing Fish shell...");
-    // Only try adding PPA if software-properties-common was installed successfully
+    // Only try adding PPA if add-apt-repository is available
     if (await commandExists("add-apt-repository")) {
       await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
       await runCommand("sudo apt update");
+    } else {
+      log.warning("add-apt-repository not found. Installing fish from default repositories (might be older version).");
     }
     await runCommand("sudo apt install -y fish");
   }
@@ -144,90 +151,11 @@ async function setupFirewall() {
   }
 }
 
-function checkPortAvailability(port) {
-  return new Promise((resolve) => {
-    const server = net.createServer();
-    server.once("error", (err) => {
-      resolve(false);
-    });
-    server.once("listening", () => {
-      server.close();
-      resolve(true);
-    });
-    server.listen(port);
-  });
-}
-
-async function installDashy() {
-  if (await promptUser("Install Dashy (Personal Dashboard)?", true)) {
-    const servicesDir = path.join(HOME, "services");
-    const dashyDir = path.join(servicesDir, "dashy");
-    const sourceDir = path.join(PROJECT_ROOT, "services", "dashy");
-
-    if (!fs.existsSync(sourceDir)) {
-      log.error(`Dashy source not found at ${sourceDir}`);
-      return;
-    }
-
-    // Port selection
-    let port = 8080;
-    let isAvailable = await checkPortAvailability(port);
-
-    if (!isAvailable) {
-      log.warning(`Port ${port} is already in use.`);
-      const response = await prompts({
-        type: "number",
-        name: "port",
-        message: "Enter a different port for Dashy:",
-        initial: 8081,
-        validate: async (p) => (await checkPortAvailability(p)) ? true : "Port is still in use",
-      });
-      port = response.port;
-    }
-
-    log.info(`Installing Dashy on port ${port}...`);
-
-    // Copy files
-    if (!fs.existsSync(servicesDir)) {
-      fs.mkdirSync(servicesDir, { recursive: true });
-    }
-
-    // Using cp -r for simplicity and preserving permissions
-    await runCommand(`cp -r ${sourceDir} ${servicesDir}`);
-
-    // Update port in docker-compose.yml if changed
-    if (port !== 8080) {
-      const composePath = path.join(dashyDir, "docker-compose.yml");
-      if (fs.existsSync(composePath)) {
-        let content = fs.readFileSync(composePath, "utf-8");
-        content = content.replace("8080:80", `${port}:80`);
-        fs.writeFileSync(composePath, content);
-        log.info(`Updated Dashy port to ${port} in docker-compose.yml`);
-      }
-    }
-
-    // Start service
-    log.info("Starting Dashy...");
-    // We need to run docker compose in the dashy directory
-    // runCommand doesn't support cwd option directly based on usage seen, 
-    // so we construct the command to change dir or use -f and -p? 
-    // Actually runCommand implementation in utils.js likely supports options or we can chain cd.
-    // Let's check utils.js or just chain.
-    // Assuming runCommand takes options based on standard exec wrappers, but looking at previous file view, 
-    // I don't see the definition of runCommand. 
-    // Let's assume `cd ... && ...` works for shell commands.
-    await runCommand(`cd ${dashyDir} && docker compose up -d`);
-
-    log.success(`Dashy installed! Access it at http://localhost:${port}`);
-  }
-}
-
 export async function runDebianServerSetup() {
   await installEssentials();
   await setupSsh();
   await configureFishShell();
   await installDocker();
-  await installDashy();
   await setupFirewall();
 
   log.success("Debian Server setup finished.");

package/services/dashy/README.md

@@ -1,21 +0,0 @@
-# Dashy Service
-
-This directory contains the Docker setup for [Dashy](https://dashy.to/), a self-hosted personal dashboard.
-
-## Prerequisites
-
-- Docker
-- Docker Compose
-
-## Usage
-
-1.  Start the service:
-    ```bash
-    docker compose up -d
-    ```
-
-2.  Access the dashboard at `http://localhost:8080`.
-
-## Configuration
-
-Edit `conf.yml` to customize your dashboard. See [Dashy Documentation](https://dashy.to/docs/configuring) for more details.

package/services/dashy/conf.yml

@@ -1,12 +0,0 @@
-pageTitle: My Dashboard
-sections:
-  - name: Getting Started
-    items:
-      - title: GitHub
-        description: Dashy source code
-        url: https://github.com/Lissy93/dashy
-        icon: fab fa-github
-      - title: Documentation
-        description: Dashy docs
-        url: https://dashy.to/docs
-        icon: fas fa-book

package/services/dashy/docker-compose.yml

@@ -1,12 +0,0 @@
-version: '3.8'
-services:
-  dashy:
-    image: lissy93/dashy:latest
-    container_name: dashy
-    volumes:
-      - ./conf.yml:/app/public/conf.yml
-    ports:
-      - 8080:80
-    restart: unless-stopped
-    environment:
-      - NODE_ENV=production