Cleanup provisioning system

Author: ArendJan

provisioning/machine_config.py

@@ -52,7 +52,7 @@ def access_points(configuration, loop):
 stopped = False
 
 
-def stop():
+async def stop():
     global stopped
     stopped = True
 
@@ -114,8 +114,7 @@ def set_password(new_password, prev_set_password):
     ):  # when changing as the mirte user, there are some checks, when changing as root, no checks
         return
     print(f'Changing password to "{new_password}"')
-    print(f'echo "{new_password}\n{new_password}" | sudo passwd mirte')
-    o = os.system(f'echo "{new_password}\n{new_password}" | sudo passwd mirte')
+    o = os.system(f'sudo chpasswd mirte:{new_password}')
     print(o)
 
 

provisioning/provisioning.py

@@ -2,6 +2,7 @@
 import time
 import asyncio
 import traceback
+from signal import SIGINT, SIGTERM
 
 # Provisioning system for the Mirte sd cards.
 # Only activate this service when you want to copy configurations from the second partition to the operating system
@@ -15,32 +16,37 @@
 
 modules = [robot_config, machine_config, ssh]
 
-event_loop = asyncio.get_event_loop()
 
-for module in modules:
-    try:
-        module.start(mount_point, event_loop)
-    except Exception as e:
-        print(e)
-        print(traceback.format_exc())
+async def stop(event_loop):
+    for module in modules:
+        try:
+            await module.stop()
+        except Exception as e:
+            print(e)
+    event_loop.stop()
 
 
-async def main():
-    count = 1000
-    while True:
-        count += -1
-        await asyncio.sleep(1)
 
 
-event_loop.run_until_complete(main())
+if __name__ == "__main__":
+    event_loop = asyncio.get_event_loop()
 
+    for module in modules:
+        try:
+            module.start(mount_point, event_loop)
+        except Exception as e:
+            print(e)
+            print(traceback.format_exc())
+    for signal in [SIGINT, SIGTERM]:
+        event_loop.add_signal_handler(signal,
+                                lambda: event_loop.create_task(stop(event_loop)))
 
-for module in modules:
-    try:
-        module.stop()
-    except Exception as e:
-        print(e)
 
-pending = asyncio.all_tasks(loop=event_loop)
-event_loop.run_until_complete(asyncio.gather(*pending))
-event_loop.close()
+    event_loop.run_forever()
+
+
+    
+
+    pending = asyncio.all_tasks(loop=event_loop)
+    event_loop.run_until_complete(asyncio.gather(*pending))
+    event_loop.close()

provisioning/robot_config.py

@@ -64,7 +64,7 @@ def on_modified(self, event):
         self.catch_all_handler(event)
 
 
-def stop():
+async def stop():
     observer.stop()
     observer.join()
 

provisioning/ssh.py

@@ -21,5 +21,5 @@ def start(mount_point, loop):
         file.writelines(new_keys)
 
 
-def stop():
+async def stop():
     print("stop ssh")