sync for dev 033026

tasks/api.yaml

@@ -13,6 +13,15 @@
     state: stopped
     scope: user
 
+# create service working folder
+- name: Cosmostat - API - create cosmos user service folder
+  file:
+    path: "{{ user_service_folder }}"
+    state: directory
+    owner: "{{ service_user }}"
+    group: "{{ service_user }}"
+    mode: '0755'
+
 - name: Cosmostat - API - copy api files
   copy:
     src: api/

tasks/init.yaml

@@ -59,7 +59,15 @@
 # allow user services to "linger"
 - name: Cosmostat - Init - cosmos user enable linger
   shell:  "loginctl enable-linger {{ service_user }}"
-  
+  register: user_linger
+
+# - name: Reboot target after linger change
+#   reboot:
+#     msg: "Cosmostat - Init - Rebooting target for linger enable"
+#     pre_reboot_delay: 10
+#     reboot_timeout: 600
+#   when: user_linger.changed
+
 # create service working folder
 - name: Cosmostat - Init - create cosmostat service folder
   file:

tasks/main.yaml

@@ -1,5 +1,11 @@
 ---
 
+# refresh when refresh
+#- name: Quick refresh
+#  when: refresh_special | bool
+#  set_fact:
+#    quick_refresh: true
+
 # initializa environment
 - name: Initialize Environment
   when: not quick_refresh | bool
@@ -7,6 +13,7 @@
 
 # set up API
 - name: Build API
+  when: false
   include_tasks: api.yaml
 
 # set up web stack 

tasks/web.yaml

@@ -3,45 +3,64 @@
 # This part sets up cosmostat web dashboard
 ###############################################
 
-- name: Cosmostat - Web - stop containers
-  when: not quick_refresh | bool
-  shell: "docker-compose -f {{ service_control_web_folder }}/docker-compose.yaml down"
-  ignore_errors: yes
+#- name: Cosmostat - Web - stop containers
+#  community.docker.docker_compose_v2:
+#    project_src: "{{ service_control_docker_folder }}"
+#    state: stopped
+#  ignore_errors: yes
 
 # Create web Folder
-- name: "Cosmostat - Web - create {{ service_control_web_folder }}"
-  file:
-    path: "{{ service_control_web_folder }}"
-    state: directory
-    mode: '0755' 
-    owner: "{{ service_user }}"
-    group: "{{ service_user }}"
+#- name: "Cosmostat - Web - create {{ service_control_web_folder }}"
+#  file:
+#    path: "{{ service_control_web_folder }}"
+#    state: directory
+#    mode: '0755' 
+#    owner: "{{ service_user }}"
+#    group: "{{ service_user }}"
 
 - name: Cosmostat - Web - copy docker files
+  copy:
+    src: "docker/"
+    dest: "{{ service_control_docker_folder }}"
+    mode: 0755    
+    owner: "{{ service_user }}"
+    group: "{{ service_user }}"
+
+- name: Cosmostat - Web - copy web files
   copy:
     src: "web/"
-    dest: "{{ service_control_web_folder }}"
+    dest: "{{ service_control_docker_folder }}/web"
     mode: 0755    
     owner: "{{ service_user }}"
     group: "{{ service_user }}"
     
+- name: Cosmostat - Web - template docker-compose.yaml
+  template:
+    src: docker-compose-single.yaml
+    dest: "{{ service_control_docker_folder }}/docker-compose.yaml"
+    mode: 0644
+
+- name: "Cosmostat - Web - template cosmostat_settings.yaml"
+  template:
+    src: cosmostat_settings.yaml
+    dest: "{{ service_control_docker_folder }}/cosmostat_settings.yaml"
+    owner: "{{ service_user }}"
+    group: "{{ service_user }}"
+    mode: 0644
+
 #######################
 # configure as server
 - name: Cosmostat - Web - Configure Server Dashboard
   when: cosmostat_server | bool
   include_tasks: server.yaml
 
-- name: Cosmostat - Web - template docker-compose.yaml
-  template:
-    src: docker-compose-php.yaml
-    dest: "{{ service_control_web_folder }}/docker-compose.yaml"
-    mode: 0644
+#- name: Cosmostat - Web - Start containers
+#  community.docker.docker_compose_v2:
+#    project_src: "{{ service_control_web_folder }}"
+#    state: present
+#  register: docker_output
+#- debug: |
+#          msg="{{ docker_output.actions }}"
 
-- name: Cosmostat - Web - Start containers
-  shell: "docker-compose -f {{ service_control_web_folder }}/docker-compose.yaml up -d"
-  register: docker_output
-- debug: |
-          msg="{{ docker_output.stdout_lines }}"
-          msg="{{ docker_output.stderr_lines }}"
 
 ...