sys-ctl-rpr-docker-hard: Refactor restart script with argparse & update systemd ExecStart

- Removed unused soft restart function and switched to argparse-based CLI.
- Added --only argument to selectively restart subdirectories.
- Updated systemctl service template to pass PATH_DOCKER_COMPOSE_INSTANCES as argument.
- Ensures service unit correctly invokes the Python script with target path.

See conversation: https://chatgpt.com/share/68a771d9-5fd8-800f-a410-08132699cc3a

group_vars/all/07_services.yml

@@ -5,12 +5,13 @@
 SYS_SERVICE_SUFFIX:                   ".{{ SOFTWARE_NAME | lower }}.service"
 
 ## Names
-SYS_SERVICE_CLEANUP_BACKUPS_FAILED:   "{{ 'sys-ctl-cln-faild-bkps'  | get_service_name(SOFTWARE_NAME) }}"
-SYS_SERVICE_OPTIMIZE_DRIVE:           "{{ 'svc-opt-ssd-hdd'         | get_service_name(SOFTWARE_NAME) }}"
-SYS_SERVICE_BACKUP_RMT_2_LOC:         "{{ 'svc-bkp-rmt-2-loc'       | get_service_name(SOFTWARE_NAME) }}"
-SYS_SERVICE_REPAIR_DOCKER_SOFT:       "{{ 'sys-ctl-rpr-docker-soft' | get_service_name(SOFTWARE_NAME) }}"
-SYS_SERVICE_REPAIR_DOCKER_HARD:       "{{ 'sys-ctl-rpr-docker-hard' | get_service_name(SOFTWARE_NAME) }}"
-SYS_SERVICE_UPDATE_DOCKER:            "{{ 'update-docker'           | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_CLEANUP_BACKUPS_FAILED:   "{{ 'sys-ctl-cln-faild-bkps'    | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_OPTIMIZE_DRIVE:           "{{ 'svc-opt-ssd-hdd'           | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_BACKUP_RMT_2_LOC:         "{{ 'svc-bkp-rmt-2-loc'         | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_BACKUP_DOCKER_2_LOC:      "{{ 'sys-ctl-bkp-docker-2-loc'  | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_REPAIR_DOCKER_SOFT:       "{{ 'sys-ctl-rpr-docker-soft'   | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_REPAIR_DOCKER_HARD:       "{{ 'sys-ctl-rpr-docker-hard'   | get_service_name(SOFTWARE_NAME) }}"
+SYS_SERVICE_UPDATE_DOCKER:            "{{ 'update-docker'             | get_service_name(SOFTWARE_NAME) }}"
 
 ## On Failure
 SYS_SERVICE_ON_FAILURE_COMPOSE:       "{{ ('sys-ctl-alm-compose@') | get_service_name(SOFTWARE_NAME, False) }}%n.service"
@@ -40,12 +41,12 @@ SYS_SERVICE_GROUP_MAINTANANCE: >
 SYS_SERVICE_GROUP_MANIPULATION: >
   {{ 
     (
-      SYS_SERVICE_GROUP_BACKUPS + 
-      SYS_SERVICE_GROUP_CLEANUP + 
-      SYS_SERVICE_GROUP_REPAIR + 
-      SYS_SERVICE_GROUP_OPTIMIZATION + 
+      SYS_SERVICE_GROUP_BACKUPS +
+      SYS_SERVICE_GROUP_CLEANUP +
+      SYS_SERVICE_GROUP_REPAIR +
+      SYS_SERVICE_GROUP_OPTIMIZATION +
       SYS_SERVICE_GROUP_MAINTANANCE +
-      [ SYS_SERVICE_UPDATE_DOCKER ] 
+      [ SYS_SERVICE_UPDATE_DOCKER ]
     ) | sort
   }}
 

roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2

@@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 
 [Service]
 Type=oneshot
-ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
+ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
 ExecStart={{ system_service_script_exec }}

roles/sys-ctl-bkp-docker-2-loc/templates/systemctl.service.j2

@@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 
 [Service]
 Type=oneshot
-ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
+ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_BACKUP_DOCKER_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}"
 ExecStart=/bin/sh -c '{{ BKP_DOCKER_2_LOC_EXEC }}'

roles/sys-ctl-rpr-docker-hard/files/script.py

@@ -1,17 +1,7 @@
 import os
 import sys
 import subprocess
-
-def restart_docker_services(dir_path):
-    """
-    Restart docker-compose services in the given directory.
-    """
-    try:
-        print(f"Restarting docker-compose services in: {dir_path}")
-        subprocess.run(["docker-compose", "restart"], cwd=dir_path, check=True)
-        print(f"Services restarted successfully in: {dir_path}")
-    except subprocess.CalledProcessError as e:
-        print(f"Error restarting services in {dir_path}: {e}")
+import argparse
 
 def hard_restart_docker_services(dir_path):
     """
@@ -26,28 +16,45 @@ def hard_restart_docker_services(dir_path):
     except subprocess.CalledProcessError as e:
         print(f"Error during hard restart in {dir_path}: {e}")
 
-if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("Please provide the path to the parent directory as a parameter.")
-        sys.exit(1)
 
-    parent_directory = sys.argv[1]
+def main():
+    parser = argparse.ArgumentParser(
+        description="Restart docker-compose services in subdirectories."
+    )
+    parser.add_argument(
+        "parent_directory",
+        help="Path to the parent directory containing docker-compose projects"
+    )
+    parser.add_argument(
+        "--only",
+        nargs="+",
+        help="Restart only the specified subdirectories (by name)"
+    )
+    args = parser.parse_args()
+
+    parent_directory = args.parent_directory
+
+    if not os.path.isdir(parent_directory):
+        print(f"Error: {parent_directory} is not a valid directory.")
+        sys.exit(1)
 
     for dir_entry in os.scandir(parent_directory):
         if dir_entry.is_dir():
             dir_path = dir_entry.path
             dir_name = os.path.basename(dir_path)
             print(f"Checking directory: {dir_path}")
-            
+
             docker_compose_file = os.path.join(dir_path, "docker-compose.yml")
-            
+
             if os.path.isfile(docker_compose_file):
-                print(f"Found docker-compose.yml in {dir_path}.")
-                if dir_name == "web-app-mailu":
-                    print(f"Directory {dir_name} detected. Performing hard restart...")
-                    hard_restart_docker_services(dir_path)
-                else:
-                    print(f"Restarting services in {dir_path}...")
-                    restart_docker_services(dir_path)
+                if args.only and dir_name not in args.only:
+                    print(f"Skipping {dir_name} (not in --only list).")
+                    continue
+                print(f"Performing normal restart in {dir_name}...")
+                hard_restart_docker_services(dir_path)
             else:
                 print(f"No docker-compose.yml found in {dir_path}. Skipping.")
+
+
+if __name__ == "__main__":
+    main()

roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2

@@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
 
 [Service]
 Type=oneshot
-ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(' ') }} {{ SYS_SERVICE_REPAIR_DOCKER_HARD }} --timeout "{{ SYS_TIMEOUT_RESTART_DOCKER }}"
-ExecStart={{ system_service_script_exec }}
+ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ')  }} --ignore {{ SYS_SERVICE_REPAIR_DOCKER_HARD }} --timeout "{{ SYS_TIMEOUT_RESTART_DOCKER }}"
+ExecStart={{ system_service_script_exec }} {{ PATH_DOCKER_COMPOSE_INSTANCES }}