djaploy 1.2.4__tar.gz → 1.2.5__tar.gz

{djaploy-1.2.4 → djaploy-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.2.4
+Version: 1.2.5
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.2.4 → djaploy-1.2.5}/djaploy/apps/borg/infra/djaploy_hooks.py

@@ -146,7 +146,7 @@ def _generate_backup_script(borg_config, app_user: str, repo_name: str,
         if not isinstance(host_data, dict)
         else host_data.get('deployment_strategy', 'zero_downtime')
     )
-    if deployment_strategy == 'zero_downtime':
+    if deployment_strategy in ('zero_downtime', 'bluegreen'):
         default_media = f"/home/{app_user}/apps/{app_name}/shared/media"
     else:
         default_media = f"/home/{app_user}/apps/{app_name}/media"
@@ -527,7 +527,7 @@ def restore_borg(host_data, restore_opts):
         if not isinstance(host_data, dict)
         else host_data.get('deployment_strategy', 'zero_downtime')
     )
-    if deployment_strategy == 'zero_downtime':
+    if deployment_strategy in ('zero_downtime', 'bluegreen'):
         default_media = f"/home/{app_user}/apps/{app_name}/shared/media"
     else:
         default_media = f"/home/{app_user}/apps/{app_name}/media"
@@ -540,6 +540,28 @@ def restore_borg(host_data, restore_opts):
     db_only = restore_opts.get("db_only", False)
     services = getattr(host_data, "services", None) or []
 
+    # For bluegreen, expand service names to per-slot services and include
+    # per-slot streaming services so they are also stopped during restore.
+    deployment_strategy = (
+        getattr(host_data, 'deployment_strategy', 'zero_downtime')
+        if not isinstance(host_data, dict)
+        else host_data.get('deployment_strategy', 'zero_downtime')
+    )
+    if deployment_strategy == 'bluegreen':
+        app_name = (
+            getattr(host_data, 'app_name', '')
+            if not isinstance(host_data, dict)
+            else host_data.get('app_name', '')
+        )
+        bluegreen_services = []
+        for svc in services:
+            bluegreen_services.append(f"{app_name}-blue")
+            bluegreen_services.append(f"{app_name}-green")
+        # Also stop streaming coordinator instances
+        bluegreen_services.append(f"{app_name}-streaming-blue")
+        bluegreen_services.append(f"{app_name}-streaming-green")
+        services = bluegreen_services
+
     # Repo connection details come from the *source* borg config, but
     # ssh_known_hosts_file must come from the *target* (the file lives on
     # the machine running borg, not the machine the backup was taken from).

{djaploy-1.2.4 → djaploy-1.2.5}/djaploy/infra/djaploy_hooks.py

@@ -160,6 +160,7 @@ def configure_server(host_data):
             _sudo_user=app_user,
         )
 
+
         shared_resources = getattr(host_data, 'shared_resources', None) or []
         if shared_resources:
             mkdir_commands = [

{djaploy-1.2.4 → djaploy-1.2.5}/djaploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: djaploy
-Version: 1.2.4
+Version: 1.2.5
 Summary: Modular Django deployment system based on pyinfra
 Author-email: Johanna Mae Dimayuga <johanna@techco.fi>
 License: MIT License

{djaploy-1.2.4 → djaploy-1.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "djaploy"
-version = "1.2.4"
+version = "1.2.5"
 description = "Modular Django deployment system based on pyinfra"
 authors = [
     {name = "Johanna Mae Dimayuga", email = "johanna@techco.fi"}