Dev to main - 12102024 (#8)

* Add update cache on all apt tasks

* Fix change mysql pass on second run

roles/common/tasks/kernel.yml

@@ -27,17 +27,20 @@
       - apt-transport-https
       - ca-certificates
     state: present
+    update_cache: true
 
 - name: "Common | Kernel | Ensure additional dependencies are installed (on Ubuntu < 20.04 and any other systems)"
   apt:
     name: gnupg2
     state: present
+    update_cache: true
   when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<')
 
 - name: "Common | Kernel | Ensure additional dependencies are installed (on Ubuntu >= 20.04)"
   apt:
     name: gnupg
     state: present
+    update_cache: true
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
 
 

roles/docker/tasks/main.yml

@@ -16,18 +16,21 @@
       - apt-transport-https
       - ca-certificates
     state: present
+    update_cache: true
   when: docker_add_repo | bool
 
 - name: "Docker | Ensure additional dependencies are installed (on Ubuntu < 20.04 and any other systems)."
   apt:
     name: gnupg2
     state: present
+    update_cache: true
   when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<')
 
 - name: "Docker | Ensure additional dependencies are installed (on Ubuntu >= 20.04)."
   apt:
     name: gnupg
     state: present
+    update_cache: true
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
 
 - name: "Docker | Add Docker apt key."

roles/marzban/tasks/post-deploy.yml

@@ -8,8 +8,8 @@
     group: root
     mode: '0644'
   loop:
-    - { name: 'marzban_mysql_user_password', path: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/pass_marzban_mysql_user_password" }
-    - { name: 'marzban_mysql_root_password', path: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/pass_marzban_mysql_root_password" }
+    - { name: 'marzban_mysql_user_password', path: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/vault_marzban_mysql_user_password" }
+    - { name: 'marzban_mysql_root_password', path: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/vault_marzban_mysql_root_password" }
   when: marzban_mysql_instance is defined and marzban_mysql_instance
 
 - name: "Marzban | Post-deploy | Install marzban-cli"

roles/marzban/tasks/prepare.yml

@@ -7,17 +7,51 @@
 
 - name: "Marzban | Prepare | Mysql"
   block:
+    - name: "Marzban | Prepare | Mysql | Check if marzban_mysql_user_password file exists"
+      stat:
+        path: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/vault_marzban_mysql_user_password"
+      register: mysql_user_password_file
+
+    - name: "Marzban | Prepare | Mysql | Check if marzban_mysql_root_password file exists"
+      stat:
+        path: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/vault_marzban_mysql_root_password"
+      register: mysql_root_password_file
+
+    - name: "Marzban | Prepare | Mysql | Read marzban_mysql_user_password from file"
+      slurp:
+        src: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/vault_marzban_mysql_user_password"
+      register: mysql_user_password_content
+      when: mysql_user_password_file.stat.exists
+
+    - name: "Marzban | Prepare | Mysql | Read marzban_mysql_root_password from file"
+      slurp:
+        src: "{{ marzban_system_dirs | json_query('[*].vault_dir') | first }}/vault_marzban_mysql_root_password"
+      register: mysql_root_password_content
+      when: mysql_root_password_file.stat.exists
+
+    - name: "Marzban | Prepare | Mysql | Set marzban_mysql_user_password from file if exists"
+      set_fact:
+        marzban_mysql_user_password: "{{ mysql_user_password_content.content | b64decode }}"
+      when: mysql_user_password_file.stat.exists
+
+    - name: "Marzban | Prepare | Mysql | Set marzban_mysql_root_password from file if exists"
+      set_fact:
+        marzban_mysql_root_password: "{{ mysql_root_password_content.content | b64decode }}"
+      when: mysql_root_password_file.stat.exists
+
     - name: "Marzban | Prepare | Mysql | Set marzban_mysql_user_password if not defined or empty"
       set_fact:
         marzban_mysql_user_password: "{{ lookup('password', '/dev/null length=20') }}"
       when:
+        - not mysql_user_password_file.stat.exists
         - marzban_mysql_user_password is not defined or marzban_mysql_user_password == ''
         - inventory_hostname == groups[marzban_main_group_name][0]  | default(omit)
 
     - name: "Marzban | Prepare | Mysql | Set marzban_mysql_root_password if not defined or empty"
       set_fact:
         marzban_mysql_root_password: "{{ lookup('password', '/dev/null length=20') }}"
       when:
+        - not mysql_root_password_file.stat.exists
         - marzban_mysql_root_password is not defined or marzban_mysql_root_password == ''
         - inventory_hostname == groups[marzban_main_group_name][0]  | default(omit)
 

roles/marzban/tasks/warp.yml

@@ -8,18 +8,21 @@
       - apt-transport-https
       - ca-certificates
     state: present
+    update_cache: true
   when: marzban_warp_add_repo | bool
 
 - name: "Marzban | Warp | Ensure additional dependencies are installed (on Ubuntu < 20.04 and any other systems)."
   apt:
     name: gnupg2
     state: present
+    update_cache: true
   when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<')
 
 - name: "Marzban | Warp | Ensure additional dependencies are installed (on Ubuntu >= 20.04)."
   apt:
     name: gnupg
     state: present
+    update_cache: true
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
 
 - name: "Marzban | Warp | Add cloudflare-warp apt key."