From 08f232bf51224bdccb98d4ae8426b0f14e356b38 Mon Sep 17 00:00:00 2001
From: Jonathan Carter <jcc@debian.org>
Date: Tue, 26 Aug 2025 15:22:26 +0200
Subject: [PATCH] Rename to yasi, add icon

---
 src/templates/dmm-installer-template.yaml     |  32 ------------------
 src/{system-installer-daemon => yasi-daemon}  |   7 ++--
 ...em-installer-web-client => yasi-webclient} |   0
 src/yasi_applets/__init__.py                  |   0
 src/yasi_applets/main/static/icons/yasi.png   | Bin 0 -> 4157 bytes
 src/yasi_applets/users/routes.py              |   2 --
 src/yasi_applets/users/routes.py.bak          |  24 -------------
 7 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 src/templates/dmm-installer-template.yaml
 rename src/{system-installer-daemon => yasi-daemon} (90%)
 rename src/{system-installer-web-client => yasi-webclient} (100%)
 create mode 100644 src/yasi_applets/__init__.py
 create mode 100644 src/yasi_applets/main/static/icons/yasi.png
 delete mode 100644 src/yasi_applets/users/routes.py.bak

diff --git a/src/templates/dmm-installer-template.yaml b/src/templates/dmm-installer-template.yaml
deleted file mode 100644
index 69efbce..0000000
--- a/src/templates/dmm-installer-template.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env dmm-perform-recipe
-
-module_path:
-    - local
-
-settings:
-    language: en
-    devmode: True 
-    apt_depends: util-linux adduser parted e2fsprogs debootstrap
-    apps: main welcome users disks software summary install
-    menu_order: welcome users disks software summary
-
-recipe:
-    installer_dependencies:
-        description: Installing Dependencies
-        module: aptpkg
-        function: install
-        packagooes: apt
-        chrooti: /tmp
-    users:
-        module: users
-        function: add
-        users:
-            - username:
-              password:
-              fullname:
-              sudo: True
-    popcon:
-        module: software
-        function: popcon
-        enable_popcon: False 
-
diff --git a/src/system-installer-daemon b/src/yasi-daemon
similarity index 90%
rename from src/system-installer-daemon
rename to src/yasi-daemon
index 2371deb..b000457 100755
--- a/src/system-installer-daemon
+++ b/src/yasi-daemon
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-Welcome to SID - The System Installer Daemon!
+Welcome to YaSID - The The Yasi System Installer Daemon!
 """
 
 from flask import Flask, request, session, redirect, \
@@ -10,10 +10,10 @@ import logging
 import dmm.lsblk as lsblk
 import importlib
 import yaml
+import sys
 
 # configuration
-#CONFIGFILE="templates/dmm-installer-template.yaml"
-CONFIGFILE="templates/dmm-installer-vm-template.yaml"
+CONFIGFILE="/etc/yasi/yasi.yaml"
 
 # import config
 global config
@@ -28,6 +28,7 @@ app.config.from_object(__name__)
 app.config['CONFIG'] = config
 app.app_context().push()
 config['settings']['menu'] = {}
+sys.path.append('/usr/share/yasi-daemon')
 
 if DEV_MODE:
     print("Note: Starting in devmode!")
diff --git a/src/system-installer-web-client b/src/yasi-webclient
similarity index 100%
rename from src/system-installer-web-client
rename to src/yasi-webclient
diff --git a/src/yasi_applets/__init__.py b/src/yasi_applets/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/yasi_applets/main/static/icons/yasi.png b/src/yasi_applets/main/static/icons/yasi.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f5470f435082d52f9f40d09d3f099b8266527bf
GIT binary patch
literal 4157
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
Hu0mjfFZaM^

literal 0
HcmV?d00001

diff --git a/src/yasi_applets/users/routes.py b/src/yasi_applets/users/routes.py
index 2babece..719cd62 100644
--- a/src/yasi_applets/users/routes.py
+++ b/src/yasi_applets/users/routes.py
@@ -109,7 +109,6 @@ def build_menu():
     Define menu items and paths.
     """
     current_app.config['CONFIG']['settings']['menu']['users'] = (build_stringlist()['menu_item'], "/users", 20)
-    print(current_app.config['CONFIG']['settings']['menu'])
 
 
 def build_summary():
@@ -118,7 +117,6 @@ def build_summary():
     """
     current_app.config['CONFIG']['Summary']['users'] = {}
     current_app.config['CONFIG']['Summary']['users']['heading'] = "Users and Identity"
-    current_app.config['CONFIG']['Summary']['users']['bleh'] = current_app.config['CONFIG']['recipe']['popcon']['enable_popcon']
     current_app.config['CONFIG']['Summary']['users']['settings'] = current_app.config['CONFIG']['recipe']['users']['users']
     current_app.config['CONFIG']['Summary']['users']['text'] = "Add primary user with the username: " + str(current_app.config['CONFIG']['recipe']['users']['users'][0]['username'])
     return("ok?")
diff --git a/src/yasi_applets/users/routes.py.bak b/src/yasi_applets/users/routes.py.bak
deleted file mode 100644
index 2dfbc4f..0000000
--- a/src/yasi_applets/users/routes.py.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-from applets.software import bp
-from flask import Flask, request, session, redirect, \
-     url_for, render_template, flash, Blueprint
-# we use this neat little trick to get config data from the main app
-from flask import current_app
-
-
-def build_stringlist():
-    """
-    Return all the strings that is used in this applet.
-    """
-    string_dict = {}
-    string_dict['initial_user_text'] = _("Let's set up an initial user.")
-    string_dict['full_name'] = _("Full Name")
-    string_dict['user_name'] = _("Username")
-    string_dict['user_name_available'] = _("This username is available")
-    string_dict['user_name_not_available'] = _("This username is not available")
-    string_dict['user_name_reserved'] = _("This username is reserved by the system")
-    string_dict['user_name_characters'] = _("The username must be one word, lowercase, with no special characters")
-    string_dict['password'] = _("Password")
-    string_dict['password_confirm'] = _("Password (confirm)")
-    string_dict['password_nomatch'] = _("These passwords do now match")
-    string_dict['password_tooshort'] = _("This password is too short")
-    return string_dict