fujin-cli 0.26.0__tar.gz → 0.27.0__tar.gz

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### ⚙️ Miscellaneous Tasks
+
+- Remove falco preset from init command
+
+## [0.26.1] - 2026-06-09
+
+### 🐛 Bug Fixes
+
+- *(deploy)* Skip reload-or-restart for Type=oneshot services
+
 ## [0.26.0] - 2026-06-05
 
 ### 🚀 Features

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fujin-cli
-Version: 0.26.0
+Version: 0.27.0
 Summary: Get your project up and running in a few minutes on your own vps.
 Project-URL: Documentation, https://github.com/Tobi-De/fujin#readme
 Project-URL: Issues, https://github.com/Tobi-De/fujin/issues

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/plugins/fujin-secrets-1password/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-1password"
-version = "0.26.0"
+version = "0.26.1"
 description = "1Password secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26",
+  "fujin-cli>=0.26.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/plugins/fujin-secrets-bitwarden/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-bitwarden"
-version = "0.26.0"
+version = "0.26.1"
 description = "Bitwarden secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26",
+  "fujin-cli>=0.26.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/plugins/fujin-secrets-doppler/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-doppler"
-version = "0.26.0"
+version = "0.26.1"
 description = "Doppler secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26",
+  "fujin-cli>=0.26.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/plugins/fujin-secrets-env/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-env"
-version = "0.26.0"
+version = "0.26.1"
 description = "Environment variable secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26",
+  "fujin-cli>=0.26.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/pyproject.toml

@@ -5,7 +5,7 @@ requires = [ "hatchling" ]
 
 [project]
 name = "fujin-cli"
-version = "0.26.0"
+version = "0.27.0"
 description = "Get your project up and running in a few minutes on your own vps."
 readme = "README.md"
 keywords = [
@@ -151,7 +151,7 @@ markers = [
 ]
 
 [tool.bumpversion]
-current_version = "0.26.0"
+current_version = "0.27.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = [ "{major}.{minor}.{patch}" ]
 search = "{current_version}"

fujin_cli-0.27.0/src/fujin/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.26.1"

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/src/fujin/_installer.py

@@ -373,8 +373,15 @@ export -f {config.app_name}
 
     logger.info("Restarting services...")
     active_units = []
+    oneshot_units = _get_oneshot_units(config.deployed_units)
+    if oneshot_units:
+        logger.info(
+            "Skipping restart of Type=oneshot units: %s",
+            ", ".join(sorted(oneshot_units)),
+        )
     for unit in config.deployed_units:
-        active_units.extend(unit["service_instances"])
+        if unit["template_service_name"] not in oneshot_units:
+            active_units.extend(unit["service_instances"])
         if unit["template_socket_name"]:
             active_units.append(unit["template_socket_name"])
         if unit["template_timer_name"]:
@@ -409,16 +416,20 @@ export -f {config.app_name}
             validation_issues,
         )
 
-    units_str = " ".join(active_units)
-    run(
-        f"systemctl daemon-reload && systemctl enable {units_str}",
-        check=True,
-    )
+    if not active_units:
+        run("systemctl daemon-reload")
+        restart_result = run("true")
+    else:
+        units_str = " ".join(active_units)
+        run(
+            f"systemctl daemon-reload && systemctl enable {units_str}",
+            check=True,
+        )
 
-    restart_cmd = "restart" if full_restart else "reload-or-restart"
-    restart_result = run(
-        f"systemctl {restart_cmd} {units_str}",
-    )
+        restart_cmd = "restart" if full_restart else "reload-or-restart"
+        restart_result = run(
+            f"systemctl {restart_cmd} {units_str}",
+        )
 
     # Check if services are actually running (not just restart command succeeded)
     # Only check services with no timer or socket - they should run immediately
@@ -426,6 +437,7 @@ export -f {config.app_name}
         unit["service_instances"]
         for unit in config.deployed_units
         if not (unit["template_socket_name"] or unit["template_timer_name"])
+        and unit["template_service_name"] not in oneshot_units
     ]
     units_to_check = list(chain.from_iterable(units_to_check))
 
@@ -607,6 +619,21 @@ def uninstall(config: InstallConfig, bundle_dir: Path) -> None:
     logger.info("Uninstall completed.")
 
 
+def _get_oneshot_units(deployed_units: list[DeployedUnit]) -> set[str]:
+    """Identify units with Type=oneshot that should be skipped during restart.
+
+    Oneshot services have no long-running process to reload or restart — they
+    complete and exit. Restarting them during deploy is unnecessary and can
+    cause spurious failures that trigger rollbacks.
+    """
+    oneshot = set()
+    for unit in deployed_units:
+        unit_path = SYSTEMD_SYSTEM_DIR / unit["template_service_name"]
+        if unit_path.exists() and "Type=oneshot" in unit_path.read_text():
+            oneshot.add(unit["template_service_name"])
+    return oneshot
+
+
 def run(
     cmd: str,
     *,

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/src/fujin/commands/init.py

@@ -24,7 +24,7 @@ class Init(BaseCommand):
     profile: Annotated[
         str,
         cappa.Arg(
-            choices=["simple", "falco", "binary", "django"],
+            choices=["simple", "binary", "django"],
             short="-p",
             long="--profile",
             help="Configuration profile to use",
@@ -54,7 +54,6 @@ class Init(BaseCommand):
         profile_generators = {
             "simple": self._generate_simple,
             "django": self._generate_django,
-            "falco": self._generate_falco,
             "binary": self._generate_binary,
         }
 
@@ -172,11 +171,20 @@ class Init(BaseCommand):
             "# Main command - adjust to match your application\n", exec_start_pre_lines
         )
 
-        # Customize ExecStart for gunicorn
+        # Customize ExecStart for gunicorn and add reload with migrations
         service_content = service_content.replace(
             "ExecStart={install_dir}/.venv/bin/python -m myapp.web",
             f"ExecStart={{install_dir}}/.venv/bin/gunicorn {app_name}.wsgi:application --bind 0.0.0.0:8000",
         )
+        exec_reload_lines = (
+            f"ExecReload={{install_dir}}/.venv/bin/{app_name} migrate\n"
+            f"ExecReload={{install_dir}}/.venv/bin/{app_name} collectstatic --no-input\n"
+            f"ExecReload=/bin/kill -s HUP $MAINPID\n"
+        )
+        service_content = service_content.replace(
+            "ExecStartPre=/bin/bash -c 'rsync -a --delete staticfiles/",
+            f"{exec_reload_lines}ExecStartPre=/bin/bash -c 'rsync -a --delete staticfiles/",
+        )
         web_service.write_text(service_content)
         self.output.success(f"  Created {web_service}")
 
@@ -184,93 +192,6 @@ class Init(BaseCommand):
             fujin_dir, app_name, "localhost:8000", static_path="{app_dir}/staticfiles/"
         )
 
-    def _generate_falco(self, app_name: str, fujin_dir: Path):
-        """Generate Falco profile: web + worker services."""
-        systemd_dir = fujin_dir / "systemd"
-        dropin_dir = systemd_dir / "common.d"
-        dropin_dir.mkdir(parents=True, exist_ok=True)
-
-        dropin = dropin_dir / "base.conf"
-        dropin.write_text(
-            """
-[Service]
-User={{app_user}}
-WorkingDirectory={{app_dir}}
-EnvironmentFile={{install_dir}}/.env
-Restart=on-failure
-RestartSec=5s
-
-# Security Hardening
-NoNewPrivileges=true
-PrivateTmp=true
-ProtectSystem=strict
-ProtectHome=true
-ReadWritePaths={{app_dir}}
-        """
-        )
-
-        web_service = systemd_dir / "web.service"
-        web_service.write_text(
-            f"""
-[Unit]
-Description={app_name} web
-After=network.target
-Wants={{setup}}
-After={{setup}}
-
-[Service]
-UMask=0002
-RuntimeDirectory={app_name}
-RuntimeDirectoryMode=0755
-ExecStart={{install_dir}}/.venv/bin/{app_name} prodserver --uds /run/{app_name}/web.sock
-ExecReload=/bin/kill -s HUP $MAINPID
-KillMode=mixed
-TimeoutStopSec=5
-
-[Install]
-WantedBy=multi-user.target
-"""
-        )
-        self.output.success(f"  Created {web_service}")
-
-        setup_service = systemd_dir / "setup.service"
-        setup_service.write_text(
-            f"""
-[Unit]
-Description={app_name} setup
-After=network-online.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart={{install_dir}}/.venv/bin/{app_name} setup
-
-[Install]
-WantedBy=multi-user.target
-"""
-        )
-        self.output.success(f"  Created {setup_service}")
-
-        worker_service = systemd_dir / "worker.service"
-        worker_service.write_text(
-            f"""
-[Unit]
-Description={app_name} worker
-Wants={{setup}}
-After={{setup}}
-After=network.target
-
-[Service]
-ExecStart={{install_dir}}/.venv/bin/{app_name} db_worker
-
-[Install]
-WantedBy=multi-user.target
-"""
-        )
-        self.output.success(f"  Created {worker_service}")
-
-        self._create_caddyfile(fujin_dir, app_name, f"unix//run/{app_name}/web.sock")
-
     def _generate_binary(self, app_name: str, fujin_dir: Path):
         """Generate binary profile: single binary deployment."""
         systemd_dir = fujin_dir / "systemd"

{fujin_cli-0.26.0 → fujin_cli-0.27.0}/uv.lock

@@ -346,7 +346,7 @@ wheels = [
 
 [[package]]
 name = "fujin-cli"
-version = "0.25.2"
+version = "0.26.0"
 source = { editable = "." }
 dependencies = [
     { name = "cappa" },
@@ -402,7 +402,7 @@ docs = [
 
 [[package]]
 name = "fujin-secrets-1password"
-version = "0.25.2"
+version = "0.26.0"
 source = { editable = "plugins/fujin-secrets-1password" }
 dependencies = [
     { name = "fujin-cli" },
@@ -417,7 +417,7 @@ requires-dist = [
 
 [[package]]
 name = "fujin-secrets-bitwarden"
-version = "0.25.2"
+version = "0.26.0"
 source = { editable = "plugins/fujin-secrets-bitwarden" }
 dependencies = [
     { name = "fujin-cli" },
@@ -432,7 +432,7 @@ requires-dist = [
 
 [[package]]
 name = "fujin-secrets-doppler"
-version = "0.25.2"
+version = "0.26.0"
 source = { editable = "plugins/fujin-secrets-doppler" }
 dependencies = [
     { name = "fujin-cli" },
@@ -447,7 +447,7 @@ requires-dist = [
 
 [[package]]
 name = "fujin-secrets-env"
-version = "0.25.2"
+version = "0.26.0"
 source = { editable = "plugins/fujin-secrets-env" }
 dependencies = [
     { name = "fujin-cli" },

fujin_cli-0.26.0/src/fujin/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.26.0"