feb git sync

tasks/dashboard.yaml

@@ -33,7 +33,6 @@
     group: root
 
 - name: websocket tasks
-  when: not quick_refresh | bool
   block:
 
   - name: websocket - copy websocket server files
@@ -47,9 +46,20 @@
   - name: websocket - build docker container
     community.docker.docker_image_build:
       name: ws_node
+      tag: latest
       rebuild: always
       path: "{{ service_folder }}/ws_node"
       dockerfile: Dockerfile
+      labels:
+        ssd_health: "true"
+
+  - name: Prune containers with labels
+    community.docker.docker_prune:    
+      containers: true
+      containers_filters:
+        label:
+          ssd_health: "true"
+ 
   
 - name: docker containers
   when: not quick_refresh | bool

tasks/drive_index.yaml

@@ -19,7 +19,7 @@
 
   - name: Drive Index - copy script files
     copy:
-      src: scripts/
+      src: oop_code/
       dest: "{{ service_folder }}/"
       owner: "{{ autologin_user }}"
       group: "{{ autologin_user }}"
@@ -46,9 +46,9 @@
         pytz
         requests
         opencv-python
-        flask-socketio
-        eventlet
         redis
+        flask_apscheduler
+
       owner: "{{ autologin_user }}"
       group: "{{ autologin_user }}"
       mode: 0644

tasks/initialize.yaml

@@ -5,6 +5,14 @@
   set_fact:
     service_only: true
 
+- name: Initialize - install docker when required
+  when: service_only | bool or not install_docker | bool
+  include_role:
+    name:  "docker_workstation"
+  vars:
+    docker_full: false
+
+
 - name: Initialize - Install Packages  
   when: not quick_refresh | bool
   apt:
@@ -33,7 +41,7 @@
     mode: '0700'
 
 - name: Initialize - set vars when needed 
-  when: quick_refresh | bool or refresh_special | bool
+  #when: quick_refresh | bool or refresh_special | bool
   block:
 
   - name: Check CPU Arch

tasks/main.yaml

@@ -14,13 +14,14 @@
   
 # set up autologin
 - name: Drive health - configure autologin
-  when: not install_kiosk | bool and not service_only | bool
+  when: not install_kiosk | bool and not service_only | bool and not armcpu_check | bool
   include_tasks: autologin.yaml
   
-# configure service-mode
-- name: Drive health - configure service-mode
-  include_tasks: service_mode.yaml
-  
+# disablep autologin
+- name: Drive health - disable autologin
+  when: install_kiosk | bool or service_only | bool
+  include_tasks: autologin.yaml
+    
 # Install chrome kiosk
 - name: install chromium kiosk
   when: install_kiosk | bool and not service_only | bool

tasks/no_autologin.yaml

@@ -5,7 +5,7 @@
 - name: no autologin - edit logind to set vterms to six
   lineinfile:
     dest: /etc/systemd/logind.conf
-    regexp: '^#NAutoVTs='
+    regexp: '^#NAutoVTs=1'
     line: 'NAutoVTs=6'
     backrefs: yes
 
@@ -16,12 +16,6 @@
     rm /etc/systemd/system/getty@tty1.service.d/override.conf
     rm /etc/sudoers.d/smartctl
 
-#- name: no autologin - remove autologin override to getty tty1 service
-#  shell: "rm /etc/systemd/system/getty@tty1.service.d/override.conf"
-#  
-#- name: no autologin - "User setup - allow {{ autologin_user }} to smartctl"
-#  shell: "rm /etc/sudoers.d/smartctl"
-  
 - name: no autologin - Restart getty@tty1 service
   systemd:
     name: getty@tty1.service

tasks/service_mode.yaml

@@ -1,43 +0,0 @@
----
-# This will run the drive_check_service.sh script as a service
-- name: Service Mode - set service mode vars
-  set_fact:
-    sleep_time: ".5"
-    service_mode: true
-    
-- name: "Service Mode - drive_check.service - stop service if running"
-  ignore_errors: yes
-  systemd:
-    name: "drive_check.service"
-    state: stopped
-
-- name: "Service Mode - template drive_check_service.sh "
-  template:
-    src: drive_check_service.sh
-    dest: "{{ service_folder }}/drive_check_service.sh"
-    mode: 0755
-    owner: "{{ autologin_user }}"
-    group: "{{ autologin_user }}"
-
-- name: "Service Mode - template drive_check_service.service"
-  vars:
-    service_name: "drive_check"
-    service_working_folder: "{{ service_folder }}"
-    service_exe: "{{ service_folder }}/drive_check_service.sh"
-  template:
-    src: "service_template.service"
-    dest: "/etc/systemd/system/drive_check.service"
-    mode: 0644
-
-- name: "Service Mode - drive_check_service - enable and start service api and daemon reload"
-  systemd:
-    daemon_reload: yes
-    name: "drive_check.service"
-    state: started
-    enabled: yes
-
-- name: Service Mode - remove autologin
-  when: install_kiosk | bool or service_only | bool
-  include_tasks: no_autologin.yaml
-
-...